diff options
Diffstat (limited to 'desktop/source/splash')
-rwxr-xr-x[-rw-r--r--] | desktop/source/splash/makefile.mk | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | desktop/source/splash/services_spl.cxx | 26 | ||||
-rwxr-xr-x | desktop/source/splash/spl.component | 37 | ||||
-rwxr-xr-x[-rw-r--r--] | desktop/source/splash/splash.cxx | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | desktop/source/splash/splash.hxx | 0 |
5 files changed, 59 insertions, 40 deletions
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 351b055435fb..8db499d7c913 100644..100755 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -70,3 +70,11 @@ SHL1STDLIBS= \ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/spl.component + +$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + spl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt spl.component diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index d79adf8725d5..e4e80fbe13f3 100644..100755 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -92,32 +92,6 @@ component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo( - void* pServiceManager, - void* pRegistryKey) -{ - Reference<XMultiServiceFactory> xMan( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( - reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - // iterate over service names and register them... - OUString aImpl; - const char* pServiceName = NULL; - const char* pImplName = NULL; - for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { - pServiceName= pServices[i]; - pImplName = pImplementations[i]; - aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) - + OUString::createFromAscii(pImplName) - + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(OUString::createFromAscii(pServiceName)); - } - return sal_True; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component new file mode 100755 index 000000000000..2caecf5c0e4b --- /dev/null +++ b/desktop/source/splash/spl.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.desktop.FirstStart"> + <service name="com.sun.star.task.Job"/> + </implementation> + <implementation name="com.sun.star.office.comp.SplashScreen"> + <service name="com.sun.star.office.SplashScreen"/> + </implementation> +</component> diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index eaf9751a3aff..bdcda986a08f 100644..100755 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -102,7 +102,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange) _bProgressEnd = sal_False; SolarMutexGuard aSolarGuard; if ( _eBitmapMode == BM_FULLSCREEN ) - ShowFullScreenMode( TRUE ); + ShowFullScreenMode( sal_True ); Show(); Paint(Rectangle()); Flush(); @@ -129,7 +129,7 @@ void SAL_CALL SplashScreen::reset() if (_bVisible && !_bProgressEnd ) { if ( _eBitmapMode == BM_FULLSCREEN ) - ShowFullScreenMode( TRUE ); + ShowFullScreenMode( sal_True ); Show(); updateStatus(); } @@ -146,7 +146,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText) if (_bVisible && !_bProgressEnd) { if ( _eBitmapMode == BM_FULLSCREEN ) - ShowFullScreenMode( TRUE ); + ShowFullScreenMode( sal_True ); Show(); updateStatus(); } @@ -162,7 +162,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue) SolarMutexGuard aSolarGuard; if (_bVisible && !_bProgressEnd) { if ( _eBitmapMode == BM_FULLSCREEN ) - ShowFullScreenMode( TRUE ); + ShowFullScreenMode( sal_True ); Show(); if (nValue >= _iMax) _iProgress = _iMax; else _iProgress = nValue; @@ -319,36 +319,36 @@ void SplashScreen::loadConfig() if ( sProgressFrameColor.getLength() ) { - UINT8 nRed = 0; + sal_uInt8 nRed = 0; sal_Int32 idx = 0; sal_Int32 temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32(); if ( idx != -1 ) { - nRed = static_cast< UINT8 >( temp ); + nRed = static_cast< sal_uInt8 >( temp ); temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32(); } if ( idx != -1 ) { - UINT8 nGreen = static_cast< UINT8 >( temp ); - UINT8 nBlue = static_cast< UINT8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() ); + sal_uInt8 nGreen = static_cast< sal_uInt8 >( temp ); + sal_uInt8 nBlue = static_cast< sal_uInt8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() ); _cProgressFrameColor = Color( nRed, nGreen, nBlue ); } } if ( sProgressBarColor.getLength() ) { - UINT8 nRed = 0; + sal_uInt8 nRed = 0; sal_Int32 idx = 0; sal_Int32 temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32(); if ( idx != -1 ) { - nRed = static_cast< UINT8 >( temp ); + nRed = static_cast< sal_uInt8 >( temp ); temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32(); } if ( idx != -1 ) { - UINT8 nGreen = static_cast< UINT8 >( temp ); - UINT8 nBlue = static_cast< UINT8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() ); + sal_uInt8 nGreen = static_cast< sal_uInt8 >( temp ); + sal_uInt8 nBlue = static_cast< sal_uInt8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() ); _cProgressBarColor = Color( nRed, nGreen, nBlue ); } } @@ -500,7 +500,7 @@ void SplashScreen::Paint( const Rectangle&) if(!_bVisible) return; //native drawing - BOOL bNativeOK = FALSE; + sal_Bool bNativeOK = sal_False; // in case of native controls we need to draw directly to the window if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) ) @@ -521,7 +521,7 @@ void SplashScreen::Paint( const Rectangle&) } if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect, - CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE ) + CTRL_STATE_ENABLED, aValue, _sProgressText )) != sal_False ) { return; } diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 0d4858402b83..0d4858402b83 100644..100755 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx |