diff options
Diffstat (limited to 'uui/source')
51 files changed, 161 insertions, 219 deletions
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx index b63e89cb7a..3c5cba966f 100644 --- a/uui/source/alreadyopen.cxx +++ b/uui/source/alreadyopen.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ AlreadyOpenQueryBox::~AlreadyOpenQueryBox() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index 3fd695cc8f..fc1f74d989 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx index fea8b9a274..3f987477a5 100644 --- a/uui/source/cookiedg.cxx +++ b/uui/source/cookiedg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_COOKIEDG_HRC #include <cookiedg.hrc> -#endif #include <cookiedg.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif // CookiesDialog --------------------------------------------------------- @@ -142,3 +139,4 @@ short CookiesDialog::Execute() return nRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx index 23956945e7..70e797d7a5 100644 --- a/uui/source/cookiedg.hxx +++ b/uui/source/cookiedg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef UUI_COOKIEDG_HXX #define UUI_COOKIEDG_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> @@ -63,3 +62,4 @@ public: #endif // UUI_COOKIEDG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx index 130f928fdb..75b5684286 100644 --- a/uui/source/filechanged.cxx +++ b/uui/source/filechanged.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ FileChangedQueryBox::~FileChangedQueryBox() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx index 2c37359753..54bfde22b1 100644 --- a/uui/source/filechanged.hxx +++ b/uui/source/filechanged.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 3c09d66767..2cff694ef6 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,9 @@ #include "fltdlg.hxx" -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif -#ifndef UUI_FLTDLG_HRC #include "fltdlg.hrc" -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -48,10 +45,8 @@ #include <tools/list.hxx> #include <tools/urlobj.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> namespace uui @@ -249,3 +244,5 @@ String FilterDialog::impl_buildUIFileName( const String& sName ) } } // namespace uui + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index f9cec7899a..5098512f9b 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,14 +35,10 @@ #include <vcl/dialog.hxx> -#ifndef _MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <tools/string.hxx> @@ -96,3 +93,5 @@ class FilterDialog : public ModalDialog } // namespace uui #endif // UUI_FLTDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx index aefa485166..019749895d 100644 --- a/uui/source/getcontinuations.hxx +++ b/uui/source/getcontinuations.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ void getContinuations( } #endif /* INCLUDED_UUI_GETCONTINUATIONS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index d166b86714..4fa3ef3c02 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ #include "osl/diagnose.h" #include "rtl/digest.h" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "tools/errcode.hxx" #include "vcl/msgbox.hxx" #include "vcl/abstdlg.hxx" @@ -70,7 +71,7 @@ executeLoginDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; bool bAccount = (rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_ACCOUNT) != 0; bool bSavePassword = rInfo.GetCanRememberPassword(); @@ -423,7 +424,7 @@ executeMasterPasswordDialog( rtl::OString aMaster; try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -525,7 +526,7 @@ executePasswordDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -750,3 +751,4 @@ UUIInteractionHelper::handlePasswordRequest( return false; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx index 0c8d237f4a..36c3b629c0 100644 --- a/uui/source/iahndl-cookies.cxx +++ b/uui/source/iahndl-cookies.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include "com/sun/star/ucb/XInteractionCookieHandling.hpp" #include "com/sun/star/task/XInteractionRequest.hpp" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "tools/list.hxx" #include "svl/httpcook.hxx" #include "vcl/svapp.hxx" @@ -60,7 +61,7 @@ executeCookieDialog(Window * pParent, CntHTTPCookieRequest & rRequest) { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -207,3 +208,4 @@ UUIInteractionHelper::handleCookiesRequest( return false; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 6388a900cf..065dd888e8 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ #include <memory> -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" @@ -57,7 +58,7 @@ executeErrorDialog( WinBits nButtonMask) SAL_THROW((uno::RuntimeException)) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; rtl::OUStringBuffer aText(rContext); if (rContext.getLength() != 0 && rMessage.getLength() != 0) @@ -182,7 +183,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( SOURCE_SVX : SOURCE_UUI; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager; xManager.reset(ResMgr::CreateResMgr(aManager[eSource])); if (!xManager.get()) @@ -266,7 +267,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( rtl::OUString aContext(getContextProperty()); if (aContext.getLength() == 0 && nErrorCode != 0) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ErrorContext * pContext = ErrorContext::GetContext(); if (pContext) { @@ -316,3 +317,5 @@ UUIInteractionHelper::handleErrorHandlerRequest( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 7a0a0c24dd..593972245a 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ #include "com/sun/star/task/XInteractionRequest.hpp" #include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "comphelper/sequenceashashmap.hxx" #include "vcl/svapp.hxx" @@ -62,7 +63,7 @@ executeFilterDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -469,3 +470,4 @@ UUIInteractionHelper::handleFilterOptionsRequest( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index d233f93c7e..b259ef996d 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -341,3 +342,5 @@ UUIInteractionHelper::handleInteractiveIOException( } return false; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index cac71ae277..ee8c0742b0 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionRequest.hpp" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" @@ -80,7 +81,7 @@ handleLockedDocumentRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -171,7 +172,7 @@ handleChangedByOthersRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -210,7 +211,7 @@ handleLockFileIgnoreRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -314,3 +315,4 @@ UUIInteractionHelper::handleLockFileIgnoreRequest( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 24d60bdb2e..3c8452fb6b 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ #include "com/sun/star/task/XInteractionRequest.hpp" #include "com/sun/star/ucb/CertificateValidationRequest.hpp" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "tools/datetime.hxx" #include "svl/zforlist.hxx" #include "vcl/svapp.hxx" @@ -137,7 +138,7 @@ executeUnknownAuthDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -186,7 +187,7 @@ executeSSLWarnDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -355,3 +356,4 @@ UUIInteractionHelper::handleCertificateValidationRequest( return false; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index e90a064993..a119399dcc 100755..100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ #include "osl/conditn.hxx" #include "tools/rcid.h" // RSC_STRING #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ... -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "tools/diagnose_ex.h" #include "comphelper/documentconstants.hxx" // ODFVER_012_TEXT #include "svtools/sfxecode.hxx" // ERRCODE_SFX_* @@ -867,16 +868,6 @@ UUIInteractionHelper::handleRequest_impl( if ( handleCertificateValidationRequest( rRequest ) ) return true; -// @@@ Todo #i29340#: activate! -#if 0 - ucb::NameClashResolveRequest aNameClashResolveRequest; - if (aAnyRequest >>= aNameClashResolveRequest) - { - handleNameClashResolveRequest(aNameClashResolveRequest, - rRequest->getContinuations()); - return true; - } -#endif if ( handleMasterPasswordRequest( rRequest ) ) return true; @@ -1161,7 +1152,7 @@ executeMessageBox( WinBits nButtonMask ) SAL_THROW((uno::RuntimeException)) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; MessBox xBox( pParent, nButtonMask, rTitle, rMessage ); @@ -1188,109 +1179,8 @@ executeMessageBox( return aResult; } -// @@@ Todo #i29340#: activate! -#if 0 -enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; - -NameClashResolveDialogResult -executeNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) -{ - // @@@ Todo DV: execute overwrite-rename dialog, deliver result - OSL_ENSURE( false, - "executeNameClashResolveDialog not yet implemented!" ); - return ABORT; -} - -NameClashResolveDialogResult -executeSimpleNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) -{ - // @@@ Todo DV: execute rename-only dialog, deliver result - OSL_ENSURE( false, - "executeSimpleNameClashResolveDialog not yet implemented!" ); - return ABORT; -} -#endif } // namespace -// @@@ Todo #i29340#: activate! -#if 0 -void -UUIInteractionHelper::handleNameClashResolveRequest( - ucb::NameClashResolveRequest const & rRequest, - uno::Sequence< uno::Reference< - task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) -{ - OSL_ENSURE( - rRequest.TargetFolderURL.getLength() > 0, - "NameClashResolveRequest must not contain empty TargetFolderURL" ); - - OSL_ENSURE( - rRequest.ClashingName.getLength() > 0, - "NameClashResolveRequest must not contain empty ClashingName" ); - - uno::Reference< task::XInteractionAbort > xAbort; - uno::Reference< ucb::XInteractionSupplyName > xSupplyName; - uno::Reference< ucb::XInteractionReplaceExistingData > xReplaceExistingData; - getContinuations( - rContinuations, &xAbort, &xSupplyName, &xReplaceExistingData); - - OSL_ENSURE( xAbort.is(), - "NameClashResolveRequest must contain Abort continuation" ); - - OSL_ENSURE( xSupplyName.is(), - "NameClashResolveRequest must contain SupplyName continuation" ); - - NameClashResolveDialogResult eResult = ABORT; - rtl::OUString aProposedNewName( rRequest.ProposedNewName ); - if ( xReplaceExistingData.is() ) - eResult = executeNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); - else - eResult = executeSimpleNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); - - switch ( eResult ) - { - case ABORT: - xAbort->select(); - break; - - case RENAME: - xSupplyName->setName( aProposedNewName ); - xSupplyName->select(); - break; - - case OVERWRITE: - OSL_ENSURE( - xReplaceExistingData.is(), - "Invalid NameClashResolveDialogResult: OVERWRITE - " - "No ReplaceExistingData continuation available!" ); - xReplaceExistingData->select(); - break; - - default: - OSL_ENSURE( false, "Unknown NameClashResolveDialogResult value. " - "Interaction Request not handled!" ); - break; - } -} -#endif - void UUIInteractionHelper::handleGenericErrorRequest( sal_Int32 nErrorCode, @@ -1338,7 +1228,7 @@ UUIInteractionHelper::handleGenericErrorRequest( { uno::Any aProductNameAny = ::utl::ConfigManager::GetConfigManager() - ->GetDirectConfigProperty( + .GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); aProductNameAny >>= aTitle; } @@ -1520,7 +1410,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( ::rtl::OUString aMessage; { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -1552,10 +1442,10 @@ UUIInteractionHelper::handleBrokenPackageRequest( return; uno::Any aProductNameAny = - ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( + ::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); uno::Any aProductVersionAny = - ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( + ::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION ); ::rtl::OUString aProductName, aProductVersion; if ( !( aProductNameAny >>= aProductName ) ) @@ -1613,3 +1503,5 @@ ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString) m_pResMgr->PopContext(); return true; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 0f54e9ee8a..87761aee78 100755..100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -215,18 +216,6 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -// @@@ Todo #i29340#: activate! -#if 0 - void - handleNameClashResolveRequest( - com::sun::star::ucb::NameClashResolveRequest const & rRequest, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations) - SAL_THROW((com::sun::star::uno::RuntimeException)); -#endif - bool handleMasterPasswordRequest( com::sun::star::uno::Reference< @@ -377,3 +366,5 @@ private: */ #endif // UUI_IAHNDL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 08bc672418..264367718c 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,5 @@ UUIInteractionHandler::createInstance( 0); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx index 11c9b45075..508032d043 100644 --- a/uui/source/interactionhandler.hxx +++ b/uui/source/interactionhandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ private: }; #endif // UUI_INTERACTIONHANDLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx index b5320a1303..109ba5b904 100644 --- a/uui/source/lockfailed.cxx +++ b/uui/source/lockfailed.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ LockFailedQueryBox::~LockFailedQueryBox() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx index 70ba107961..0f96b1554b 100644 --- a/uui/source/lockfailed.hxx +++ b/uui/source/lockfailed.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index efb0b77fea..b7ce1f6827 100755..100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ #include <vcl/msgbox.hxx> #include "logindlg.hxx" -#ifndef UUI_LOGINDLG_HRC #include "logindlg.hrc" -#endif -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif #include <tools/resid.hxx> #ifdef UNX @@ -348,3 +345,5 @@ void LoginDialog::ClearAccount() //............................................................................ //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index a349929ce7..170a0be135 100755..100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define UUI_LOGINDLG_HXX #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> @@ -114,3 +113,4 @@ public: #endif // UUI_LOGINDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index ec1317dbd8..d8cc696ad8 100755..100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,7 +69,7 @@ public: const String& GetUserName() const { return m_aUserName; } const String& GetPassword() const { return m_aPassword; } const String& GetPasswordToModify() const { return m_aPasswordToModify; } - const bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; } + bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; } const String& GetPath() const { return m_aPath; } const String& GetErrorText() const { return m_aErrorText; } BOOL GetCanRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); } @@ -176,3 +177,4 @@ inline void LoginErrorInfo::SetModifyUserName( BOOL bSet ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index b9e82b862f..cda0ca0f58 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ +#include <sal/macros.h> #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSCRTDLG_HRC #include <masterpasscrtdlg.hrc> -#endif #include <masterpasscrtdlg.hxx> // MasterPasswordCreateDialog--------------------------------------------------- @@ -129,7 +127,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog aFTMasterPasswordWarning.SetPosSizePixel( aFTMasterPasswordWarning.GetPosPixel(), aNewWarningSize ); Window* pControls[] = { &aFL, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls ); for ( int i = 0; i < nCCount; ++i ) { Point aNewPos =(*pControls[i]).GetPosPixel(); @@ -152,7 +150,7 @@ void MasterPasswordCreateDialog::CalculateTextHeight() &aFTMasterPasswordRepeat, &aEDMasterPasswordRepeat, &aFTCautionText, &aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn }; Window** pWindow = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow ) { Point aNewPos = (*pWindow)->GetPosPixel(); @@ -171,7 +169,7 @@ void MasterPasswordCreateDialog::CalculateTextHeight() nDelta += nTemp; Window* pWins[] = { &aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn }; Window** pWindow = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow ) { Point aNewPos = (*pWindow)->GetPosPixel(); @@ -188,3 +186,4 @@ void MasterPasswordCreateDialog::CalculateTextHeight() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 6c652cbb44..e9e0a98b0c 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ #ifndef UUI_MASTERPASSCRTDLG_HXX #define UUI_MASTERPASSCRTDLG_HXX -#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP #include <com/sun/star/task/PasswordRequestMode.hpp> -#endif #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/group.hxx> @@ -78,3 +75,5 @@ private: }; #endif // UUI_MASTERPASSCRTDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 898b2eb9fe..163fbe6e23 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSWORDDLG_HRC #include <masterpassworddlg.hrc> -#endif #include <masterpassworddlg.hxx> // MasterPasswordDialog--------------------------------------------------- @@ -78,3 +75,4 @@ MasterPasswordDialog::MasterPasswordDialog aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 07753fbd3d..8c4037502b 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ #ifndef UUI_MASTERPASSWORDDLG_HXX #define UUI_MASTERPASSWORDDLG_HXX -#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP #include <com/sun/star/task/PasswordRequestMode.hpp> -#endif #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/group.hxx> @@ -64,3 +61,4 @@ private: #endif // UUI_MASTERPASSWORDDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx index 204e2374d1..933a21c595 100644 --- a/uui/source/mphndl.hxx +++ b/uui/source/mphndl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,4 @@ public: #endif // UUI_IAHNDL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index 03c8bd3755..ed860428cf 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,3 +200,4 @@ void NewerVersionWarningDialog::InitButtonWidth() } // end of namespace uui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx index d108bbbfc8..ed8ebac754 100644 --- a/uui/source/newerverwarn.hxx +++ b/uui/source/newerverwarn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ namespace uui #endif // #ifndef _NEWERVERSIONWARNING_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx index 7b6e6a47a5..4734a486d3 100644 --- a/uui/source/openlocked.cxx +++ b/uui/source/openlocked.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,4 @@ OpenLockedQueryBox::~OpenLockedQueryBox() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index ddb54713df..259a355553 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx index 6dbaeedd93..6b9b605b41 100644 --- a/uui/source/passcrtdlg.cxx +++ b/uui/source/passcrtdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ +#include <sal/macros.h> #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_PASSCRTDLG_HRC #include <passcrtdlg.hrc> -#endif #include <passcrtdlg.hxx> // PasswordCreateDialog--------------------------------------------------- @@ -118,7 +116,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize ); Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls ); for ( int i = 0; i < nCCount; ++i ) { Point aNewPos =(*pControls[i]).GetPosPixel(); @@ -126,3 +124,5 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx index 4e9d065ee1..4d95af006c 100644 --- a/uui/source/passcrtdlg.hxx +++ b/uui/source/passcrtdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ public: }; #endif // UUI_PASSCRTDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 0a056289c2..3570710729 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -479,3 +480,5 @@ PasswordContainerInteractionHandler::createServiceFactory( } } // namespace uui + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index aafcd1c4c1..cd29fb308a 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -195,3 +196,5 @@ private: } // namespace uui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index b66659ff6e..4875a032d5 100755..100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ +#include <sal/macros.h> #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_PASSWORDDLG_HRC #include <passworddlg.hrc> -#endif #include <passworddlg.hxx> // PasswordDialog--------------------------------------------------------- @@ -106,7 +104,7 @@ PasswordDialog::PasswordDialog( aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize ); Window* pControls[] = { &aEDPassword, &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls ); for ( int i = 0; i < nCCount; ++i ) { Point aNewPos =(*pControls[i]).GetPosPixel(); @@ -115,3 +113,5 @@ PasswordDialog::PasswordDialog( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index e5a0a7885b..a0ff98c8d9 100755..100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ private: }; #endif // PASSWORDDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index eeed50049c..3fd7bebf2c 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ UUIInteractionRequestStringResolver::createInstance( 0); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 9b52a3f371..6346c7851e 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ private: }; #endif // UUI_REQUESTSTRINGRESOLVER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 6b62384feb..f17bbf4130 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,6 +32,7 @@ #include <comphelper/sequence.hxx> #include "comphelper/documentconstants.hxx" #include <comphelper/processfactory.hxx> +#include <sal/macros.h> #include <vcl/msgbox.hxx> #include <com/sun/star/security/NoPasswordException.hpp> @@ -224,7 +226,7 @@ void MacroWarning::InitControls() &maBottomSepFL, &maEnableBtn, &maDisableBtn, &maHelpBtn }; Window** pCurrent = pWins; - for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent ) { Point aNewPos = (*pCurrent)->GetPosPixel(); aNewPos.Y() -= nDelta; @@ -322,7 +324,7 @@ void MacroWarning::FitControls() &maDescr2FI, &maAlwaysTrustCB, &maBottomSepFL, &maEnableBtn, &maDisableBtn, &maHelpBtn }; Window** pCurrent = pWins; - for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent ) { Point aNewPos = (*pCurrent)->GetPosPixel(); aNewPos.Y() -= nDelta; @@ -376,3 +378,4 @@ void MacroWarning::SetCertificate( const cssu::Reference< css::security::XCertif } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 9889d9a363..04bd6f6565 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 7ec7c34056..4ab29d3764 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -208,3 +209,5 @@ extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName, return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 95ddef2038..7db821a6bf 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,15 +28,9 @@ #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HRC #include <sslwarndlg.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HXX #include <sslwarndlg.hxx> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> @@ -91,3 +86,4 @@ SSLWarnDialog::SSLWarnDialog +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 4e94cc8855..65326ad14c 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.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; @@ -83,3 +82,4 @@ private: #endif // UUI_SSLWARN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx index 80599081a3..35b65271f4 100644 --- a/uui/source/trylater.cxx +++ b/uui/source/trylater.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ TryLaterQueryBox::~TryLaterQueryBox() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx index e8040c153e..fd9915261d 100644 --- a/uui/source/trylater.hxx +++ b/uui/source/trylater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index e49ba7680c..42d33d9ab3 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,15 +28,9 @@ #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HRC #include <unknownauthdlg.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HXX #include <unknownauthdlg.hxx> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> @@ -101,3 +96,4 @@ UnknownAuthDialog::UnknownAuthDialog m_aCommandButtonOK.SetClickHdl( LINK( this, UnknownAuthDialog, OKHdl_Impl ) ); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 0ca6c38fe8..4b15f7d20f 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.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; @@ -85,3 +84,5 @@ private: }; #endif // UUI_UNKNOWNAUTH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |