diff options
Diffstat (limited to 'desktop/source/deployment')
80 files changed, 469 insertions, 378 deletions
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 0f6a26ee88..bb58770c4c 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.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. @@ -209,3 +210,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace dp_log +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index dc4d8eeb5e..410bb01c1a 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.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. @@ -251,3 +252,4 @@ t_string2string_map PersistentMap::getEntries() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index db42a215e7..b9a8185b2d 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_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. @@ -113,3 +114,4 @@ void * SAL_CALL component_getFactory( } // extern "C" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index a4d4de1873..52451e4683 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.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. diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx index 4898aecc03..0291ce5802 100644 --- a/desktop/source/deployment/gui/descedit.cxx +++ b/desktop/source/deployment/gui/descedit.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. @@ -98,3 +99,4 @@ void DescriptionEdit::SetDescription( const String& rDescription ) UpdateScrollBar(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx index 6e98a1233a..27e36e14a0 100644 --- a/desktop/source/deployment/gui/descedit.hxx +++ b/desktop/source/deployment/gui/descedit.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. @@ -55,3 +56,4 @@ namespace dp_gui #endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DESCEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 9d7152b4b5..043a86f1af 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -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. @@ -96,3 +97,5 @@ private: } // namespace dp_gui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 11699bd50e..9c54c17f70 100755 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -35,7 +35,7 @@ #define RID_DLG_EXTENSION_MANAGER RID_DEPLOYMENT_GUI_START #define RID_DLG_UPDATE_REQUIRED (RID_DEPLOYMENT_GUI_START + 11) -#define RID_EM_BTN_CLOSE 10 +#define RID_EM_BTN_CLOSE 10 #define RID_EM_BTN_HELP 11 #define RID_EM_BTN_ADD 12 #define RID_EM_BTN_CHECK_UPDATES 13 @@ -57,7 +57,6 @@ #define FL_LICENSE 69 #define FI_LICENSE_ARROW1 60 #define FI_LICENSE_ARROW2 61 -#define IMG_LICENCE_ARROW_HC 62 #define BTN_LICENSE_ACCEPT 63 // local RIDs for "Download and Install" dialog @@ -123,8 +122,8 @@ #define RID_DLG_UPDATE_BROWSERBASED 25 #define RID_DLG_UPDATE_PUBLISHER_LABEL 26 #define RID_DLG_UPDATE_PUBLISHER_LINK 27 -#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 -#define RID_DLG_UPDATE_RELEASENOTES_LINK 29 +#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 +#define RID_DLG_UPDATE_RELEASENOTES_LINK 29 #define RID_DLG_UPDATE_NOUPDATE 30 #define RID_DLG_UPDATE_VERSION 31 #define RID_DLG_UPDATE_IGNORE 32 @@ -138,9 +137,7 @@ #define RID_INFOBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START + 21) #define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) -#define RID_IMG_WARNING_HC (RID_DEPLOYMENT_GUI_START+57) #define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) -#define RID_IMG_LOCKED_HC (RID_DEPLOYMENT_GUI_START+59) #define RID_IMG_EXTENSION (RID_DEPLOYMENT_GUI_START+60) #define RID_IMG_EXTENSION_HC (RID_DEPLOYMENT_GUI_START+61) #define RID_IMG_SHARED (RID_DEPLOYMENT_GUI_START+62) diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index d560b3d5a9..c00123fb91 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.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. @@ -72,3 +73,4 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint ) } // namespace dp_gui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index 79efac6e4a..ddec1e81ae 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.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. @@ -49,3 +50,5 @@ public: } // namespace dp_gui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src index 343d75df6a..b002bf2408 100644 --- a/desktop/source/deployment/gui/dp_gui_backend.src +++ b/desktop/source/deployment/gui/dp_gui_backend.src @@ -33,11 +33,6 @@ Image RID_IMG_DEF_PACKAGE_BUNDLE ImageBitmap = Bitmap { File = "sx03256.bmp"; }; MASKCOLOR }; -Image RID_IMG_DEF_PACKAGE_BUNDLE_HC -{ - ImageBitmap = Bitmap { File = "sxh03256.bmp"; }; - MASKCOLOR -}; // script, dialog: Image RID_IMG_SCRIPTLIB @@ -45,22 +40,12 @@ Image RID_IMG_SCRIPTLIB ImageBitmap = Bitmap { File = "im30820.bmp"; }; MASKCOLOR }; -Image RID_IMG_SCRIPTLIB_HC -{ - ImageBitmap = Bitmap { File = "imh30820.bmp"; }; - MASKCOLOR -}; Image RID_IMG_DIALOGLIB { ImageBitmap = Bitmap { File = "dialogfolder_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_DIALOGLIB_HC -{ - ImageBitmap = Bitmap { File = "dialogfolder_16_h.bmp"; }; - MASKCOLOR -}; // configuration: Image RID_IMG_CONF_XML @@ -68,11 +53,6 @@ Image RID_IMG_CONF_XML ImageBitmap = Bitmap { File = "xml_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_CONF_XML_HC -{ - ImageBitmap = Bitmap { File = "xml_16_h.bmp"; }; - MASKCOLOR -}; // component, typelib: Image RID_IMG_COMPONENT @@ -80,52 +60,27 @@ Image RID_IMG_COMPONENT ImageBitmap = Bitmap { File = "component_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_COMPONENT_HC -{ - ImageBitmap = Bitmap { File = "component_16_h.bmp"; }; - MASKCOLOR -}; Image RID_IMG_JAVA_COMPONENT { ImageBitmap = Bitmap { File = "javacomponent_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_JAVA_COMPONENT_HC -{ - ImageBitmap = Bitmap { File = "javacomponent_16_h.bmp"; }; - MASKCOLOR -}; Image RID_IMG_TYPELIB { ImageBitmap = Bitmap { File = "library_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_TYPELIB_HC -{ - ImageBitmap = Bitmap { File = "library_16_h.bmp"; }; - MASKCOLOR -}; Image RID_IMG_JAVA_TYPELIB { ImageBitmap = Bitmap { File = "javalibrary_16.bmp"; }; MASKCOLOR }; -Image RID_IMG_JAVA_TYPELIB_HC -{ - ImageBitmap = Bitmap { File = "javalibrary_16_h.bmp"; }; - MASKCOLOR -}; Image RID_IMG_HELP { ImageBitmap = Bitmap { File = "commandimagelist/sc_helperdialog.bmp"; }; MASKCOLOR }; -Image RID_IMG_HELP_HC -{ - ImageBitmap = Bitmap { File = "commandimagelist/sch_helperdialog.bmp"; }; - MASKCOLOR -}; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 1f34c490ea..694f764d5e 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.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. @@ -84,3 +85,5 @@ void DependencyDialog::Resize() { (m_list.GetSizePixel().Width() - m_ok.GetSizePixel().Width()) / 2), m_list.GetPosPixel().Y() + m_list.GetSizePixel().Height() + n)); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 3d982cd250..72f8334d38 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.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. @@ -32,9 +33,7 @@ #include <vector> #include "tools/gen.hxx" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/dialog.hxx" #include "vcl/fixed.hxx" #include "vcl/lstbox.hxx" @@ -66,3 +65,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index e61994c475..91f9252dfc 100644..100755 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -4,7 +4,7 @@ * * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * * This file is part of OpenOffice.org. * @@ -31,27 +31,33 @@ String RID_STR_ADD_PACKAGES { Text [ en-US ] = "Add Extension(s)"; }; + String RID_CTX_ITEM_REMOVE { Text [ en-US ] = "~Remove"; }; + String RID_CTX_ITEM_ENABLE { Text [ en-US ] = "~Enable"; }; + String RID_CTX_ITEM_DISABLE { Text [ en-US ] = "~Disable"; }; + String RID_CTX_ITEM_CHECK_UPDATE { Text [ en-US ] = "~Update..."; }; + String RID_CTX_ITEM_OPTIONS { Text [ en-US ] = "~Options..."; }; + String RID_STR_ADDING_PACKAGES { Text [ en-US ] = "Adding %EXTENSION_NAME"; @@ -128,7 +134,7 @@ String RID_STR_SHOW_LICENSE_CMD // --------------------------------------------------- // row 1 | multi line edit // --------------------------------------------------- -// row 2 | fixed text +// row 2 | fixed text // --------------------------------------------------- // row 3 | img | fixed text | fixed text | button // ---------------------------------------------------- @@ -136,7 +142,7 @@ String RID_STR_SHOW_LICENSE_CMD // --------------------------------------------------- // row 5 |fixed line // --------------------------------------------------- -// row 6 | | |button | button +// row 6 | | |button | button // --------------------------------------------------- // | col 1 | col 2 | col3 | col4 | col5 @@ -183,7 +189,6 @@ ModalDialog RID_DLG_LICENSE Moveable = TRUE; Closeable = TRUE; Sizeable = FALSE; -// Hide = TRUE; MultiLineEdit ML_LICENSE { @@ -194,7 +199,7 @@ ModalDialog RID_DLG_LICENSE VScroll = TRUE; ReadOnly = TRUE; }; - + FixedText FT_LICENSE_HEADER { Pos = MAP_APPFONT(COL1_X, ROW2_Y); @@ -202,14 +207,16 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:"; - }; + }; + FixedText FT_LICENSE_BODY_1 { Pos = MAP_APPFONT(COL2_X, ROW3_Y); Size = MAP_APPFONT( COL2_WIDTH, ROW3_HEIGHT ); NoLabel = TRUE; Text [ en-US ] = "1."; - }; + }; + //spans col3 + col4 FixedText FT_LICENSE_BODY_1_TXT { @@ -218,14 +225,16 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text."; - }; + }; + FixedText FT_LICENSE_BODY_2 { Pos = MAP_APPFONT(COL2_X, ROW4_Y); Size = MAP_APPFONT(COL2_WIDTH, ROW4_HEIGHT); NoLabel = TRUE; Text [ en-US ] = "2."; - }; + }; + FixedText FT_LICENSE_BODY_2_TXT { Pos = MAP_APPFONT(COL3_X, ROW4_Y); @@ -233,8 +242,9 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button."; - - }; + + }; + PushButton PB_LICENSE_DOWN { HelpID = "desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN"; @@ -242,14 +252,15 @@ ModalDialog RID_DLG_LICENSE Pos = MAP_APPFONT(COL5_X , ROW3_Y) ; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ; Text [ en-US ] = "~Scroll Down"; - + }; + FixedLine FL_LICENSE { Pos = MAP_APPFONT ( 0, ROW5_Y) ; Size = MAP_APPFONT ( LIC_DLG_WIDTH, ROW5_HEIGHT ) ; }; - + FixedImage FI_LICENSE_ARROW1 { Pos = MAP_APPFONT (COL1_X, ROW3_Y) ; @@ -260,7 +271,7 @@ ModalDialog RID_DLG_LICENSE MASKCOLOR }; }; - + FixedImage FI_LICENSE_ARROW2 { Pos = MAP_APPFONT (COL1_X, ROW4_Y) ; @@ -271,13 +282,7 @@ ModalDialog RID_DLG_LICENSE MASKCOLOR }; }; - - Image IMG_LICENCE_ARROW_HC - { - ImageBitmap = Bitmap { File = "sch06300.png"; }; - MASKCOLOR - }; - + OKButton BTN_LICENSE_ACCEPT { Pos = MAP_APPFONT(COL4_X, ROW6_Y); @@ -287,7 +292,7 @@ ModalDialog RID_DLG_LICENSE DefButton = TRUE; Text [ en-US ] = "Accept"; }; - + CancelButton BTN_LICENSE_DECLINE { Pos = MAP_APPFONT(COL5_X, ROW6_Y); @@ -295,8 +300,6 @@ ModalDialog RID_DLG_LICENSE Text [ en-US ] = "Decline" ; TabStop = TRUE; }; - -}; ModalDialog RID_DLG_SHOW_LICENSE { @@ -375,7 +378,7 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION "Click \'Cancel\' to stop disabling the extension."; }; - + String RID_STR_UNSUPPORTED_PLATFORM { Text [ en-US ] = "The extension \'%Name\' does not work on this computer."; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 41ccc69693..aba7732054 100755 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.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,7 +51,7 @@ #include "vcl/scrbar.hxx" #include "vcl/svapp.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "svtools/extensionlistbox.hxx" @@ -102,7 +103,7 @@ namespace dp_gui { struct StrAllFiles : public rtl::StaticWithInit< const OUString, StrAllFiles > { const OUString operator () () { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; ::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); OSL_ASSERT( resmgr.get() != 0 ); String ret( ResId( STR_FILTERNAME_ALL, *resmgr.get() ) ); @@ -368,12 +369,21 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse ) // ----------------------------------------------------------------------- MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos ) { - if ( nPos >= (long) getItemCount() ) - return CMD_NONE; + if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) ) + { + if ( ! GetEntryData( nPos )->m_bLocked ) + { + PopupMenu aPopup; - PopupMenu aPopup; + aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); - aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); + if ( GetEntryData( nPos )->m_bUser ) + { + if ( GetEntryData( nPos )->m_eState == REGISTERED ) + aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE ) + aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + } if ( ! GetEntryData( nPos )->m_bLocked ) { @@ -425,6 +435,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } else if ( rMEvt.IsLeft() ) { + const SolarMutexGuard aGuard; if ( rMEvt.IsMod1() && HasActive() ) selectEntry( EXTENSION_LISTBOX_ENTRY_NOTFOUND ); // Selecting an not existing entry will deselect the current one else @@ -570,7 +581,7 @@ DialogHelper::~DialogHelper() //------------------------------------------------------------------------------ ResId DialogHelper::getResId( USHORT nId ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; return ResId( nId, *DeploymentGuiResMgr::get() ); } @@ -579,7 +590,7 @@ String DialogHelper::getResourceString( USHORT id ) { // init with non-acquired solar mutex: BrandName::get(); - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; String ret( ResId( id, *DeploymentGuiResMgr::get() ) ); if (ret.SearchAscii( "%PRODUCTNAME" ) != STRING_NOTFOUND) { ret.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() ); @@ -604,7 +615,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: { if ( !bHadWarning && IsSharedPkgMgr( xPackage ) ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; WarningBox aInfoBox( pParent, getResId( nResID ) ); String aMsgText = aInfoBox.GetMessText(); aMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() ); @@ -638,7 +649,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle { uno::Any exc( ::cppu::getCaughtException() ); OUString msg( ::comphelper::anyToString( exc ) ); - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); aErrorBox.SetText( sTitle ); aErrorBox.Execute(); @@ -648,7 +659,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle //------------------------------------------------------------------------------ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; WarningBox aInfo( m_pVCLWindow, getResId( RID_WARNINGBOX_INSTALL_EXTENSION ) ); String sText( aInfo.GetMessText() ); @@ -661,7 +672,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const //------------------------------------------------------------------------------ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; QueryBox aQuery( m_pVCLWindow, getResId( RID_QUERYBOX_INSTALL_FOR_ALL ) ); String sMsgText = aQuery.GetMessText(); @@ -778,6 +789,7 @@ void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL ) long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { + const SolarMutexGuard aGuard; m_aUpdateBtn.Enable( true ); return m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); } @@ -791,14 +803,14 @@ void ExtMgrDialog::prepareChecking() //------------------------------------------------------------------------------ void ExtMgrDialog::checkEntries() { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; m_pExtensionBox->checkEntries(); } //------------------------------------------------------------------------------ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; WarningBox aInfo( const_cast< ExtMgrDialog* >(this), getResId( RID_WARNINGBOX_REMOVE_EXTENSION ) ); String sText( aInfo.GetMessText() ); @@ -1049,6 +1061,7 @@ void ExtMgrDialog::updateProgress( const OUString &rText, //------------------------------------------------------------------------------ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage ) { + const SolarMutexGuard aGuard; m_pExtensionBox->updateEntry( xPackage ); } @@ -1167,7 +1180,7 @@ void ExtMgrDialog::Resize() Rectangle aNativeControlRegion, aNativeContentRegion; if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, CTRL_STATE_ENABLED, aValue, rtl::OUString(), - aNativeControlRegion, aNativeContentRegion ) ) != FALSE ) + aNativeControlRegion, aNativeContentRegion ) != FALSE ) { nProgressHeight = aNativeControlRegion.GetHeight(); } @@ -1349,7 +1362,7 @@ void UpdateRequiredDialog::prepareChecking() //------------------------------------------------------------------------------ void UpdateRequiredDialog::checkEntries() { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; m_pExtensionBox->checkEntries(); if ( ! hasActiveEntries() ) @@ -1462,6 +1475,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment:: // We will remove all updated packages with satisfied dependencies, but // we will show all disabled entries so the user sees the result // of the 'disable all' button + const SolarMutexGuard aGuard; if ( isEnabled( xPackage ) && checkDependencies( xPackage ) ) m_pExtensionBox->removeEntry( xPackage ); else @@ -1610,7 +1624,7 @@ void UpdateRequiredDialog::Resize() Rectangle aNativeControlRegion, aNativeContentRegion; if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, CTRL_STATE_ENABLED, aValue, rtl::OUString(), - aNativeControlRegion, aNativeContentRegion ) ) != FALSE ) + aNativeControlRegion, aNativeContentRegion ) != FALSE ) { nProgressHeight = aNativeControlRegion.GetHeight(); } @@ -1826,3 +1840,4 @@ SelectedPackage::~SelectedPackage() {} } //namespace dp_gui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 50878d8778..8b5d0ba37c 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.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. @@ -279,3 +280,5 @@ public: } // namespace dp_gui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src index daeb5d0125..813bbd58d4 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.src +++ b/desktop/source/deployment/gui/dp_gui_dialog2.src @@ -162,17 +162,12 @@ Image RID_IMG_WARNING ImageBitmap = Bitmap { File = "caution_16.png"; }; }; -Image RID_IMG_WARNING_HC -{ - ImageBitmap = Bitmap { File = "caution_16_h.png"; }; -}; - Image RID_IMG_LOCKED { ImageBitmap = Bitmap { File = "lock_16.png"; }; }; -Image RID_IMG_LOCKED_HC +Image RID_IMG_SHARED { ImageBitmap = Bitmap { File = "lock_16_h.png"; }; }; @@ -192,11 +187,6 @@ Image RID_IMG_EXTENSION ImageBitmap = Bitmap { File = "extension_32.png"; }; }; -Image RID_IMG_EXTENSION_HC -{ - ImageBitmap = Bitmap { File = "extension_32_h.png"; }; -}; - QueryBox RID_QUERYBOX_INSTALL_FOR_ALL { Buttons = WB_YES_NO_CANCEL; @@ -209,7 +199,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL // --------------------------------------------------- // row 1 | multi line edit // --------------------------------------------------- -// row 2 | fixed text +// row 2 | fixed text // --------------------------------------------------- // row 3 | img | fixed text | fixed text | button // ---------------------------------------------------- @@ -217,7 +207,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL // --------------------------------------------------- // row 5 |fixed line // --------------------------------------------------- -// row 6 | | |button | button +// row 6 | | |button | button // --------------------------------------------------- // | col 1 | col 2 | col3 | col4 | col5 diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index ea983c5a7f..2bada9f02c 100755 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.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,6 +26,8 @@ * ************************************************************************/ +#define _WIN32_WINNT 0x0500 + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_desktop.hxx" @@ -165,7 +168,7 @@ public: m_bWarnUser( false ) {} - Dialog * activeDialog() { return m_pDialogHelper->getWindow(); } + Dialog * activeDialog() { return m_pDialogHelper ? m_pDialogHelper->getWindow() : NULL; } void setTitle( const OUString& rNewTitle ) { m_sTitle = rNewTitle; } void startProgress(); @@ -258,6 +261,8 @@ private: virtual void execute(); virtual void SAL_CALL onTerminated(); + void _insert(const TExtensionCmd& rExtCmd); + void _addExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const OUString &rPackageURL, const OUString &rRepository, @@ -427,7 +432,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]) ); } { - vos::OGuard guard(Application::GetSolarMutex()); + SolarMutexGuard guard; short n = DependencyDialog( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, deps ).Execute(); // Distinguish between closing the dialog and programatically // canceling the dialog (headless VCL): @@ -471,7 +476,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & bool bEqualNames = verExc.NewDisplayName.equals( verExc.Deployed->getDisplayName()); { - vos::OGuard guard(Application::GetSolarMutex()); + SolarMutexGuard guard; WarningBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, ResId(id, *DeploymentGuiResMgr::get())); String s; if (bEqualNames) @@ -512,7 +517,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { if ( m_pDialogHelper ) { - vos::OGuard guard(Application::GetSolarMutex()); + SolarMutexGuard guard; approve = m_pDialogHelper->installExtensionWarn( instExc.displayName ); } @@ -523,7 +528,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= platExc) { - vos::OGuard guard( Application::GetSolarMutex() ); + SolarMutexGuard guard; String sMsg( ResId( RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get() ) ); sMsg.SearchAndReplaceAllAscii( "%Name", platExc.package->getDisplayName() ); ErrorBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, sMsg ); @@ -597,7 +602,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus ) if ( text.getLength() == 0 ) text = ::comphelper::anyToString( rStatus ); // fallback - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; const ::std::auto_ptr< ErrorBox > aBox( new ErrorBox( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, text ) ); aBox->Execute(); } @@ -645,12 +650,6 @@ void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionU const ::rtl::OUString &rRepository, const bool bWarnUser ) { - ::osl::MutexGuard aGuard( m_mutex ); - - //If someone called stop then we do not add the extension -> game over! - if ( m_bStopped ) - return; - if ( rExtensionURL.getLength() ) { TExtensionCmd pEntry( new ExtensionCmd( ExtensionCmd::ADD, rExtensionURL, rRepository, bWarnUser ) ); @@ -693,9 +692,13 @@ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment: { TExtensionCmd pEntry( new ExtensionCmd( ExtensionCmd::ACCEPT_LICENSE, rPackage ) ); - m_queue.push( pEntry ); - m_eInput = START; - m_wakeup.set(); +//------------------------------------------------------------------------------ +void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment::XPackage > &rPackage ) +{ + if ( rPackage.is() ) + { + TExtensionCmd pEntry( new ExtensionCmd( ExtensionCmd::ACCEPT_LICENSE, rPackage ) ); + _insert( pEntry ); } } @@ -703,20 +706,12 @@ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment: void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deployment::XPackage > &rPackage, const bool bEnable ) { - ::osl::MutexGuard aGuard( m_mutex ); - - //If someone called stop then we do not remove the extension -> game over! - if ( m_bStopped ) - return; - if ( rPackage.is() ) { TExtensionCmd pEntry( new ExtensionCmd( bEnable ? ExtensionCmd::ENABLE : ExtensionCmd::DISABLE, rPackage ) ); - m_queue.push( pEntry ); - m_eInput = START; - m_wakeup.set(); + _insert( pEntry ); } } @@ -724,16 +719,8 @@ void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deploymen void ExtensionCmdQueue::Thread::checkForUpdates( const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList ) { - ::osl::MutexGuard aGuard( m_mutex ); - - //If someone called stop then we do not update the extension -> game over! - if ( m_bStopped ) - return; - TExtensionCmd pEntry( new ExtensionCmd( ExtensionCmd::CHECK_FOR_UPDATES, vExtensionList ) ); - m_queue.push( pEntry ); - m_eInput = START; - m_wakeup.set(); + _insert( pEntry ); } //------------------------------------------------------------------------------ @@ -888,7 +875,7 @@ void ExtensionCmdQueue::Thread::execute() if (msg.getLength() == 0) // fallback for debugging purposes msg = ::comphelper::anyToString(exc); - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; ::std::auto_ptr<ErrorBox> box( new ErrorBox( currentCmdEnv->activeDialog(), WB_OK, msg ) ); if ( m_pDialogHelper ) @@ -1002,7 +989,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( UpdateDialog* pUpdateDialog; std::vector< UpdateData > vData; - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; pUpdateDialog = new UpdateDialog( m_xContext, m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, vExtensionList, &vData ); @@ -1010,13 +997,13 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( if ( ( pUpdateDialog->Execute() == RET_OK ) && !vData.empty() ) { - // If there is at least one directly downloadable dialog then we + // If there is at least one directly downloadable extension then we // open the install dialog. ::std::vector< UpdateData > dataDownload; int countWebsiteDownload = 0; typedef std::vector< dp_gui::UpdateData >::const_iterator cit; - for ( cit i = vData.begin(); i < vData.end(); i++ ) + for ( cit i = vData.begin(); i < vData.end(); ++i ) { if ( i->sWebsiteURL.getLength() > 0 ) countWebsiteDownload ++; @@ -1036,7 +1023,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( //Now start the webbrowser and navigate to the websites where we get the updates if ( RET_OK == nDialogResult ) { - for ( cit i = vData.begin(); i < vData.end(); i++ ) + for ( cit i = vData.begin(); i < vData.end(); ++i ) { if ( m_pDialogHelper && ( i->sWebsiteURL.getLength() > 0 ) ) m_pDialogHelper->openWebBrowser( i->sWebsiteURL, m_pDialogHelper->getWindow()->GetText() ); @@ -1122,6 +1109,19 @@ void ExtensionCmdQueue::Thread::onTerminated() m_bTerminated = true; } +void ExtensionCmdQueue::Thread::_insert(const TExtensionCmd& rExtCmd) +{ + ::osl::MutexGuard aGuard( m_mutex ); + + // If someone called stop then we do not process the command -> game over! + if ( m_bStopped ) + return; + + m_queue.push( rExtCmd ); + m_eInput = START; + m_wakeup.set(); +} + //------------------------------------------------------------------------------ OUString ExtensionCmdQueue::Thread::searchAndReplaceAll( const OUString &rSource, const OUString &rWhat, @@ -1210,3 +1210,4 @@ void handleInteractionRequest( const uno::Reference< uno::XComponentContext > & } //namespace dp_gui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 90eb0dab07..8794c51132 100755 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.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. @@ -109,3 +110,5 @@ void handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::su } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index b8daa7668d..b1ec3a43df 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.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. @@ -65,7 +66,7 @@ public: virtual ~MyApp(); // Application - virtual void Main(); + virtual int Main(); }; //______________________________________________________________________________ @@ -79,8 +80,9 @@ MyApp::MyApp() } //______________________________________________________________________________ -void MyApp::Main() +int MyApp::Main() { + return EXIT_SUCCESS; } //############################################################################## @@ -206,7 +208,7 @@ void ServiceImpl::setDialogTitle( OUString const & title ) { if ( dp_gui::TheExtensionManager::s_ExtMgr.is() ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; ::rtl::Reference< ::dp_gui::TheExtensionManager > dialog( ::dp_gui::TheExtensionManager::get( m_xComponentContext, m_parent ? *m_parent : Reference<awt::XWindow>(), @@ -234,7 +236,7 @@ void ServiceImpl::startExecuteModal( } catch (Exception & exc) { if (bAppUp) { - const vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; std::auto_ptr<ErrorBox> box( new ErrorBox( Application::GetActiveTopWindow(), WB_OK, exc.Message ) ); @@ -278,7 +280,7 @@ void ServiceImpl::startExecuteModal( } { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; ::rtl::Reference< ::dp_gui::TheExtensionManager > myExtMgr( ::dp_gui::TheExtensionManager::get( m_xComponentContext, @@ -366,3 +368,5 @@ void * SAL_CALL component_getFactory( } } // extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx index 40f5bc9d6f..af3a0bd5b9 100644 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ b/desktop/source/deployment/gui/dp_gui_shared.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 @@ public: } // namespace dp_gui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx deleted file mode 100644 index bc11a4b12b..0000000000 --- a/desktop/source/deployment/gui/dp_gui_system.cxx +++ /dev/null @@ -1,59 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - -#include "dp_gui_system.hxx" -#ifdef WNT -#define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) /* disable warnings within system headers */ -#endif -#include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#endif - -namespace dp_gui { - -//We cannot distinguish Vista and 2008 Server -bool isVista() -{ -#ifdef WNT - OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&osvi); - return osvi.dwMajorVersion >= 6; -#else - return false; -#endif -} - -} //namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 17d5e6af39..564580c520 100755 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.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 "vcl/svapp.hxx" #include "vcl/msgbox.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "toolkit/helper/vclunohelper.hxx" @@ -126,7 +127,7 @@ TheExtensionManager::~TheExtensionManager() //------------------------------------------------------------------------------ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; if ( bCreateUpdDlg ) { @@ -151,7 +152,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) //------------------------------------------------------------------------------ void TheExtensionManager::Show() { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; getDialog()->Show(); } @@ -159,7 +160,7 @@ void TheExtensionManager::Show() //------------------------------------------------------------------------------ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; getDialog()->SetText( rTitle ); } @@ -167,7 +168,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle ) //------------------------------------------------------------------------------ void TheExtensionManager::ToTop( USHORT nFlags ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; getDialog()->ToTop( nFlags ); } @@ -278,7 +279,7 @@ void TheExtensionManager::terminateDialog() { if ( ! dp_misc::office_is_running() ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; delete m_pExtMgrDialog; m_pExtMgrDialog = NULL; delete m_pUpdReqDialog; @@ -445,7 +446,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) { if ( dp_misc::office_is_running() ) { - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; delete m_pExtMgrDialog; m_pExtMgrDialog = NULL; delete m_pUpdReqDialog; @@ -514,7 +515,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) ::rtl::Reference<TheExtensionManager> that( new TheExtensionManager( pParent, xContext ) ); - const ::vos::OGuard guard( Application::GetSolarMutex() ); + const SolarMutexGuard guard; if ( ! s_ExtMgr.is() ) { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); @@ -529,3 +530,4 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) } //namespace dp_gui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 4baa797d63..13ba06d0b3 100755 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.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. @@ -129,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx index 1f92d468d3..3bf0ff0d6c 100644 --- a/desktop/source/deployment/gui/dp_gui_thread.cxx +++ b/desktop/source/deployment/gui/dp_gui_thread.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. @@ -80,3 +81,5 @@ void Thread::run() { void Thread::onTerminated() { release(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx index 0b5a954b99..eb4fe43c94 100644 --- a/desktop/source/deployment/gui/dp_gui_thread.hxx +++ b/desktop/source/deployment/gui/dp_gui_thread.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. @@ -82,3 +83,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index 651cd536e2..099fdcb8f5 100755 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.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. @@ -89,3 +90,5 @@ struct UpdateData } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 6108766118..29b3a3491c 100755 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.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. @@ -107,7 +108,7 @@ #include "vcl/image.hxx" #include "vcl/msgbox.hxx" #include "vcl/svapp.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "comphelper/processfactory.hxx" @@ -124,7 +125,6 @@ #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" #include "dp_gui_shared.hxx" -#include "dp_gui_system.hxx" class KeyEvent; class MouseEvent; @@ -318,7 +318,7 @@ UpdateDialog::Thread::Thread( void UpdateDialog::Thread::stop() { uno::Reference< task::XAbortChannel > abort; { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; abort = m_abort; m_stop = true; } @@ -455,7 +455,7 @@ void UpdateDialog::Thread::handleGeneralError(uno::Any const & exception) } vos::OGuard g(Application::GetSolarMutex()); if (!m_stop) { - m_dialog.addGeneralError(message); + m_dialog.checkingDone(); } } #endif @@ -471,7 +471,7 @@ void UpdateDialog::Thread::handleSpecificError( if (exception >>= e) { data.message = e.Message; } - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_stop) { m_dialog.addSpecificError(data); } @@ -552,7 +552,7 @@ bool UpdateDialog::Thread::update( } ret = !m_stop; } else { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_stop) { m_dialog.addDisabledUpdate(du); } @@ -573,8 +573,7 @@ UpdateDialog::UpdateDialog( m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)), m_updates( *this, DpGuiResId(RID_DLG_UPDATE_UPDATES), - Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)), - Image(DpGuiResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))), + Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))), m_all(this, DpGuiResId(RID_DLG_UPDATE_ALL)), m_description(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTION)), m_PublisherLabel(this, DpGuiResId(RID_DLG_UPDATE_PUBLISHER_LABEL)), @@ -1510,3 +1509,5 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink ) return 1; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index e562c4e845..79c1831cfd 100755 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.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,9 +41,7 @@ #include "svx/checklbx.hxx" #include "tools/link.hxx" #include "tools/solar.h" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/dialog.hxx" #include "vcl/fixed.hxx" #include <svtools/fixedhyper.hxx> @@ -122,8 +121,7 @@ private: public: CheckListBox( UpdateDialog & dialog, ResId const & resource, - Image const & normalStaticImage, - Image const & highContrastStaticImage); + Image const & normalStaticImage); virtual ~CheckListBox(); @@ -230,3 +228,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src index d926360643..3050213703 100755 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src @@ -216,11 +216,6 @@ ModalDialog RID_DLG_UPDATE { File = "caution_12.png"; }; }; - Image RID_DLG_UPDATE_HIGHCONTRASTALERT { - ImageBitmap = Bitmap { - File = "caution_12_h.png"; - }; - }; String RID_DLG_UPDATE_ERROR { Text[en-US] = "Error"; }; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 8f0a262bfc..8f26b574ac 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.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. @@ -41,7 +42,7 @@ #include "vcl/dialog.hxx" #include "vcl/msgbox.hxx" #include "vcl/svapp.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vcl/dialog.hxx" #include "cppuhelper/implbase3.hxx" @@ -79,7 +80,7 @@ #include "dp_gui_extensioncmdqueue.hxx" #include "ucbhelper/content.hxx" #include "osl/mutex.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "rtl/ref.hxx" #include "com/sun/star/uno/Sequence.h" #include "comphelper/anytostring.hxx" @@ -187,7 +188,7 @@ UpdateInstallDialog::Thread::Thread( void UpdateInstallDialog::Thread::stop() { cssu::Reference< css::task::XAbortChannel > abort; { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; abort = m_abort; m_stop = true; } @@ -216,7 +217,7 @@ void UpdateInstallDialog::Thread::execute() { //make sure m_dialog is still alive - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (! m_stop) m_dialog.updateDone(); } @@ -376,7 +377,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() sal_uInt16 count = 0; typedef std::vector<UpdateData>::iterator It; - for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); i++) + for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); ++i) { UpdateData & curData = *i; @@ -388,7 +389,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() //update the name of the extension which is to be downloaded { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -422,7 +423,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() } //update the progress and display download error { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -449,7 +450,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() } catch (cssu::Exception & e) { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -460,7 +461,7 @@ void UpdateInstallDialog::Thread::installExtensions() { //Update the fix text in the dialog to "Installing extensions..." { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -470,11 +471,11 @@ void UpdateInstallDialog::Thread::installExtensions() sal_uInt16 count = 0; typedef std::vector<UpdateData>::iterator It; - for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); i++, count++) + for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); ++i, ++count) { //update the name of the extension which is to be installed { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -498,7 +499,7 @@ void UpdateInstallDialog::Thread::installExtensions() cssu::Reference< css::task::XAbortChannel > xAbortChannel( curData.aInstalledPackage->createAbortChannel() ); { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -554,7 +555,7 @@ void UpdateInstallDialog::Thread::installExtensions() if (bLicenseDeclined) { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -563,7 +564,7 @@ void UpdateInstallDialog::Thread::installExtensions() } else if (!xExtension.is() || bError) { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -572,7 +573,7 @@ void UpdateInstallDialog::Thread::installExtensions() } } { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -599,7 +600,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads() void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) { { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -634,7 +635,7 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update { //the user may have cancelled the dialog because downloading took to long { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_stop) { return; } @@ -754,3 +755,5 @@ void UpdateCommandEnv::pop() throw (cssu::RuntimeException) } //end namespace dp_gui + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 73041853d3..a23488bfbf 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.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 INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX #include "sal/config.h" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/fixed.hxx" #include "vcl/dialog.hxx" #include "svtools/prgsbar.hxx" @@ -142,3 +141,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index c8c79dbdbc..da6d04a67e 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.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. @@ -89,7 +90,7 @@ protected: }; struct LicenseDialogImpl : public ModalDialog -{ +{ cssu::Reference<cssu::XComponentContext> m_xComponentContext; FixedText m_ftHead; FixedText m_ftBody1; @@ -101,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog LicenseView m_mlLicense; PushButton m_pbDown; FixedLine m_flBottom; - + OKButton m_acceptButton; CancelButton m_declineButton; @@ -120,7 +121,7 @@ struct LicenseDialogImpl : public ModalDialog const ::rtl::OUString & sLicenseText); virtual void Activate(); - + }; LicenseView::LicenseView( Window* pParent, const ResId& rResId ) @@ -214,13 +215,6 @@ LicenseDialogImpl::LicenseDialogImpl( { - if (GetSettings().GetStyleSettings().GetHighContrastMode()) - { - // high contrast mode needs other images - m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC))); - m_fiArrow2.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC))); - } - FreeResource(); m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); @@ -306,7 +300,7 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args, //______________________________________________________________________________ void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException) { - + } //______________________________________________________________________________ @@ -328,3 +322,4 @@ sal_Int16 LicenseDialog::solar_execute() } // namespace dp_gui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 1f190298ff..7e7a8592e6 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.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. @@ -69,3 +70,5 @@ public: }; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index fe3921bf50..5f73df487d 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -55,7 +55,6 @@ SLOFILES = \ $(SLO)$/dp_gui_updatedialog.obj \ $(SLO)$/dp_gui_updateinstalldialog.obj \ $(SLO)$/dp_gui_autoscrolledit.obj \ - $(SLO)$/dp_gui_system.obj \ $(SLO)$/dp_gui_extensioncmdqueue.obj \ $(SLO)$/descedit.obj diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx index 414d3639d4..3fa3d22679 100644 --- a/desktop/source/deployment/inc/db.hxx +++ b/desktop/source/deployment/inc/db.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. @@ -27,6 +28,8 @@ #ifndef BERKELEYDBPROXY_DB_HXX_ #define BERKELEYDBPROXY_DB_HXX_ +#include <boost/noncopyable.hpp> + #ifdef SYSTEM_DB #include <db.h> #else @@ -42,26 +45,12 @@ extern "C" { typedef void (*db_free_fcn_type)(void *); } - namespace berkeleydbproxy { class DbEnv; class Dbc; class Dbt; - namespace db_internal - { - class Noncopyable - { - // not implemented - Noncopyable(const Noncopyable&); - void operator=(const Noncopyable&); - protected: - Noncopyable() {} - ~Noncopyable() {} - }; - } - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException { rtl::OString what_; @@ -77,7 +66,7 @@ namespace berkeleydbproxy { }; - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : db_internal::Noncopyable + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : boost::noncopyable { friend class Db; @@ -88,7 +77,7 @@ namespace berkeleydbproxy { static char *strerror(int); }; - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : db_internal::Noncopyable + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : boost::noncopyable { private: DB* m_pDBP; @@ -115,7 +104,7 @@ namespace berkeleydbproxy { int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags); }; - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : db_internal::Noncopyable + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : boost::noncopyable { friend class Db; friend class Dbt; @@ -155,19 +144,4 @@ namespace berkeleydbproxy { } #endif - - - - - - - - - - - - - - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index 67a92937a5..2e57c06275 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.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. @@ -80,3 +81,5 @@ namespace Dependencies { } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index debdae591f..78b824c87a 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.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. @@ -297,3 +298,5 @@ DescriptionInfoset getDescriptionInfoset(::rtl::OUString const & sExtensionFolde } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index 18c75e0505..f7b6b1f120 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.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. @@ -90,3 +91,5 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateLegacyIdentifier( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 6999e022b6..3aca761c2d 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -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. @@ -148,3 +149,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index b6b127579c..bbf6d5274b 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -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. @@ -177,3 +178,5 @@ void syncRepositories(::com::sun::star::uno::Reference< } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx index a1604df089..bc2cee1df2 100644 --- a/desktop/source/deployment/inc/dp_misc_api.hxx +++ b/desktop/source/deployment/inc/dp_misc_api.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,5 @@ #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 5e3e1eaf70..b1597f3bb5 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -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. @@ -63,3 +64,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index 5ef5fe080d..f9773efa1a 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.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 INCLUDED_DP_PLATFORM_HXX -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX #include "dp_misc_api.hxx" -#endif #include "com/sun/star/uno/Sequence.hxx" #include "rtl/ustring.hxx" @@ -54,3 +53,5 @@ bool hasValidPlatform( ::com::sun::star::uno::Sequence< ::rtl::OUString > const } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 03d28c4d87..96fd049207 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -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. @@ -65,3 +66,5 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 1409b27d6a..c2fcdcd7e0 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -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. @@ -89,3 +90,5 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index 8e364823a1..c3491a7451 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.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. @@ -46,3 +47,5 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Order compareVersions( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index cad9e91bb5..376df332fb 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -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. @@ -55,3 +56,5 @@ void xml_parse( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index f5866cb41a..950e46174d 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.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. @@ -204,3 +205,5 @@ void ActivePackages::erase( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index be2c3a20e0..569e4b7852 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.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. @@ -97,3 +98,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 48c88bccc1..ac9b17aedc 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.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. @@ -368,3 +369,4 @@ bool singleton_entries( } // namespace dp_info +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 48081fe7b7..645163edbb 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.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. @@ -1694,3 +1695,4 @@ void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException) } // namespace dp_manager +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index d99f41d42c..fa4a9078ac 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -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. @@ -292,3 +293,4 @@ inline void PackageManagerImpl::logIntern( css::uno::Any const & status ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index ec312621c7..ccbaadcb8a 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.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. @@ -198,3 +199,4 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context ) } // namespace factory } // namespace dp_manager +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx index 3a559b8ae5..ce403181ab 100644 --- a/desktop/source/deployment/misc/db.cxx +++ b/desktop/source/deployment/misc/db.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. @@ -270,3 +271,4 @@ void db_internal::raise_error(int dberr, const char * where) //---------------------------------------------------------------------------- } // namespace ecomp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 599826a957..b190783c40 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.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. @@ -80,14 +81,14 @@ check(::dp_misc::DescriptionInfoset const & infoset) { unsatisfied(n); ::sal_Int32 unsat = 0; for (::sal_Int32 i = 0; i < n; ++i) { - static char const minimalVersion[] = "OpenOffice.org-minimal-version"; + static rtl::OUString const minimalVersion( + RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org-minimal-version")); css::uno::Reference< css::xml::dom::XElement > e( deps->item(i), css::uno::UNO_QUERY_THROW); bool sat = false; if (e->getNamespaceURI().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(xmlNamespace)) - && e->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(minimalVersion))) + && (e->getTagName() == minimalVersion)) { sat = satisfiesMinimalVersion( e->getAttribute( @@ -107,19 +108,16 @@ check(::dp_misc::DescriptionInfoset const & infoset) { ::dp_misc::compareVersions( v, e->getAttribute( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))) - != ::dp_misc::GREATER; + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); } else if (e->hasAttributeNS( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)), - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(minimalVersion)))) + minimalVersion)) { sat = satisfiesMinimalVersion( e->getAttributeNS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)), - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(minimalVersion)))); + minimalVersion)); } if (!sat) { unsatisfied[unsat++] = e; @@ -169,3 +167,5 @@ check(::dp_misc::DescriptionInfoset const & infoset) { } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index e73aeb2780..0efc0ae091 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.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. @@ -862,3 +863,5 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index 4126a99cd5..f9fb809b51 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.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. @@ -71,3 +72,5 @@ namespace dp_misc { } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 89c2e9a06f..57cc3bf2e7 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.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. @@ -183,3 +184,4 @@ void AbortChannel::sendAbort() throw (RuntimeException) } // dp_misc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index c988e6494b..7e6f9ddb0b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.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. @@ -53,12 +54,10 @@ #include <comphelper/processfactory.hxx> #ifdef WNT -//#include "tools/prewin.h" #define UNICODE #define _UNICODE #define WIN32_LEAN_AND_MEAN #include <Windows.h> -//#include "tools/postwin.h" #endif using namespace ::com::sun::star; @@ -420,7 +419,7 @@ oslProcess raiseProcess( case osl_Process_E_NotFound: throw RuntimeException( OUSTR("image not found!"), 0 ); case osl_Process_E_TimedOut: - throw RuntimeException( OUSTR("timout occured!"), 0 ); + throw RuntimeException( OUSTR("timout occurred!"), 0 ); case osl_Process_E_NoPermission: throw RuntimeException( OUSTR("permission denied!"), 0 ); case osl_Process_E_Unknown: @@ -628,3 +627,5 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 3c002a9b47..dff464b829 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.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. @@ -62,11 +63,16 @@ #define PLATFORM_SOLARIS_X86 "solaris_x86" #define PLATFORM_FREEBSD_X86 "freebsd_x86" #define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64" +#define PLATFORM_NETBSD_X86 "netbsd_x86" +#define PLATFORM_NETBSD_X86_64 "netbsd_x86_64" #define PLATFORM_MACOSX_X86 "macosx_x86" #define PLATFORM_MACOSX_PPC "macosx_powerpc" #define PLATFORM_OS2_X86 "os2_x86" +#define PLATFORM_OPENBSD_X86 "openbsd_x86" +#define PLATFORM_OPENBSD_X86_64 "openbsd_x86_64" +#define PLATFORM_AIX_POWERPC "aix_powerpc" @@ -107,9 +113,7 @@ namespace ::rtl::OUStringBuffer buf; buf.append( StrOperatingSystem::get() ); buf.append( static_cast<sal_Unicode>('_') ); - OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") ); - ::rtl::Bootstrap::expandMacros( arch ); - buf.append( arch ); + buf.append( StrCPU::get() ); return buf.makeStringAndClear(); } }; @@ -171,16 +175,26 @@ namespace ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64))) ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64")); + else if (token.equals(OUSTR(PLATFORM_NETBSD_X86))) + ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("x86")); + else if (token.equals(OUSTR(PLATFORM_NETBSD_X86_64))) + ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("X86_64")); else if (token.equals(OUSTR(PLATFORM_MACOSX_X86))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_OS2_X86))) ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86")); + else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC))) + ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC")); + else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86))) + ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("x86")); + else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86_64))) + ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("X86_64")); else { OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. " - "Check the platform element in the descripion.xml"); + "Check the platform element in the description.xml"); ret = false; } return ret; @@ -230,3 +244,4 @@ bool hasValidPlatform( css::uno::Sequence<OUString> const & platformStrings) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 4a82c7b2fa..eb92eabba3 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.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. @@ -231,3 +232,4 @@ lang::Locale getOfficeLocale() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 122cbb6ecf..170a403ddc 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.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. @@ -318,3 +319,5 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 563612c675..c999d32cc2 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.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. @@ -72,3 +73,5 @@ namespace dp_misc { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index e36ecacd2e..6909283550 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.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. @@ -574,16 +575,14 @@ BackendImpl::BackendImpl( getPlatformString(), OUSTR("*" SAL_DLLEXTENSION), getResourceString(RID_STR_DYN_COMPONENT), - RID_IMG_COMPONENT, - RID_IMG_COMPONENT_HC ) ), + RID_IMG_COMPONENT) ), m_xJavaComponentTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.uno-component;" "type=Java"), OUSTR("*.jar"), getResourceString(RID_STR_JAVA_COMPONENT), - RID_IMG_JAVA_COMPONENT, - RID_IMG_JAVA_COMPONENT_HC ) ), + RID_IMG_JAVA_COMPONENT) ), m_xPythonComponentTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.uno-component;" @@ -606,7 +605,7 @@ BackendImpl::BackendImpl( "type=RDB"), OUSTR("*.rdb"), getResourceString(RID_STR_RDB_TYPELIB), - RID_IMG_TYPELIB, RID_IMG_TYPELIB_HC ) ), + RID_IMG_TYPELIB ) ), m_xJavaTypelibTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.uno-typelibrary;" @@ -1845,3 +1844,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 07cd063732..d160147c40 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.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. @@ -193,13 +194,13 @@ BackendImpl::BackendImpl( "vnd.sun.star.configuration-data"), OUSTR("*.xcu"), getResourceString(RID_STR_CONF_DATA), - RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ), + RID_IMG_CONF_XML ) ), m_xConfSchemaTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.configuration-schema"), OUSTR("*.xcs"), getResourceString(RID_STR_CONF_SCHEMA), - RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ), + RID_IMG_CONF_XML ) ), m_typeInfos( 2 ) { m_typeInfos[ 0 ] = m_xConfDataTypeInfo; @@ -706,7 +707,10 @@ void BackendImpl::PackageImpl::processPackage_( OSL_ASSERT(data); that->addToConfigmgrIni( m_isSchema, false, data->iniEntry, xCmdEnv ); } - else + //No need for live-deployment for bundled extension, because OOo + //restarts after installation + if (that->m_eContext != CONTEXT_BUNDLED + && !startup) { ConfigurationBackendDb::Data data; if (!m_isSchema) @@ -742,6 +746,9 @@ void BackendImpl::PackageImpl::processPackage_( data.iniEntry = dp_misc::makeRcTerm(url); that->addDataToDb(getURL(), data); } + that->addToConfigmgrIni( m_isSchema, url, xCmdEnv ); + data.iniEntry = dp_misc::makeRcTerm(url); + that->addDataToDb(getURL(), data); } else // revoke { @@ -819,3 +826,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace backend } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 3062dd130c..3e447d33dc 100755 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.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. @@ -638,7 +639,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( catch (Exception &) { Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( - OUSTR("unexpected exception occured!"), + OUSTR("unexpected exception occurred!"), static_cast<OWeakObject *>(this), exc ); } } @@ -808,15 +809,23 @@ OUString Package::TypeInfo::getFileFilter() throw (RuntimeException) } //______________________________________________________________________________ -Any Package::TypeInfo::getIcon( sal_Bool highContrast, sal_Bool smallIcon ) +/************************** + * Get Icon + * + * @param highContrast NOTE: disabled the returning of high contrast icons. + * This bool is a noop now. + * @param smallIcon Return the small version of the icon + */ +Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool smallIcon ) throw (RuntimeException) { if (! smallIcon) return Any(); - const sal_uInt16 nIconId = (highContrast ? m_smallIcon_HC : m_smallIcon); + const sal_uInt16 nIconId = m_smallIcon; return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) ); } } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 6c9f5d231e..f60bc7a822 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.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. @@ -574,3 +575,4 @@ Reference<deployment::XPackageRegistry> SAL_CALL create( } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 09bf296b79..54385830ae 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.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. @@ -71,7 +72,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool getFileAttributes(sal_uInt64& out_Attributes); bool isUrlTargetInExtension(); - public: inline ExecutablePackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -121,8 +121,7 @@ BackendImpl::BackendImpl( OUSTR("application/vnd.sun.star.executable"), OUSTR(""), OUSTR("Executable"), - RID_IMG_COMPONENT, - RID_IMG_COMPONENT_HC ) ) + RID_IMG_COMPONENT ) ) { if (!transientMode()) { @@ -343,3 +342,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx.orig index 40271e3870..ddb3a29447 100644 --- a/desktop/source/deployment/gui/dp_gui_system.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx.orig @@ -25,13 +25,52 @@ * ************************************************************************/ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX +#if ! defined INCLUDED_DP_EXECUTABLEBACKENDDB_HXX +#define INCLUDED_DP_EXECUTABLEBACKENDDB_HXX + +#include "rtl/ustring.hxx" +#include "dp_backenddb.hxx" + +namespace css = ::com::sun::star; + +namespace com { namespace sun { namespace star { + namespace uno { + class XComponentContext; + } +}}} + +namespace dp_registry { +namespace backend { +namespace executable { + +/* The XML file stores the extensions which are currently registered. + They will be removed when they are revoked. + The format looks like this: + +<?xml version="1.0"?> + */ +class ExecutableBackendDb: public dp_registry::backend::RegisteredDb +{ +protected: + virtual ::rtl::OUString getDbNSName(); + + virtual ::rtl::OUString getNSPrefix(); + + virtual ::rtl::OUString getRootElementName(); + + virtual ::rtl::OUString getKeyElementName(); + +public: + + ExecutableBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, + ::rtl::OUString const & url); + +}; -/// @HTML -namespace dp_gui { -bool isVista(); } +} +} #endif + diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 02a2b9d80f..c7dbe773ea 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -1,10 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * * This file is part of OpenOffice.org. * @@ -115,7 +116,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference< ucb::XSimpleFileAccess > getFileAccess( void ); Reference< ucb::XSimpleFileAccess > m_xSFA; - + const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo; Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos; std::auto_ptr<HelpBackendDb> m_backendDb; @@ -123,7 +124,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -142,7 +143,7 @@ BackendImpl::BackendImpl( OUSTR("application/vnd.sun.star.help"), rtl::OUString(), getResourceString(RID_STR_HELP), - RID_IMG_HELP, RID_IMG_HELP_HC ) ), + RID_IMG_HELP ) ), m_typeInfos( 1 ) { m_typeInfos[ 0 ] = m_xHelpTypeInfo; @@ -190,7 +191,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( throw lang::IllegalArgumentException( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType_, type, subType, ¶ms )) @@ -273,12 +274,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -635,7 +636,7 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, if( nLastDot != -1 ) { rtl::OUString aExt = aURL.copy( nLastDot + 1 ); - if( aExt.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "xhp" ) ) ) + if( aExt.equalsIgnoreAsciiCase( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "xhp" )) ) ) o_rXhpFileVector.push_back( aURL ); } } @@ -649,17 +650,17 @@ Reference< ucb::XSimpleFileAccess > BackendImpl::getFileAccess( void ) Reference<XComponentContext> const & xContext = getComponentContext(); if( xContext.is() ) { - m_xSFA = Reference< ucb::XSimpleFileAccess >( + m_xSFA = Reference< ucb::XSimpleFileAccess >( xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )), xContext ), UNO_QUERY ); } if( !m_xSFA.is() ) { throw RuntimeException( - ::rtl::OUString::createFromAscii( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dp_registry::backend::help::BackendImpl::getFileAccess(), " - "could not instatiate SimpleFileAccess." ), + "could not instatiate SimpleFileAccess." )), Reference< XInterface >() ); } } @@ -679,3 +680,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace backend } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 0de8cc43ee..a8299aa1db 100755 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -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. @@ -55,8 +56,7 @@ namespace css = ::com::sun::star; class PackageRegistryBackend; -char const* const BACKEND_SERVICE_NAME = -"com.sun.star.deployment.PackageRegistryBackend"; +#define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend" typedef ::cppu::WeakComponentImplHelper1< css::deployment::XPackage > t_PackageBase; @@ -121,16 +121,16 @@ public: const ::rtl::OUString m_mediaType; const ::rtl::OUString m_fileFilter; const ::rtl::OUString m_shortDescr; - const sal_uInt16 m_smallIcon, m_smallIcon_HC; + const sal_uInt16 m_smallIcon; public: virtual ~TypeInfo(); TypeInfo( ::rtl::OUString const & mediaType, ::rtl::OUString const & fileFilter, ::rtl::OUString const & shortDescr, - sal_uInt16 smallIcon, sal_uInt16 smallIcon_HC ) + sal_uInt16 smallIcon) : m_mediaType(mediaType), m_fileFilter(fileFilter), m_shortDescr(shortDescr), - m_smallIcon(smallIcon), m_smallIcon_HC(smallIcon_HC) + m_smallIcon(smallIcon) {} // XPackageTypeInfo virtual ::rtl::OUString SAL_CALL getMediaType() @@ -398,3 +398,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 11514f342d..30c5923fc4 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.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. @@ -306,8 +307,7 @@ BackendImpl::BackendImpl( OUSTR("application/vnd.sun.star.package-bundle"), OUSTR("*.oxt;*.uno.pkg"), getResourceString(RID_STR_PACKAGE_BUNDLE), - RID_IMG_DEF_PACKAGE_BUNDLE, - RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ), + RID_IMG_DEF_PACKAGE_BUNDLE ) ), m_xLegacyBundleTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.legacy-package-bundle"), @@ -352,7 +352,7 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames() throw (RuntimeException) { return comphelper::makeSequence( - OUString::createFromAscii(BACKEND_SERVICE_NAME) ); + OUString(RTL_CONSTASCII_USTRINGPARAM(BACKEND_SERVICE_NAME)) ); } // XPackageRegistry @@ -1693,3 +1693,4 @@ Reference<deployment::XPackageRegistry> create( } // namespace backend } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index 9eeae38260..ccc2b29874 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.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,11 +29,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_desktop.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/ucb/XCommandEnvironment.hpp" + #include "dp_script.hrc" #include "dp_resource.h" #include "dp_xml.h" #include "dp_lib_container.h" + +#include "rtl/ustring.hxx" #include "ucbhelper/content.hxx" +#include "xmlscript/xmllib_imexp.hxx" using namespace ::dp_misc; @@ -71,3 +78,4 @@ OUString LibraryContainer::get_libname( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 3a3079755c..009846a3c0 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -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,11 +29,20 @@ #if ! defined INCLUDED_DP_LIB_CONTAINER_H #define INCLUDED_DP_LIB_CONTAINER_H -#include "rtl/ustring.hxx" -#include "xmlscript/xmllib_imexp.hxx" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/ucb/XCommandEnvironment.hpp" +#include <com/sun/star/uno/Reference.hxx> +namespace com { namespace sun { namespace star { + namespace uno { + class XComponentContext; + } + namespace ucb { + class XCommandEnvironment; + } +}}} + +namespace rtl { + class OUString; +} namespace css = ::com::sun::star; @@ -55,3 +65,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index ab9a346b5a..afd0d179de 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.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. @@ -61,7 +62,6 @@ namespace { typedef ::cppu::ImplInheritanceHelper1< ::dp_registry::backend::PackageRegistryBackend, util::XUpdatable > t_helper; -//============================================================================== class BackendImpl : public t_helper { class PackageImpl : public ::dp_registry::backend::Package @@ -83,7 +83,7 @@ class BackendImpl : public t_helper bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, @@ -162,13 +162,13 @@ BackendImpl::BackendImpl( "vnd.sun.star.basic-library"), OUString() /* no file filter */, getResourceString(RID_STR_BASIC_LIB), - RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) ), + RID_IMG_SCRIPTLIB) ), m_xDialogLibTypeInfo( new Package::TypeInfo( OUSTR("application/" "vnd.sun.star.dialog-library"), OUString() /* no file filter */, getResourceString(RID_STR_DIALOG_LIB), - RID_IMG_DIALOGLIB, RID_IMG_DIALOGLIB_HC ) ), + RID_IMG_DIALOGLIB) ), m_typeInfos( 2 ) { m_typeInfos[ 0 ] = m_xBasicLibTypeInfo; @@ -314,15 +314,13 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const } return pBackend; } -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > BackendImpl::PackageImpl::isRegistered_( - ::osl::ResettableMutexGuard &, - ::rtl::Reference<AbortChannel> const &, - Reference<XCommandEnvironment> const & xCmdEnv ) + ::osl::ResettableMutexGuard & /* guard */, + ::rtl::Reference<AbortChannel> const & /* abortChannel */, + Reference<XCommandEnvironment> const & /* xCmdEnv */ ) { - (void)xCmdEnv; - BackendImpl * that = getMyBackend(); Reference< deployment::XPackage > xThisPackage( this ); @@ -332,16 +330,13 @@ BackendImpl::PackageImpl::isRegistered_( beans::Ambiguous<sal_Bool>( registered, false /* IsAmbiguous */ ) ); } -//______________________________________________________________________________ void BackendImpl::PackageImpl::processPackage_( - ::osl::ResettableMutexGuard &, + ::osl::ResettableMutexGuard & /* guard */, bool doRegisterPackage, bool startup, ::rtl::Reference<AbortChannel> const &, Reference<XCommandEnvironment> const & xCmdEnv ) { - (void)xCmdEnv; - BackendImpl * that = getMyBackend(); Reference< deployment::XPackage > xThisPackage( this ); @@ -502,3 +497,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace backend } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index e09e721b27..63015ab1e4 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.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. @@ -71,3 +72,4 @@ public: } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index 7db0952c81..4ac316e785 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.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. @@ -98,9 +99,9 @@ ParcelDescDocHandler::startElement( const OUString& aName, aName + OUSTR("\n")); if ( !skipIndex ) { - if ( aName.equals( OUString::createFromAscii( "parcel" ) ) ) + if ( aName.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "parcel" )) ) ) { - m_sLang = xAttribs->getValueByName( OUString::createFromAscii( "language" ) ); + m_sLang = xAttribs->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM( "language" )) ); } ++skipIndex; } @@ -128,3 +129,4 @@ void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index d90a38f376..6d2dc52006 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.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. @@ -87,3 +88,5 @@ public: } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 24302351fb..9f0e7730c0 100755 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.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. @@ -178,7 +179,7 @@ BackendImpl::BackendImpl( OUSTR("application/vnd.sun.star.framework-script"), OUString() /* no file filter */, OUSTR("Scripting Framework Script Library"), - RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) ) + RID_IMG_SCRIPTLIB ) ) { if (! transientMode()) { @@ -274,7 +275,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( { if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.framework-script")) { - OUString lang = OUString::createFromAscii("Script"); + OUString lang = OUString(RTL_CONSTASCII_USTRINGPARAM("Script")); OUString sParcelDescURL = makeURL( url, OUSTR("parcel-descriptor.xml") ); @@ -430,3 +431,4 @@ extern sdecl::ServiceDecl const serviceDecl( } // namespace backend } // namespace dp_registry +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |