diff options
863 files changed, 20964 insertions, 23862 deletions
diff --git a/.gitignore b/.gitignore index 25df1065c1ec..9ea0cd6ebaf0 100755 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,18 @@ # backup and temporary files *~ .*.sw[op] +.gitattributes # the build directories /*/unxlng?? /*/unxlng??.pro /*/wntmsc??? /*/wntmsc???.pro +/*/wntgcc? +/*/wntgcc?.pro /*/unxmac?? /*/unxmac??.pro +/*/unxios? +/*/unxios?.pro +/*/unxand? +/*/unxand?.pro diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index c8213f6c1301..83ea7b8a6316 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -488,7 +488,7 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG ) // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -497,7 +497,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) { void* pReturn = NULL; if (pServiceManager != NULL ) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 1e2d0b70800e..b7a68573c3da 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -70,8 +70,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mpXOverlay( NULL ), mnDuration( 0 ), mnWidth( 0 ), - mnHeight( 0 ), - maSizeCondition( osl_createCondition() ) + mnHeight( 0 ) { // Initialize GStreamer library int argc = 1; @@ -234,7 +233,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) #if OSL_DEBUG_LEVEL > 2 sal_Bool aSuccess = #endif - osl_setCondition( maSizeCondition ); + maSizeCondition.set(); DBG( "%p set condition result: %d", this, aSuccess ); } } @@ -245,7 +244,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) #if OSL_DEBUG_LEVEL > 2 sal_Bool aSuccess = #endif - osl_setCondition( maSizeCondition ); + maSizeCondition.set(); DBG( "%p set condition result: %d", this, aSuccess ); } } @@ -540,7 +539,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) #if OSL_DEBUG_LEVEL > 2 oslConditionResult aResult = #endif - osl_waitCondition( maSizeCondition, &aTimeout ); + maSizeCondition.wait( &aTimeout ); if( mbFakeVideo ) { mbFakeVideo = sal_False; diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 02839dc9b2bd..0e04d67d7f91 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -29,7 +29,7 @@ #ifndef _PLAYER_HXX #define _PLAYER_HXX -#include <osl/conditn.h> +#include <osl/conditn.hxx> #include "gstcommon.hxx" #include "com/sun/star/media/XPlayer.hdl" @@ -103,7 +103,7 @@ private: int mnWidth; int mnHeight; - oslCondition maSizeCondition; + osl::Condition maSizeCondition; }; } // namespace gstreamer diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index 4695ba646a47..ff18652e79da 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -39,12 +39,12 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) ); } -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 85e14abf9fb2..f7bf8de83df1 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -36,27 +36,15 @@ class ResMgr; #ifdef WNT #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False - -#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 "" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False #else #ifdef QUARTZ #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False - -#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 "" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False #else #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False - -#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 "com.sun.star.comp.avmedia.Manager_Java" -#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_True #endif #endif diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx index 275c9446e23b..df7d43f6a8e1 100644 --- a/avmedia/source/quicktime/quicktimeuno.cxx +++ b/avmedia/source/quicktime/quicktimeuno.cxx @@ -44,7 +44,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -53,7 +53,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index 90fc361b24de..43c4382b67d4 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -44,7 +44,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -53,7 +53,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index 85218a34965f..7877ea5f9060 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -31,6 +31,9 @@ #include <basic/sbxdef.hxx> #include <svl/svarray.hxx> +#include <rtl/ustring.hxx> + +using rtl::OUString; #define _BASIC_TEXTPORTIONS @@ -76,7 +79,7 @@ String getBasicTypeName( SbxDataType eType ); // important for SbUnoObj instances // implementation: basic/source/classes/sbunoobj.cxx class SbxObject; -String getBasicObjectTypeName( SbxObject* pObj ); +::rtl::OUString getBasicObjectTypeName( SbxObject* pObj ); // Allows Basic IDE to set watch mode to suppress errors // implementation: basic/source/runtime/runtime.cxx diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx index 0539246e071b..faeb99ef2160 100644 --- a/basic/inc/basic/sbuno.hxx +++ b/basic/inc/basic/sbuno.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} // Returns a SbxObject that wrapps an Uno Interface // Implementation in basic/source/classes/sbunoobj.cxx -SbxObjectRef GetSbUnoObject( const String& aName, const com::sun::star::uno::Any& aUnoObj_ ); +SbxObjectRef GetSbUnoObject( const ::rtl::OUString& aName, const com::sun::star::uno::Any& aUnoObj_ ); // Force creation of all properties for debugging void createAllObjectProperties( SbxObject* pObj ); diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 1febb2809bf4..aeeb46acc4d7 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -243,9 +243,7 @@ int BasicApp::Main( ) try { -#ifdef _USE_UNO uno::Reference< XContentProviderManager > xUcb = InitializeUCB(); -#endif { DirEntry aIniPath( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) ); diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index e0c2b37bd06d..20b7bd1c7cf8 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -204,12 +204,18 @@ OptConfEdit::OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nRes rBase.SetModifyHdl( LINK( this, OptConfEdit, BaseModifyHdl ) ); } +#if defined(WNT) + #define FSYS_STYLE_DEFAULT FSYS_STYLE_NTFS +# else + #define FSYS_STYLE_DEFAULT FSYS_STYLE_UNX +#endif + void OptConfEdit::Reload( Config &aConf ) { ConfEdit::Reload( aConf ); DirEntry aCalculatedHIDDir( rBase.GetValue() ); - aCalculatedHIDDir += DirEntry( "global/hid", FSYS_STYLE_FAT ); + aCalculatedHIDDir += DirEntry( "global/hid", FSYS_STYLE_DEFAULT ); DirEntry aCurrentHIDDir( aEdit.GetText() ); @@ -231,7 +237,7 @@ IMPL_LINK( OptConfEdit, BaseModifyHdl, Edit*, EMPTYARG ) if ( aCheck.IsChecked() ) { DirEntry aCalculatedHIDDir( rBase.GetValue() ); - aCalculatedHIDDir += DirEntry( "global/hid", FSYS_STYLE_FAT ); + aCalculatedHIDDir += DirEntry( "global/hid", FSYS_STYLE_DEFAULT ); aEdit.SetText( aCalculatedHIDDir.GetFull() ); } return 0; diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 90d617321419..1cd6f8fc5e25 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -110,20 +110,6 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg ) if ( LogMsg->aDebugData.aFilename.Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL ) LogMsg->aDebugData.aFilename.Erase(0,2); - if ( LogMsg->aDebugData.aFilename.Len() && LogMsg->aDebugData.aFilename.GetChar(0) != '~' ) // do we want to convert - { - DirEntry aConvert( LogMsg->aDebugData.aFilename ); - if ( pAppError->aBaseDir.Contains( aConvert ) ) - { - aConvert.ToRel( pAppError->aBaseDir ); - LogMsg->aDebugData.aFilename = CUniString("~"); // mark as converted - LogMsg->aDebugData.aFilename += aConvert.GetFull( FSYS_STYLE_VFAT ); - } - else if ( !bFileLoading ) - { - LogMsg->aDebugData.aFilename.Insert( CUniString("~-"), 0); // mark as unconvertable - } - } xub_StrLen nPos; LogMsg->aDebugData.aMsg.ConvertLineEnd(); // does the message have several lines -> repeat the call for each line @@ -757,9 +743,6 @@ sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry ) else { aFilename.Erase( 0,1 ); - DirEntry aConvert( pAppError->aBaseDir ); - aConvert += DirEntry( aFilename, FSYS_STYLE_VFAT ); - aFilename = aConvert.GetFull(); } } diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx index 099d31878b4f..61a2c817729f 100644 --- a/basic/source/app/mybasic.cxx +++ b/basic/source/app/mybasic.cxx @@ -257,14 +257,7 @@ sal_uInt16 MyBasic::BreakHdl() pWin->Highlight( GetLine(), GetCol1(), GetCol2() ); } - if( IsBreak() ) // If Breakpoint (or "Run to Cursor") - { - return aBasicApp.pFrame->BreakHandler(); - } - else - { - return aBasicApp.pFrame->BreakHandler(); - } + return aBasicApp.pFrame->BreakHandler(); } /*************************************************************************** diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx index f5d60b8d783c..4fb737f50c9e 100644 --- a/basic/source/app/processw.hxx +++ b/basic/source/app/processw.hxx @@ -39,7 +39,7 @@ class ProcessWrapper : public SbxObject using SbxVariable::GetInfo; // Definition of a table entry. This is done here because // through this methods and property can declared as private. -#if defined ( ICC ) || defined ( C50 ) || defined ( C52 ) +#if defined ( ICC ) || defined ( C50 ) public: #endif typedef void( ProcessWrapper::*pMeth ) diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 2ac89b548598..734f4535d461 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1569,18 +1569,18 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage // If no further stream available, // delete the SubStorage. - SvStorageInfoList aInfoList( 0, 4 ); + SvStorageInfoList aInfoList; xBasicStorage->FillInfoList( &aInfoList ); - if ( !aInfoList.Count() ) + if ( aInfoList.empty() ) { xBasicStorage.Clear(); xStorage->Remove( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) ); xStorage->Commit(); // If no further Streams or SubStorages available, // delete the Storage, too. - aInfoList.Clear(); + aInfoList.clear(); xStorage->FillInfoList( &aInfoList ); - if ( !aInfoList.Count() ) + if ( aInfoList.empty() ) { String aName_( xStorage->GetName() ); xStorage.Clear(); diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx index df48e94dfd16..96213a8d68dd 100644 --- a/basic/source/classes/disas.cxx +++ b/basic/source/classes/disas.cxx @@ -228,7 +228,7 @@ static const Func pOperand3[] = { // TODO: Why as method? Isn't a simple define sufficient? static const char* _crlf() { -#if defined (UNX) || defined( PM2 ) +#if defined (UNX) return "\n"; #else return "\r\n"; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 2f20c0e016fe..89034c31d4a2 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -54,7 +54,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty #ifdef WNT #define CDECL _cdecl #endif -#if defined(UNX) || defined(OS2) +#if defined(UNX) #define CDECL #endif @@ -120,7 +120,7 @@ sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) co bsearch( &rPropName, _aPropVals.GetData(), _aPropVals.Count(), sizeof( PropertyValue* ), SbCompare_UString_PropertyValue_Impl ); - return ppPV ? ( (ppPV-_aPropVals.GetData()) / sizeof(ppPV) ) : USHRT_MAX; + return ppPV ? ppPV - _aPropVals.GetData() : USHRT_MAX; } //---------------------------------------------------------------------------- @@ -239,7 +239,7 @@ sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) bsearch( &rPropName, _aProps.getConstArray(), _aProps.getLength(), sizeof( Property ), SbCompare_UString_Property_Impl ); - return pP ? sal::static_int_cast<sal_Int32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1; + return pP ? sal::static_int_cast<sal_Int32>( pP - _aProps.getConstArray() ) : -1; } Sequence< Property > PropertySetInfoImpl::getProperties(void) throw() diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 10c1b5359947..221286e91142 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -466,7 +466,7 @@ SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 ) return NULL; } -SbUnoObject* createOLEObject_Impl( const String& aType ); // sbunoobj.cxx +SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType ); // sbunoobj.cxx SbxObject* SbOLEFactory::CreateObject( const String& rClassName ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 014503587da6..9c7ea2b78a00 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -128,14 +128,14 @@ static ::rtl::OUString defaultNameSpace( RTL_CONSTASCII_USTRINGPARAM("ooo.vba") // redirection built in. The property name specifies the name // of the default property. -bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp ) +bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, ::rtl::OUString& sDfltProp ) { bool result = false; Reference< XDefaultProperty> xDefaultProp( pUnoObj->maTmpUnoObj, UNO_QUERY ); if ( xDefaultProp.is() ) { sDfltProp = xDefaultProp->getDefaultPropertyName(); - if ( sDfltProp.Len() ) + if ( sDfltProp.getLength() ) result = true; } return result; @@ -166,7 +166,7 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj ) SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*) pObj); if ( pUnoObj ) { - String sDfltPropName; + ::rtl::OUString sDfltPropName; if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) ) { @@ -296,7 +296,7 @@ Reference< XTypeConverter > getTypeConverter_Impl( void ) // #111851 factory function to create an OLE object -SbUnoObject* createOLEObject_Impl( const String& aType ) +SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType ) { static Reference< XMultiServiceFactory > xOLEFactory; static bool bNeedsInit = true; @@ -371,7 +371,7 @@ void implAppendExceptionMsg( ::rtl::OUStringBuffer& _inout_rBuffer, const Except return aMessageBuf.makeStringAndClear(); } -String implGetExceptionMsg( const Any& _rCaughtException ) +::rtl::OUString implGetExceptionMsg( const Any& _rCaughtException ) { OSL_PRECOND( _rCaughtException.getValueTypeClass() == TypeClass_EXCEPTION, "implGetExceptionMsg: illegal argument!" ); if ( _rCaughtException.getValueTypeClass() != TypeClass_EXCEPTION ) @@ -396,7 +396,7 @@ Any convertAny( const Any& rVal, const Type& aDestType ) } catch( CannotConvertException& e2 ) { - String aCannotConvertExceptionName + ::rtl::OUString aCannotConvertExceptionName ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.IllegalArgumentException" ) ); StarBASIC::Error( ERRCODE_BASIC_EXCEPTION, implGetExceptionMsg( e2, aCannotConvertExceptionName ) ); @@ -429,15 +429,15 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType ) // Exception type unknown template< class EXCEPTION > -String implGetExceptionMsg( const EXCEPTION& e ) +::rtl::OUString implGetExceptionMsg( const EXCEPTION& e ) { return implGetExceptionMsg( e, ::getCppuType( &e ).getTypeName() ); } // Error-Message fuer WrappedTargetExceptions -String implGetWrappedMsg( const WrappedTargetException& e ) +::rtl::OUString implGetWrappedMsg( const WrappedTargetException& e ) { - String aMsg; + ::rtl::OUString aMsg; Any aWrappedAny = e.TargetException; Type aExceptionType = aWrappedAny.getValueType(); @@ -445,7 +445,7 @@ String implGetWrappedMsg( const WrappedTargetException& e ) if( aExceptionType.getTypeClass() == TypeClass_EXCEPTION ) { Exception& e_ = *( (Exception*)aWrappedAny.getValue() ); - aMsg = implGetExceptionMsg( e_, String( aExceptionType.getTypeName() ) ); + aMsg = implGetExceptionMsg( e_, ::rtl::OUString( aExceptionType.getTypeName() ) ); } // Otherwise use WrappedTargetException itself else @@ -738,7 +738,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) aClassAny <<= xClass; // instantiate SbUnoObject - String aName; + ::rtl::OUString aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aClassAny ); SbxObjectRef xWrapper = (SbxObject*)pSbUnoObject; @@ -826,7 +826,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) } } // instantiate a SbUnoObject - String aName; + ::rtl::OUString aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue ); //If this is called externally e.g. from the scripting //framework then there is no 'active' runtime the default property will not be set up @@ -834,7 +834,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) //test seems a bit of overkill //if ( SbiRuntime::isVBAEnabled() ) { - String sDfltPropName; + ::rtl::OUString sDfltPropName; if ( SbUnoObject::getDefaultPropName( pSbUnoObject, sDfltPropName ) ) pSbUnoObject->SetDfltProperty( sDfltPropName ); @@ -915,7 +915,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) pVar->PutChar( *(sal_Unicode*)aValue.getValue() ); break; } - case TypeClass_STRING: { ::rtl::OUString val; aValue >>= val; pVar->PutString( String( val ) ); } break; + case TypeClass_STRING: { ::rtl::OUString val; aValue >>= val; pVar->PutString( val ); } break; case TypeClass_FLOAT: { float val = 0; aValue >>= val; pVar->PutSingle( val ); } break; case TypeClass_DOUBLE: { double val = 0; aValue >>= val; pVar->PutDouble( val ); } break; case TypeClass_BYTE: { sal_Int8 val = 0; aValue >>= val; pVar->PutInteger( val ); } break; @@ -1630,7 +1630,7 @@ enum INVOKETYPE SetProp, Func }; -Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func ) +Any invokeAutomationMethod( const rtl::OUString& Name, Sequence< Any >& args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func ) { Sequence< sal_Int16 > OutParamIndex; Sequence< Any > OutParam; @@ -1674,27 +1674,27 @@ Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* } // Debugging help method to readout the imlemented interfaces of an object -String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel ) +rtl::OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel ) { Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 ); static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType ); - String aRetStr; + rtl::OUStringBuffer aRetStr; for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ ) - aRetStr.AppendAscii( " " ); - aRetStr += String( xClass->getName() ); + aRetStr.appendAscii( " " ); + aRetStr.append( xClass->getName() ); ::rtl::OUString aClassName = xClass->getName(); Type aClassType( xClass->getTypeClass(), aClassName.getStr() ); // checking if the interface is realy supported if( !x->queryInterface( aClassType ).hasValue() ) { - aRetStr.AppendAscii( " (ERROR: Not really supported!)\n" ); + aRetStr.appendAscii( " (ERROR: Not really supported!)\n" ); } // Are there super interfaces? else { - aRetStr.AppendAscii( "\n" ); + aRetStr.appendAscii( "\n" ); // get the super interfaces Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses(); @@ -1704,19 +1704,19 @@ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< { const Reference< XIdlClass >& rxIfaceClass = pClasses[j]; if( !rxIfaceClass->equals( xIfaceClass ) ) - aRetStr += Impl_GetInterfaceInfo( x, rxIfaceClass, nRekLevel + 1 ); + aRetStr.append( Impl_GetInterfaceInfo( x, rxIfaceClass, nRekLevel + 1 ) ); } } - return aRetStr; + return aRetStr.makeStringAndClear(); } -String getDbgObjectNameImpl( SbUnoObject* pUnoObj ) +::rtl::OUString getDbgObjectNameImpl( SbUnoObject* pUnoObj ) { - String aName; + ::rtl::OUString aName; if( pUnoObj ) { aName = pUnoObj->GetClassName(); - if( !aName.Len() ) + if( !aName.getLength() ) { Any aToInspectObj = pUnoObj->getUnoAny(); TypeClass eType = aToInspectObj.getValueType().getTypeClass(); @@ -1734,24 +1734,24 @@ String getDbgObjectNameImpl( SbUnoObject* pUnoObj ) return aName; } -String getDbgObjectName( SbUnoObject* pUnoObj ) +::rtl::OUString getDbgObjectName( SbUnoObject* pUnoObj ) { - String aName = getDbgObjectNameImpl( pUnoObj ); - if( !aName.Len() ) - aName.AppendAscii( "Unknown" ); + ::rtl::OUString aName = getDbgObjectNameImpl( pUnoObj ); + if( !aName.getLength() ) + aName += ::rtl::OUString::createFromAscii( "Unknown" ); - String aRet; - if( aName.Len() > 20 ) - aRet.AppendAscii( "\n" ); - aRet.AppendAscii( "\"" ); - aRet += aName; - aRet.AppendAscii( "\":" ); - return aRet; + ::rtl::OUStringBuffer aRet; + if( aName.getLength() > 20 ) + aRet.appendAscii( "\n" ); + aRet.appendAscii( "\"" ); + aRet.append( aName ); + aRet.appendAscii( "\":" ); + return aRet.makeStringAndClear(); } -String getBasicObjectTypeName( SbxObject* pObj ) +::rtl::OUString getBasicObjectTypeName( SbxObject* pObj ) { - String aName; + ::rtl::OUString aName; if( pObj ) { SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pObj); @@ -1839,17 +1839,17 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass ) } // Debugging help method to readout the imlemented interfaces of an object -String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj ) +::rtl::OUString Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj ) { Any aToInspectObj = pUnoObj->getUnoAny(); // allow only TypeClass interface TypeClass eType = aToInspectObj.getValueType().getTypeClass(); - String aRet; + ::rtl::OUStringBuffer aRet; if( eType != TypeClass_INTERFACE ) { - aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM(ID_DBG_SUPPORTEDINTERFACES) ); - aRet.AppendAscii( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" ); + aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(ID_DBG_SUPPORTEDINTERFACES) ); + aRet.appendAscii( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" ); } else { @@ -1860,10 +1860,9 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj ) Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY ); Reference< XTypeProvider > xTypeProvider( x, UNO_QUERY ); - aRet.AssignAscii( "Supported interfaces by object " ); - String aObjName = getDbgObjectName( pUnoObj ); - aRet += aObjName; - aRet.AppendAscii( "\n" ); + aRet.appendAscii( "Supported interfaces by object " ); + aRet.append( getDbgObjectName( pUnoObj ) ); + aRet.appendAscii( "\n" ); if( xTypeProvider.is() ) { // get the interfaces of the implementation @@ -1877,17 +1876,16 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj ) Reference<XIdlClass> xClass = TypeToIdlClass( rType ); if( xClass.is() ) { - aRet += Impl_GetInterfaceInfo( x, xClass, 1 ); + aRet.append( Impl_GetInterfaceInfo( x, xClass, 1 ) ); } else { typelib_TypeDescription * pTD = 0; rType.getDescription( &pTD ); - String TypeName( ::rtl::OUString( pTD->pTypeName ) ); - aRet.AppendAscii( "*** ERROR: No IdlClass for type \"" ); - aRet += TypeName; - aRet.AppendAscii( "\"\n*** Please check type library\n" ); + aRet.appendAscii( "*** ERROR: No IdlClass for type \"" ); + aRet.append( pTD->pTypeName ); + aRet.appendAscii( "\"\n*** Please check type library\n" ); } } } @@ -1897,61 +1895,61 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj ) OSL_FAIL( "XClassProvider not supported in UNO3" ); } } - return aRet; + return aRet.makeStringAndClear(); } // Debugging help method SbxDataType -> String -String Dbg_SbxDataType2String( SbxDataType eType ) +::rtl::OUString Dbg_SbxDataType2String( SbxDataType eType ) { - String aRet( RTL_CONSTASCII_USTRINGPARAM("Unknown Sbx-Type!") ); + ::rtl::OUStringBuffer aRet; switch( +eType ) { - case SbxEMPTY: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxEMPTY") ); break; - case SbxNULL: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxNULL") ); break; - case SbxINTEGER: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxINTEGER") ); break; - case SbxLONG: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxLONG") ); break; - case SbxSINGLE: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxSINGLE") ); break; - case SbxDOUBLE: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxDOUBLE") ); break; - case SbxCURRENCY: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxCURRENCY") ); break; - case SbxDECIMAL: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxDECIMAL") ); break; - case SbxDATE: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxDATE") ); break; - case SbxSTRING: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxSTRING") ); break; - case SbxOBJECT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxOBJECT") ); break; - case SbxERROR: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxERROR") ); break; - case SbxBOOL: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxBOOL") ); break; - case SbxVARIANT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxVARIANT") ); break; - case SbxDATAOBJECT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxDATAOBJECT") ); break; - case SbxCHAR: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxCHAR") ); break; - case SbxBYTE: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxBYTE") ); break; - case SbxUSHORT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxUSHORT") ); break; - case SbxULONG: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxULONG") ); break; - case SbxSALINT64: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxINT64") ); break; - case SbxSALUINT64: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxUINT64") ); break; - case SbxINT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxINT") ); break; - case SbxUINT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxUINT") ); break; - case SbxVOID: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxVOID") ); break; - case SbxHRESULT: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxHRESULT") ); break; - case SbxPOINTER: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxPOINTER") ); break; - case SbxDIMARRAY: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxDIMARRAY") ); break; - case SbxCARRAY: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxCARRAY") ); break; - case SbxUSERDEF: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxUSERDEF") ); break; - case SbxLPSTR: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxLPSTR") ); break; - case SbxLPWSTR: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxLPWSTR") ); break; - case SbxCoreSTRING: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxCoreSTRING" ) ); break; - case SbxOBJECT | SbxARRAY: aRet = String( RTL_CONSTASCII_USTRINGPARAM("SbxARRAY") ); break; - default: break; - } - return aRet; + case SbxEMPTY: aRet.appendAscii("SbxEMPTY"); break; + case SbxNULL: aRet.appendAscii("SbxNULL"); break; + case SbxINTEGER: aRet.appendAscii("SbxINTEGER"); break; + case SbxLONG: aRet.appendAscii("SbxLONG"); break; + case SbxSINGLE: aRet.appendAscii("SbxSINGLE"); break; + case SbxDOUBLE: aRet.appendAscii("SbxDOUBLE"); break; + case SbxCURRENCY: aRet.appendAscii("SbxCURRENCY"); break; + case SbxDECIMAL: aRet.appendAscii("SbxDECIMAL"); break; + case SbxDATE: aRet.appendAscii("SbxDATE"); break; + case SbxSTRING: aRet.appendAscii("SbxSTRING"); break; + case SbxOBJECT: aRet.appendAscii("SbxOBJECT"); break; + case SbxERROR: aRet.appendAscii("SbxERROR"); break; + case SbxBOOL: aRet.appendAscii("SbxBOOL"); break; + case SbxVARIANT: aRet.appendAscii("SbxVARIANT"); break; + case SbxDATAOBJECT: aRet.appendAscii("SbxDATAOBJECT"); break; + case SbxCHAR: aRet.appendAscii("SbxCHAR"); break; + case SbxBYTE: aRet.appendAscii("SbxBYTE"); break; + case SbxUSHORT: aRet.appendAscii("SbxUSHORT"); break; + case SbxULONG: aRet.appendAscii("SbxULONG"); break; + case SbxSALINT64: aRet.appendAscii("SbxINT64"); break; + case SbxSALUINT64: aRet.appendAscii("SbxUINT64"); break; + case SbxINT: aRet.appendAscii("SbxINT"); break; + case SbxUINT: aRet.appendAscii("SbxUINT"); break; + case SbxVOID: aRet.appendAscii("SbxVOID"); break; + case SbxHRESULT: aRet.appendAscii("SbxHRESULT"); break; + case SbxPOINTER: aRet.appendAscii("SbxPOINTER"); break; + case SbxDIMARRAY: aRet.appendAscii("SbxDIMARRAY"); break; + case SbxCARRAY: aRet.appendAscii("SbxCARRAY"); break; + case SbxUSERDEF: aRet.appendAscii("SbxUSERDEF"); break; + case SbxLPSTR: aRet.appendAscii("SbxLPSTR"); break; + case SbxLPWSTR: aRet.appendAscii("SbxLPWSTR"); break; + case SbxCoreSTRING: aRet.appendAscii("SbxCoreSTRING"); break; + case SbxOBJECT | SbxARRAY: aRet.appendAscii("SbxARRAY"); break; + default: aRet.appendAscii("Unknown Sbx-Type!");break; + } + return aRet.makeStringAndClear(); } // Debugging help method to display the properties of a SbUnoObjects -String Impl_DumpProperties( SbUnoObject* pUnoObj ) +::rtl::OUString Impl_DumpProperties( SbUnoObject* pUnoObj ) { - String aRet( RTL_CONSTASCII_USTRINGPARAM("Properties of object ") ); - String aObjName = getDbgObjectName( pUnoObj ); - aRet += aObjName; + ::rtl::OUStringBuffer aRet; + aRet.appendAscii("Properties of object "); + aRet.append( getDbgObjectName( pUnoObj ) ); // analyse the Uno-Infos to recognise the arrays Reference< XIntrospectionAccess > xAccess = pUnoObj->getIntrospectionAccess(); @@ -1963,8 +1961,8 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj ) } if( !xAccess.is() ) { - aRet.AppendAscii( "\nUnknown, no introspection available\n" ); - return aRet; + aRet.appendAscii( "\nUnknown, no introspection available\n" ); + return aRet.makeStringAndClear(); } Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS ); @@ -1979,9 +1977,9 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj ) SbxVariable* pVar = pProps->Get( i ); if( pVar ) { - String aPropStr; + ::rtl::OUStringBuffer aPropStr; if( (i % nPropsPerLine) == 0 ) - aPropStr.AppendAscii( "\n" ); + aPropStr.appendAscii( "\n" ); // output the type and name // Is it in Uno a sequence? @@ -2006,29 +2004,29 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj ) eType = (SbxDataType) ( SbxOBJECT | SbxARRAY ); } } - aPropStr += Dbg_SbxDataType2String( eType ); + aPropStr.append( Dbg_SbxDataType2String( eType ) ); if( bMaybeVoid ) - aPropStr.AppendAscii( "/void" ); - aPropStr.AppendAscii( " " ); - aPropStr += pVar->GetName(); + aPropStr.appendAscii( "/void" ); + aPropStr.appendAscii( " " ); + aPropStr.append( pVar->GetName() ); if( i == nPropCount - 1 ) - aPropStr.AppendAscii( "\n" ); + aPropStr.appendAscii( "\n" ); else - aPropStr.AppendAscii( "; " ); + aPropStr.appendAscii( "; " ); - aRet += aPropStr; + aRet.append( aPropStr.makeStringAndClear() ); } } - return aRet; + return aRet.makeStringAndClear(); } // Debugging help method to display the methods of an SbUnoObjects -String Impl_DumpMethods( SbUnoObject* pUnoObj ) +::rtl::OUString Impl_DumpMethods( SbUnoObject* pUnoObj ) { - String aRet( RTL_CONSTASCII_USTRINGPARAM("Methods of object ") ); - String aObjName = getDbgObjectName( pUnoObj ); - aRet += aObjName; + ::rtl::OUStringBuffer aRet; + aRet.appendAscii("Methods of object "); + aRet.append( getDbgObjectName( pUnoObj ) ); // XIntrospectionAccess, so that the types of the parameter could be outputed Reference< XIntrospectionAccess > xAccess = pUnoObj->getIntrospectionAccess(); @@ -2040,8 +2038,8 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj ) } if( !xAccess.is() ) { - aRet.AppendAscii( "\nUnknown, no introspection available\n" ); - return aRet; + aRet.appendAscii( "\nUnknown, no introspection available\n" ); + return aRet.makeStringAndClear(); } Sequence< Reference< XIdlMethod > > methods = xAccess->getMethods ( MethodConcept::ALL - MethodConcept::DANGEROUS ); @@ -2051,8 +2049,8 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj ) sal_uInt16 nMethodCount = pMethods->Count(); if( !nMethodCount ) { - aRet.AppendAscii( "\nNo methods found\n" ); - return aRet; + aRet.appendAscii( "\nNo methods found\n" ); + return aRet.makeStringAndClear(); } sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30; for( sal_uInt16 i = 0; i < nMethodCount; i++ ) @@ -2060,9 +2058,9 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj ) SbxVariable* pVar = pMethods->Get( i ); if( pVar ) { - String aPropStr; + ::rtl::OUStringBuffer aPropStr; if( (i % nPropsPerLine) == 0 ) - aPropStr.AppendAscii( "\n" ); + aPropStr.appendAscii( "\n" ); // address the method const Reference< XIdlMethod >& rxMethod = pUnoMethods[i]; @@ -2076,10 +2074,10 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj ) eType = (SbxDataType) ( SbxOBJECT | SbxARRAY ); } // output the name and the type - aPropStr += Dbg_SbxDataType2String( eType ); - aPropStr.AppendAscii( " " ); - aPropStr += pVar->GetName(); - aPropStr.AppendAscii( " ( " ); + aPropStr.append( Dbg_SbxDataType2String( eType ) ); + aPropStr.appendAscii( " " ); + aPropStr.append ( pVar->GetName() ); + aPropStr.appendAscii( " ( " ); // the get-method mustn't have a parameter Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes(); @@ -2090,27 +2088,25 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj ) { for( sal_uInt16 j = 0; j < nParamCount; j++ ) { - String aTypeStr = Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ); - aPropStr += aTypeStr; - + aPropStr.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) ); if( j < nParamCount - 1 ) - aPropStr.AppendAscii( ", " ); + aPropStr.appendAscii( ", " ); } } else - aPropStr.AppendAscii( "void" ); + aPropStr.appendAscii( "void" ); - aPropStr.AppendAscii( " ) " ); + aPropStr.appendAscii( " ) " ); if( i == nMethodCount - 1 ) - aPropStr.AppendAscii( "\n" ); + aPropStr.appendAscii( "\n" ); else - aPropStr.AppendAscii( "; " ); + aPropStr.appendAscii( "; " ); - aRet += aPropStr; + aRet.append( aPropStr ); } } - return aRet; + return aRet.makeStringAndClear(); } TYPEINIT1(AutomationNamedArgsSbxArray,SbxArray) @@ -2141,7 +2137,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, // Id == -1: Display implemented interfaces according the ClassProvider if( nId == -1 ) // Property ID_DBG_SUPPORTEDINTERFACES" { - String aRetStr = Impl_GetSupportedInterfaces( this ); + ::rtl::OUString aRetStr = Impl_GetSupportedInterfaces( this ); pVar->PutString( aRetStr ); } // Id == -2: output properties @@ -2149,7 +2145,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, { // by now all properties must be established implCreateAll(); - String aRetStr = Impl_DumpProperties( this ); + ::rtl::OUString aRetStr = Impl_DumpProperties( this ); pVar->PutString( aRetStr ); } // Id == -3: output the methods @@ -2157,7 +2153,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, { // y now all properties must be established implCreateAll(); - String aRetStr = Impl_DumpMethods( this ); + ::rtl::OUString aRetStr = Impl_DumpMethods( this ); pVar->PutString( aRetStr ); } return; @@ -2389,7 +2385,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, Reference< XInvocation > createDynamicInvocationFor( const Any& aAny ); #endif -SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ ) +SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ ) : SbxObject( aName_ ) , bNeedIntrospection( sal_True ) , bNativeCOMObject( sal_False ) @@ -2450,16 +2446,16 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ ) // Is it an interface or a struct? sal_Bool bSetClassName = sal_False; - String aClassName_; + rtl::OUString aClassName_; if( eType == TypeClass_STRUCT || eType == TypeClass_EXCEPTION ) { // Struct is Ok bFatalError = sal_False; // insert the real name of the class - if( aName_.Len() == 0 ) + if( aName_.getLength() == 0 ) { - aClassName_ = String( aUnoObj_.getValueType().getTypeName() ); + aClassName_ = aUnoObj_.getValueType().getTypeName(); bSetClassName = sal_True; } } @@ -2473,7 +2469,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ ) if( xClassProvider.is() ) { // Insert the real name of the class - if( aName_.Len() == 0 ) + if( aName_.getLength() == 0 ) { Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses(); sal_uInt32 nLen = szClasses.getLength(); @@ -2482,7 +2478,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ ) const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ]; if( xImplClass.is() ) { - aClassName_ = String( xImplClass->getName() ); + aClassName_ = xImplClass->getName(); bSetClassName = sal_True; } } @@ -2616,7 +2612,7 @@ void clearUnoMethods( void ) SbUnoMethod::SbUnoMethod ( - const String& aName_, + const rtl::OUString& aName_, SbxDataType eSbxType, Reference< XIdlMethod > xUnoMethod_, bool bInvocation, @@ -2688,7 +2684,7 @@ const Sequence<ParamInfo>& SbUnoMethod::getParamInfos( void ) SbUnoProperty::SbUnoProperty ( - const String& aName_, + const rtl::OUString& aName_, SbxDataType eSbxType, const Property& aUnoProp_, sal_Int32 nId_, @@ -2873,15 +2869,15 @@ void SbUnoObject::implCreateDbgProperties( void ) Property aProp; // Id == -1: display the implemented interfaces corresponding the ClassProvider - SbxVariableRef xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), SbxSTRING, aProp, -1, false ); + SbxVariableRef xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), SbxSTRING, aProp, -1, false ); QuickInsert( (SbxVariable*)xVarRef ); // Id == -2: output the properties - xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, aProp, -2, false ); + xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, aProp, -2, false ); QuickInsert( (SbxVariable*)xVarRef ); // Id == -3: output the Methods - xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, aProp, -3, false ); + xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, aProp, -3, false ); QuickInsert( (SbxVariable*)xVarRef ); } @@ -2961,7 +2957,7 @@ Any SbUnoObject::getUnoAny( void ) } // help method to create an Uno-Struct per CoreReflection -SbUnoObject* Impl_CreateUnoStruct( const String& aClassName ) +SbUnoObject* Impl_CreateUnoStruct( const ::rtl::OUString& aClassName ) { // get CoreReflection Reference< XIdlReflection > xCoreReflection = getCoreReflection_Impl(); @@ -3007,7 +3003,7 @@ SbxObject* SbUnoFactory::CreateObject( const String& rClassName ) // Provisional interface for the UNO-Connection // Deliver a SbxObject, that wrap an Uno-Interface -SbxObjectRef GetSbUnoObject( const String& aName, const Any& aUnoObj_ ) +SbxObjectRef GetSbUnoObject( const ::rtl::OUString& aName, const Any& aUnoObj_ ) { return new SbUnoObject( aName, aUnoObj_ ); } @@ -3039,7 +3035,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit } // get the name of the class of the struct - String aClassName = rPar.Get(1)->GetString(); + ::rtl::OUString aClassName = rPar.Get(1)->GetString(); // try to create Struct with the same name SbUnoObjectRef xUnoObj = Impl_CreateUnoStruct( aClassName ); @@ -3064,7 +3060,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWri } // get the name of the class of the struct - String aServiceName = rPar.Get(1)->GetString(); + ::rtl::OUString aServiceName = rPar.Get(1)->GetString(); // search for the service and instatiate it Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); @@ -3118,7 +3114,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, } // get the name of the class of the struct - String aServiceName = rPar.Get(1)->GetString(); + ::rtl::OUString aServiceName = rPar.Get(1)->GetString(); Any aArgAsAny = sbxToUnoValue( rPar.Get(2), getCppuType( (Sequence<Any>*)0 ) ); Sequence< Any > aArgs; @@ -3178,7 +3174,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_B aAny <<= xFactory; // Create a SbUnoObject out of it and return it - SbUnoObjectRef xUnoObj = new SbUnoObject( String( RTL_CONSTASCII_USTRINGPARAM("ProcessServiceManager") ), aAny ); + SbUnoObjectRef xUnoObj = new SbUnoObject( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProcessServiceManager") ), aAny ); refVar->PutObject( (SbUnoObject*)xUnoObj ); } else @@ -3224,7 +3220,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite for( sal_uInt16 i = 2 ; i < nParCount ; i++ ) { // get the name of the interface of the struct - String aIfaceName = rPar.Get( i )->GetString(); + rtl::OUString aIfaceName = rPar.Get( i )->GetString(); // search for the class Reference< XIdlClass > xClass = xCoreReflection->forName( aIfaceName ); @@ -3400,7 +3396,7 @@ VBAConstantHelper::init() } bool -VBAConstantHelper::isVBAConstantType( const String& rName ) +VBAConstantHelper::isVBAConstantType( const ::rtl::OUString& rName ) { init(); bool bConstant = false; @@ -3419,7 +3415,7 @@ VBAConstantHelper::isVBAConstantType( const String& rName ) } SbxVariable* -VBAConstantHelper::getVBAConstant( const String& rName ) +VBAConstantHelper::getVBAConstant( const ::rtl::OUString& rName ) { SbxVariable* pConst = NULL; init(); @@ -3440,7 +3436,7 @@ VBAConstantHelper::getVBAConstant( const String& rName ) // Function to search for a global identifier in the // UnoScope and to wrap it for Sbx -SbUnoClass* findUnoClass( const String& rName ) +SbUnoClass* findUnoClass( const ::rtl::OUString& rName ) { // #105550 Check if module exists SbUnoClass* pUnoClass = NULL; @@ -3499,8 +3495,8 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t ) else { // expand fully qualified name - String aNewName = GetName(); - aNewName.AppendAscii( "." ); + ::rtl::OUString aNewName = GetName(); + aNewName += ::rtl::OUString::createFromAscii( "." ); aNewName += rName; // get CoreReflection @@ -3536,7 +3532,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t ) } catch( NoSuchElementException& e1 ) { - String aMsg = implGetExceptionMsg( e1 ); + ::rtl::OUString aMsg = implGetExceptionMsg( e1 ); } } @@ -3595,7 +3591,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t ) } -SbUnoService* findUnoService( const String& rName ) +SbUnoService* findUnoService( const ::rtl::OUString& rName ) { SbUnoService* pSbUnoService = NULL; @@ -3638,14 +3634,14 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType ) { Reference< XServiceConstructorDescription > xCtor = pCtorSeq[i]; - String aName( xCtor->getName() ); - if( !aName.Len() ) + ::rtl::OUString aName( xCtor->getName() ); + if( !aName.getLength() ) { if( xCtor->isDefaultConstructor() ) - aName = String::CreateFromAscii( "create" ); + aName = ::rtl::OUString::createFromAscii( "create" ); } - if( aName.Len() ) + if( aName.getLength() ) { // Create and insert SbUnoServiceCtor SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor ); @@ -3787,7 +3783,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, Any aRetAny; if( xServiceMgr.is() ) { - String aServiceName = GetName(); + ::rtl::OUString aServiceName = GetName(); Reference < XInterface > xRet; try { @@ -3837,7 +3833,7 @@ void clearUnoServiceCtors( void ) } } -SbUnoServiceCtor::SbUnoServiceCtor( const String& aName_, Reference< XServiceConstructorDescription > xServiceCtorDesc ) +SbUnoServiceCtor::SbUnoServiceCtor( const ::rtl::OUString& aName_, Reference< XServiceConstructorDescription > xServiceCtorDesc ) : SbxMethod( aName_, SbxOBJECT ) , m_xServiceCtorDesc( xServiceCtorDesc ) { @@ -3855,7 +3851,7 @@ SbxInfo* SbUnoServiceCtor::GetInfo() } -SbUnoSingleton* findUnoSingleton( const String& rName ) +SbUnoSingleton* findUnoSingleton( const ::rtl::OUString& rName ) { SbUnoSingleton* pSbUnoSingleton = NULL; @@ -3880,13 +3876,13 @@ SbUnoSingleton* findUnoSingleton( const String& rName ) return pSbUnoSingleton; } -SbUnoSingleton::SbUnoSingleton( const String& aName_, +SbUnoSingleton::SbUnoSingleton( const ::rtl::OUString& aName_, const Reference< XSingletonTypeDescription >& xSingletonTypeDesc ) : SbxObject( aName_ ) , m_xSingletonTypeDesc( xSingletonTypeDesc ) { SbxVariableRef xGetMethodRef = - new SbxMethod( String( RTL_CONSTASCII_USTRINGPARAM( "get" ) ), SbxOBJECT ); + new SbxMethod( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "get" ) ), SbxOBJECT ); QuickInsert( (SbxVariable*)xGetMethodRef ); } @@ -3927,7 +3923,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, Any aRetAny; if( xContextToUse.is() ) { - String aSingletonName( RTL_CONSTASCII_USTRINGPARAM("/singletons/") ); + ::rtl::OUString aSingletonName( RTL_CONSTASCII_USTRINGPARAM("/singletons/") ); aSingletonName += GetName(); Reference < XInterface > xRet; xContextToUse->getValueByName( aSingletonName ) >>= xRet; @@ -4225,8 +4221,8 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite } // get the name of the class of the struct - String aPrefixName = rPar.Get(1)->GetString(); - String aListenerClassName = rPar.Get(2)->GetString(); + ::rtl::OUString aPrefixName = rPar.Get(1)->GetString(); + ::rtl::OUString aListenerClassName = rPar.Get(2)->GetString(); // get the CoreReflection Reference< XIdlReflection > xCoreReflection = getCoreReflection_Impl(); @@ -4288,10 +4284,10 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr if( xPSMPropertySet.is() ) { Any aContextAny = xPSMPropertySet->getPropertyValue( - String( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ); SbUnoObjectRef xUnoObj = new SbUnoObject - ( String( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ), + ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ), aContextAny ); refVar->PutObject( (SbUnoObject*)xUnoObj ); } @@ -4309,7 +4305,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite (void)pBasic; (void)bWrite; - static String aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") ); + static rtl::OUString aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") ); // 2 parameters needed if ( rPar.Count() != 3 ) @@ -4319,7 +4315,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite } // get the name of the class of the struct - String aTypeName = rPar.Get(1)->GetString(); + rtl::OUString aTypeName = rPar.Get(1)->GetString(); SbxVariable* pVal = rPar.Get(2); if( aTypeName == aTypeTypeString ) @@ -4366,7 +4362,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite } catch( NoSuchElementException& e1 ) { - String aNoSuchElementExceptionName + ::rtl::OUString aNoSuchElementExceptionName ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.NoSuchElementException" ) ); StarBASIC::Error( ERRCODE_BASIC_EXCEPTION, implGetExceptionMsg( e1, aNoSuchElementExceptionName ) ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 55460638e9b7..ba97917922a9 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -70,7 +70,7 @@ using namespace com::sun::star; #ifdef WNT #define CDECL _cdecl #endif -#if defined(UNX) || defined(OS2) +#if defined(UNX) #define CDECL #endif #ifdef UNX diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index e7f335d4f8ab..e1e56101e937 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -600,7 +600,6 @@ void SbiParser::DefType( sal_Bool bPrivate ) break; default: - pDim = NULL; pElem = VarDecl(&pDim,sal_False,sal_False); if( !pElem ) bDone = sal_True; // Error occurred @@ -666,9 +665,9 @@ void SbiParser::DefType( sal_Bool bPrivate ) } } } - delete pDim; pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() ); } + delete pDim, pDim = NULL; delete pElem; } } diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 8efd468ca05c..31d285f89148 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -253,7 +253,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo ) pvMoreParLcl = new SbiExprListVector(); SbiParameters* pAddPar = new SbiParameters( pParser ); pvMoreParLcl->push_back( pAddPar ); - bError |= !pPar->IsValid(); + bError |= !pAddPar->IsValid(); eTok = pParser->Peek(); } } diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx index 1b25ee41a25d..52af24b2b994 100644 --- a/basic/source/inc/object.hxx +++ b/basic/source/inc/object.hxx @@ -55,7 +55,7 @@ using SbxVariable::GetInfo; // Definition eines Tabelleneintrags. Dies wird hier gemacht, // da dadurch die Methoden und Properties als private deklariert // werden koennen. -#if defined ( ICC ) || defined ( C50 ) || defined ( C52 ) +#if defined ( ICC ) || defined ( C50 ) public: #endif typedef void( SampleObject::*pMeth ) diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx index cbc98ac22fd4..156ef8bd625a 100644 --- a/basic/source/inc/opcodes.hxx +++ b/basic/source/inc/opcodes.hxx @@ -91,7 +91,8 @@ enum SbiOpcode { _ERASE_CLEAR, // Erase array and clear variable _ARRAYACCESS, // Assign parameters to TOS and get value, used for array of arrays _BYVAL, // byref -> byval for lvalue parameter passed in call - SbOP0_END, + + SbOP0_END = _BYVAL, // Alle Opcodes mit einem Operanden @@ -125,7 +126,8 @@ enum SbiOpcode { // Typanpassung im Argv _ARGTYP, // Letzten Parameter in Argv konvertieren (+Typ) _VBASETCLASS, // VBA-like Set - SbOP1_END, + + SbOP1_END = _VBASETCLASS, // Alle Opcodes mit zwei Operanden @@ -160,12 +162,9 @@ enum SbiOpcode { _PUBLIC_P, // Module global Variable (persisted between calls)(+StringID+Typ) _FIND_STATIC, // local static var lookup (+StringID+Typ) - SbOP2_END - + SbOP2_END = _FIND_STATIC }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 7dade1fba998..855af7fa1eb7 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -358,7 +358,7 @@ class SbiRuntime // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx) void DimImpl( SbxVariableRef refVar ); - bool implIsClass( SbxObject* pObj, const rtl::OUString& aClass ); + bool implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass ); void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false ); @@ -390,7 +390,7 @@ class SbiRuntime void StepGOSUB( sal_uInt32 ), StepRETURN( sal_uInt32 ); void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ), StepERRHDL( sal_uInt32 ); void StepRESUME( sal_uInt32 ), StepSETCLASS( sal_uInt32 ), StepVBASETCLASS( sal_uInt32 ), StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 ); - bool checkClass_Impl( const SbxVariableRef& refVal, const rtl::OUString& aClass, bool bRaiseErrors, bool bDefault = true ); + bool checkClass_Impl( const SbxVariableRef& refVal, const ::rtl::OUString& aClass, bool bRaiseErrors, bool bDefault = true ); void StepCLOSE( sal_uInt32 ), StepPRCHAR( sal_uInt32 ), StepARGTYP( sal_uInt32 ); // Alle Opcodes mit zwei Operanden void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 ); diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index ea3d62c80e7f..cc0f03903f17 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -64,9 +64,9 @@ class SbUnoObject: public SbxObject void implCreateAll( void ); public: - static bool getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp ); + static bool getDefaultPropName( SbUnoObject* pUnoObj, ::rtl::OUString& sDfltProp ); TYPEINFO(); - SbUnoObject( const String& aName_, const ::com::sun::star::uno::Any& aUnoObj_ ); + SbUnoObject( const ::rtl::OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ ); ~SbUnoObject(); // #76470 Introspection on Demand durchfuehren @@ -115,7 +115,7 @@ class SbUnoMethod : public SbxMethod public: TYPEINFO(); - SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_, + SbUnoMethod( const rtl::OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_, bool bInvocation, bool bDirect = false ); virtual ~SbUnoMethod(); @@ -143,7 +143,7 @@ class SbUnoProperty : public SbxProperty virtual ~SbUnoProperty(); public: TYPEINFO(); - SbUnoProperty( const String& aName_, SbxDataType eSbxType, + SbUnoProperty( const rtl::OUString& aName_, SbxDataType eSbxType, const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation ); bool isInvocationBased( void ) @@ -185,7 +185,7 @@ SV_DECL_IMPL_REF(SbUnoClass); // Funktion, um einen globalen Bezeichner im // UnoScope zu suchen und fuer Sbx zu wrappen -SbUnoClass* findUnoClass( const String& rName ); +SbUnoClass* findUnoClass( const ::rtl::OUString& rName ); // Wrapper for UNO Service @@ -209,7 +209,7 @@ public: }; SV_DECL_IMPL_REF(SbUnoService); -SbUnoService* findUnoService( const String& rName ); +SbUnoService* findUnoService( const ::rtl::OUString& rName ); void clearUnoServiceCtors( void ); @@ -227,7 +227,7 @@ class SbUnoServiceCtor : public SbxMethod public: TYPEINFO(); - SbUnoServiceCtor( const String& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc ); + SbUnoServiceCtor( const::rtl::OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc ); virtual ~SbUnoServiceCtor(); virtual SbxInfo* GetInfo(); @@ -243,14 +243,14 @@ class SbUnoSingleton : public SbxObject public: TYPEINFO(); - SbUnoSingleton( const String& aName_, + SbUnoSingleton( const ::rtl::OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc ); void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); }; SV_DECL_IMPL_REF(SbUnoSingleton); -SbUnoSingleton* findUnoSingleton( const String& rName ); +SbUnoSingleton* findUnoSingleton( const ::rtl::OUString& rName ); // #105565 Special Object to wrap a strongly typed Uno Any @@ -348,8 +348,8 @@ private: void init(); public: static VBAConstantHelper& instance(); - SbxVariable* getVBAConstant( const String& rName ); - bool isVBAConstantType( const String& rName ); + SbxVariable* getVBAConstant( const ::rtl::OUString& rName ); + bool isVBAConstantType( const ::rtl::OUString& rName ); }; #endif diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index 83ce5b05adb5..75fcd7f4d725 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -81,32 +81,26 @@ IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData, SbiDdeControl::SbiDdeControl() { - pConvList = new DdeConnections; - DdeConnection* pPtr = DDE_FREECHANNEL; - pConvList->Insert( pPtr ); } SbiDdeControl::~SbiDdeControl() { TerminateAll(); - delete pConvList; } sal_Int16 SbiDdeControl::GetFreeChannel() { - sal_Int16 nListSize = (sal_Int16)pConvList->Count(); - DdeConnection* pPtr = pConvList->First(); - pPtr = pConvList->Next(); // nullten eintrag ueberspringen - sal_Int16 nChannel; - for( nChannel = 1; nChannel < nListSize; nChannel++ ) + sal_Int16 nChannel = 0; + sal_Int16 nListSize = static_cast<sal_Int16>(aConvList.size()); + + for (; nChannel < nListSize; ++nChannel) { - if( pPtr == DDE_FREECHANNEL ) - return nChannel; - pPtr = pConvList->Next(); + if (aConvList[nChannel] == DDE_FREECHANNEL) + return nChannel+1; } - pPtr = DDE_FREECHANNEL; - pConvList->Insert( pPtr, LIST_APPEND ); - return nChannel; + + aConvList.push_back(DDE_FREECHANNEL); + return nChannel+1; } SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic, @@ -123,42 +117,52 @@ SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic, else { sal_Int16 nChannel = GetFreeChannel(); - pConvList->Replace( pConv, (sal_uIntPtr)nChannel ); + aConvList[nChannel-1] = pConv; rnHandle = nChannel; } return 0; } -SbError SbiDdeControl::Terminate( sal_Int16 nChannel ) +SbError SbiDdeControl::Terminate( sal_uInt16 nChannel ) { - DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel ); - if( !nChannel || !pConv || pConv == DDE_FREECHANNEL ) + if (!nChannel || nChannel > aConvList.size()) + return SbERR_DDE_NO_CHANNEL; + + DdeConnection* pConv = aConvList[nChannel-1]; + + if( pConv == DDE_FREECHANNEL ) return SbERR_DDE_NO_CHANNEL; - pConvList->Replace( DDE_FREECHANNEL, (sal_uIntPtr)nChannel ); + delete pConv; + pConv = DDE_FREECHANNEL; + return 0L; } SbError SbiDdeControl::TerminateAll() { - sal_Int16 nChannel = (sal_Int16)pConvList->Count(); - while( nChannel ) + DdeConnection *conv; + for (sal_uInt16 nChannel = 0; nChannel < aConvList.size(); ++nChannel) { - nChannel--; - Terminate( nChannel ); + conv = aConvList[nChannel]; + + if (conv != DDE_FREECHANNEL) + delete conv; } - pConvList->Clear(); - DdeConnection* pPtr = DDE_FREECHANNEL; - pConvList->Insert( pPtr ); + aConvList.clear(); return 0; } -SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& rResult ) +SbError SbiDdeControl::Request( sal_uInt16 nChannel, const String& rItem, String& rResult ) { - DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel ); - if( !nChannel || !pConv || pConv == DDE_FREECHANNEL ) + if (!nChannel || nChannel > aConvList.size()) + return SbERR_DDE_NO_CHANNEL; + + DdeConnection* pConv = aConvList[nChannel-1]; + + if( pConv == DDE_FREECHANNEL ) return SbERR_DDE_NO_CHANNEL; DdeRequest aRequest( *pConv, rItem, 30000 ); @@ -168,21 +172,31 @@ SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& return GetLastErr( pConv ); } -SbError SbiDdeControl::Execute( sal_Int16 nChannel, const String& rCommand ) +SbError SbiDdeControl::Execute( sal_uInt16 nChannel, const String& rCommand ) { - DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel ); - if( !nChannel || !pConv || pConv == DDE_FREECHANNEL ) + if (!nChannel || nChannel > aConvList.size()) return SbERR_DDE_NO_CHANNEL; + + DdeConnection* pConv = aConvList[nChannel-1]; + + if( pConv == DDE_FREECHANNEL ) + return SbERR_DDE_NO_CHANNEL; + DdeExecute aRequest( *pConv, rCommand, 30000 ); aRequest.Execute(); return GetLastErr( pConv ); } -SbError SbiDdeControl::Poke( sal_Int16 nChannel, const String& rItem, const String& rData ) +SbError SbiDdeControl::Poke( sal_uInt16 nChannel, const String& rItem, const String& rData ) { - DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel ); - if( !nChannel || !pConv || pConv == DDE_FREECHANNEL ) + if (!nChannel || nChannel > aConvList.size()) return SbERR_DDE_NO_CHANNEL; + + DdeConnection* pConv = aConvList[nChannel-1]; + + if( pConv == DDE_FREECHANNEL ) + return SbERR_DDE_NO_CHANNEL; + DdePoke aRequest( *pConv, rItem, DdeData(rData), 30000 ); aRequest.Execute(); return GetLastErr( pConv ); diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index 2f12e8128791..c71611e8c32d 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -34,7 +34,6 @@ #include <tools/string.hxx> class DdeConnection; -class DdeConnections; class DdeData; class SbiDdeControl @@ -43,7 +42,7 @@ private: DECL_LINK( Data, DdeData* ); SbError GetLastErr( DdeConnection* ); sal_Int16 GetFreeChannel(); - DdeConnections* pConvList; + std::vector<DdeConnection*> aConvList; String aData; public: @@ -53,11 +52,11 @@ public: SbError Initiate( const String& rService, const String& rTopic, sal_Int16& rnHandle ); - SbError Terminate( sal_Int16 nChannel ); + SbError Terminate( sal_uInt16 nChannel ); SbError TerminateAll(); - SbError Request( sal_Int16 nChannel, const String& rItem, String& rResult ); - SbError Execute( sal_Int16 nChannel, const String& rCommand ); - SbError Poke( sal_Int16 nChannel, const String& rItem, const String& rData ); + SbError Request( sal_uInt16 nChannel, const String& rItem, String& rResult ); + SbError Execute( sal_uInt16 nChannel, const String& rCommand ); + SbError Poke( sal_uInt16 nChannel, const String& rItem, const String& rData ); }; #endif diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index e46c51caee11..f4dc783ee878 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -171,8 +171,6 @@ void SbiStream::MapError() } } -#ifdef _USE_UNO - // TODO: Code is copied from daemons2/source/uno/asciiEncoder.cxx ::rtl::OUString findUserInDescription( const ::rtl::OUString& aDescription ) @@ -205,15 +203,11 @@ void SbiStream::MapError() return user; } -#endif - - // Hack for #83750 sal_Bool runsInSetup( void ); sal_Bool needSecurityRestrictions( void ) { -#ifdef _USE_UNO static sal_Bool bNeedInit = sal_True; static sal_Bool bRetVal = sal_True; @@ -290,9 +284,6 @@ sal_Bool needSecurityRestrictions( void ) } return bRetVal; -#else - return sal_False; -#endif } // Returns sal_True if UNO is available, otherwise the old file @@ -300,7 +291,6 @@ sal_Bool needSecurityRestrictions( void ) // #89378 New semantic: Don't just ask for UNO but for UCB sal_Bool hasUno( void ) { -#ifdef _USE_UNO static sal_Bool bNeedInit = sal_True; static sal_Bool bRetVal = sal_True; @@ -326,9 +316,6 @@ sal_Bool hasUno( void ) } } return bRetVal; -#else - return sal_False; -#endif } @@ -403,9 +390,9 @@ sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize ) sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos ) { if( nPos == STREAM_SEEK_TO_END ) - maFile.setPos( Pos_End, 0 ); + maFile.setPos( osl_Pos_End, 0 ); else - maFile.setPos( Pos_Absolut, (sal_uInt64)nPos ); + maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos ); sal_uInt64 nRealPos(0); maFile.getPos( nRealPos ); return sal::static_int_cast<sal_uIntPtr>(nRealPos); @@ -421,8 +408,6 @@ void OslStream::SetSize( sal_uIntPtr nSize ) } -#ifdef _USE_UNO - class UCBStream : public SvStream { Reference< XInputStream > xIS; @@ -585,7 +570,6 @@ void UCBStream::SetSize( sal_uIntPtr nSize ) SetError( ERRCODE_IO_GENERAL ); } -#endif // Oeffnen eines Streams SbError SbiStream::Open @@ -601,7 +585,6 @@ SbError SbiStream::Open String aStr( rName, gsl_getSystemTextEncoding() ); String aNameStr = getFullPath( aStr ); -#ifdef _USE_UNO if( hasUno() ) { Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory(); @@ -646,7 +629,6 @@ SbError SbiStream::Open } } -#endif if( !pStrm ) { pStrm = new OslStream( aNameStr, nStrmMode ); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 156205117103..ce5cc3cc0412 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -100,7 +100,7 @@ using namespace com::sun::star::frame; SbxVariable* getDefaultProp( SbxVariable* pRef ); -#if defined (WNT) || defined (OS2) +#if defined (WNT) #include <direct.h> // _getdcwd get current work directory, _chdrive #endif @@ -444,7 +444,7 @@ RTLFUNC(CurDir) // DirEntry-Funktionalitaet keine Moeglichkeit besteht, das aktuelle so // zu ermitteln, dass eine virtuelle URL geliefert werden koennte. -#if defined (WNT) || defined (OS2) +#if defined (WNT) int nCurDir = 0; // Current dir // JSM if ( rPar.Count() == 2 ) { @@ -467,10 +467,6 @@ RTLFUNC(CurDir) } } char* pBuffer = new char[ _MAX_PATH ]; -#ifdef OS2 - if( !nCurDir ) - nCurDir = _getdrive(); -#endif if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 ) rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) ); else @@ -2954,7 +2950,7 @@ RTLFUNC(GetAttr) FileStatus aFileStatus( osl_FileStatus_Mask_Attributes | osl_FileStatus_Mask_Type ); aItem.getFileStatus( aFileStatus ); sal_uInt64 nAttributes = aFileStatus.getAttributes(); - sal_Bool bReadOnly = (nAttributes & Attribute_ReadOnly) != 0; + sal_Bool bReadOnly = (nAttributes & osl_File_Attribute_ReadOnly) != 0; FileStatus::Type aType = aFileStatus.getFileType(); sal_Bool bDirectory = isFolder( aType ); @@ -4012,6 +4008,7 @@ RTLFUNC(StrConv) } pChar[nSize] = '\0'; ::rtl::OString aOStr(pChar); + delete[] pChar; // there is no concept about default codepage in unix. so it is incorrectly in unix ::rtl::OUString aOUStr = ::rtl::OStringToOUString(aOStr, osl_getThreadTextEncoding()); diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index fccdf5595e89..56b22cd69a5e 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -41,12 +41,6 @@ #include <tools/urlobj.hxx> #include <osl/file.hxx> -#ifdef OS2 -#define INCL_DOS -#define INCL_DOSPROCESS -#include <svpm.h> -#endif - #ifndef CLK_TCK #define CLK_TCK CLOCKS_PER_SEC #endif @@ -509,8 +503,6 @@ RTLFUNC(GetGUIType) // 17.7.2000 Make simple solution for testtool / fat office #if defined (WNT) rPar.Get(0)->PutInteger( 1 ); -#elif defined OS2 - rPar.Get(0)->PutInteger( 2 ); #elif defined UNX rPar.Get(0)->PutInteger( 4 ); #else diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 5054215fc931..2a39b06276d3 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -316,7 +316,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument ); std::vector< rtl::OUString > vEmbeddedImageURLs; lcl_deepInspectForEmbeddedImages( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs ); - if ( vEmbeddedImageURLs.size() ) + if ( !vEmbeddedImageURLs.empty() ) { // Export the images to the storage Sequence< Any > aArgs( 1 ); diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx index 7e3efc597ac1..a269bcde5b7b 100644 --- a/basic/workben/mgrtest.cxx +++ b/basic/workben/mgrtest.cxx @@ -526,7 +526,6 @@ void __EXPORT TestWindow::Resize() void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt ) { - char nCharCode = rKEvt.GetCharCode(); sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); // Nur bei Alt-Return diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index 027aa599b6ce..97e0aed31989 100755 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -2982,7 +2982,7 @@ </node> <node oor:name=".uno:HelplinesMove" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Guides When Moving</value> + <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Helplines While Moving</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index fdb82f172cb1..78479784946f 100755 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -52,7 +52,7 @@ DEF1NAME = $(SHL1TARGET) ALLTAR: TEST -.IF "$(OS)" == "OS2" || "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" MY_INI = .ini .ELSE MY_INI = rc diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index ef7ba869cf94..c8cb79300373 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -2230,13 +2230,13 @@ bool Access::thisIs(int what) { osl::MutexGuard g(*lock_); rtl::Reference< Node > p(getNode()); Node::Kind k(p->kind()); - return k != Node::KIND_PROPERTY && k != Node::KIND_LOCALIZED_VALUE && + return (k != Node::KIND_PROPERTY && k != Node::KIND_LOCALIZED_VALUE && ((what & IS_GROUP) == 0 || k == Node::KIND_GROUP) && ((what & IS_SET) == 0 || k == Node::KIND_SET) && ((what & IS_EXTENSIBLE) == 0 || k != Node::KIND_GROUP || dynamic_cast< GroupNode * >(p.get())->isExtensible()) && ((what & IS_GROUP_MEMBER) == 0 || - getParentNode()->kind() == Node::KIND_GROUP) || + getParentNode()->kind() == Node::KIND_GROUP)) || ((what & IS_SET_MEMBER) == 0 || getParentNode()->kind() == Node::KIND_SET) || ((what & IS_UPDATE) == 0 || getRootAccess()->isUpdate()); diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 3d9c40bc072b..fc8e1ca4395c 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -271,6 +271,17 @@ void ChildAccess::setProperty( localModifications->add(getRelativePath()); } +namespace +{ + rtl::OUString lcl_StripSegment(const rtl::OUString &rLocale) + { + sal_Int32 i = rLocale.getLength() ? rLocale.getLength() - 1 : 0; + while (i > 0 && rLocale[i] != '-' && rLocale[i] != '_') + --i; + return rLocale.copy(0, i); + } +} + css::uno::Any ChildAccess::asValue() { if (changedValue_.get() != 0) { return *changedValue_; @@ -281,43 +292,62 @@ css::uno::Any ChildAccess::asValue() { getComponents()); case Node::KIND_LOCALIZED_PROPERTY: { - rtl::OUString locale(getRootAccess()->getLocale()); - if (!Components::allLocales(locale)) { - // Find best match using an adaption of RFC 4647 lookup matching - // rules, removing "-" or "_" delimited segments from the end; - // defaults are the "en-US" locale, the "en" locale, the empty - // string locale, the first child (if any), or a nil value (even - // though it may be illegal for the given property), in that - // order: + rtl::OUString sLocale(getRootAccess()->getLocale()); + if (!Components::allLocales(sLocale)) + { rtl::Reference< ChildAccess > child; - for (;;) { - child = getChild(locale); - if (child.is() || locale.getLength() == 0) { + // Find best match using an adaption of RFC 4647 lookup matching + // rules, removing "-" or "_" delimited segments from the end + while (1) + { + child = getChild(sLocale); + if (child.is()) break; - } - sal_Int32 i = locale.getLength() - 1; - while (i > 0 && locale[i] != '-' && locale[i] != '_') { - --i; - } - if (i == 0) { + rtl::OUString sTmpLocale = lcl_StripSegment(sLocale); + if (!sTmpLocale.getLength()) break; + sLocale = sTmpLocale; + } + + //Resolves: fdo#33638 Look for the first entry with the same + //first segment as the requested language tag, before falling + //back to en-US, etc. + typedef std::vector< rtl::Reference< ChildAccess > > ChildVector; + if (!child.is()) + { + const ChildVector &rAllChildren = getAllChildren(); + for (ChildVector::const_iterator aI = rAllChildren.begin(), + aEnd = rAllChildren.end(); aI != aEnd; ++aI) + { + rtl::OUString sLanguage = lcl_StripSegment((*aI)->getNameInternal()); + if (sLocale == sLanguage) + { + child = *aI; + break; + } } - locale = locale.copy(0, i); } - if (!child.is()) { + + // defaults are the "en-US" locale, the "en" locale, the empty + // string locale, the first child (if any), or a nil value (even + // though it may be illegal for the given property), in that + // order: + if (!child.is()) + { child = getChild( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"))); - if (!child.is()) { + if (!child.is()) + { child = getChild( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"))); - if (!child.is()) { + if (!child.is()) + { child = getChild(rtl::OUString()); - if (!child.is()) { - std::vector< rtl::Reference< ChildAccess > > - all(getAllChildren()); - if (!all.empty()) { + if (!child.is()) + { + ChildVector all(getAllChildren()); + if (!all.empty()) child = all.front(); - } } } } diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 108e08fa7a12..3896fbee4cdc 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -650,8 +650,8 @@ void Components::parseFiles( css::uno::Reference< css::uno::XInterface >()); } osl::FileStatus stat( - FileStatusMask_Type | FileStatusMask_FileName | - FileStatusMask_FileURL); + osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_FileURL); if (i.getFileStatus(stat) != osl::FileBase::E_None) { throw css::uno::RuntimeException( (rtl::OUString( @@ -742,8 +742,8 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) { css::uno::Reference< css::uno::XInterface >()); } osl::FileStatus stat( - FileStatusMask_Type | FileStatusMask_FileName | - FileStatusMask_FileURL); + osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_FileURL); if (i.getFileStatus(stat) != osl::FileBase::E_None) { throw css::uno::RuntimeException( (rtl::OUString( diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index d274cd8973ca..ce4b9d49eb38 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -83,8 +83,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index a0808ae5e852..e9534ed85506 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -59,7 +59,7 @@ void OMetaConnection::disposing() Reference< XInterface > xStatement( i->get() ); ::comphelper::disposeComponent( xStatement ); } - catch (DisposedException) + catch (const DisposedException&) { } } diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 796310d36039..5132a9fae89e 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -107,7 +107,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName) bPrimarKeyIndex = xRow->getString(6) == aName; } } - catch(Exception) + catch(const Exception&) { } OIndexHelper* pRet = new OIndexHelper(m_pTable,aName,aQualifier,bUnique, diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk index cab216092241..24125388dd18 100755 --- a/connectivity/source/commontools/makefile.mk +++ b/connectivity/source/commontools/makefile.mk @@ -86,12 +86,12 @@ EXCEPTIONSFILES=\ $(SLO)$/DriversConfig.obj \ $(SLO)$/formattedcolumnvalue.obj \ $(SLO)$/BlobHelper.obj \ - $(SLO)$/warningscontainer.obj + $(SLO)$/warningscontainer.obj \ + $(SLO)$/dbconversion.obj SLOFILES=\ $(EXCEPTIONSFILES) \ $(SLO)$/AutoRetrievingBase.obj \ - $(SLO)$/dbconversion.obj diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 1377704a0a2c..cbfcf4ce5f13 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -45,13 +45,13 @@ extern "C" { //--------------------------------------------------------------------------------------- - void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/) { *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //--------------------------------------------------------------------------------------- -void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index 90237153de77..3e67ada06bd4 100755 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -68,7 +68,7 @@ SHL1STDLIBS=\ # NETBSD: somewhere we have to instantiate the static data members. # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. # MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" SHL1STDLIBS+=$(UCBHELPERLIB) .ENDIF diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx index 082cddca89f5..3ac0d922f33a 100644 --- a/connectivity/source/drivers/adabas/Bservices.cxx +++ b/connectivity/source/drivers/adabas/Bservices.cxx @@ -86,8 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 181181cd94fd..a9bf835cf940 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -86,7 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -95,7 +95,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 02b72a7e7ab5..8e65a8771dde 100755 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -70,13 +70,13 @@ EXCEPTIONSFILES= \ $(SLO)$/AStatement.obj \ $(SLO)$/APreparedStatement.obj \ $(SLO)$/AResultSetMetaData.obj \ - $(SLO)$/ADriver.obj \ - $(SLO)$/Aservices.obj + $(SLO)$/ADriver.obj \ + $(SLO)$/Aservices.obj \ + $(SLO)$/Awrapado.obj \ + $(SLO)$/adoimp.obj SLOFILES=\ - $(EXCEPTIONSFILES) \ - $(SLO)$/Awrapado.obj \ - $(SLO)$/adoimp.obj + $(EXCEPTIONSFILES) # --- Library ----------------------------------- SHL1TARGET= $(ADO_TARGET)$(DLLPOSTFIX) diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index 3a4e4f0745d8..cb74522ba4ff 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -86,8 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index e17c2ee59bc3..e14c4e1040fb 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -643,7 +643,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s } xDir->beforeFirst(); // move back to before first record } - catch(Exception&) + catch(const Exception&) { OSL_ASSERT(0); } @@ -700,7 +700,7 @@ void ODbaseTable::refreshIndexes() aVector.push_back(aURL.getBase()); } } - catch(Exception&) // an exception is thrown when no file exists + catch(const Exception&) // an exception is thrown when no file exists { } } @@ -1064,7 +1064,7 @@ sal_Bool ODbaseTable::CreateImpl() delete pFileStream; } } - catch(Exception&) // an exception is thrown when no file exists + catch(const Exception&) // an exception is thrown when no file exists { } @@ -1081,7 +1081,7 @@ sal_Bool ODbaseTable::CreateImpl() Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>()); aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) ); } - catch(Exception&) // an exception is thrown when no file exists + catch(const Exception&) // an exception is thrown when no file exists { } return sal_False; @@ -1098,7 +1098,7 @@ sal_Bool ODbaseTable::CreateImpl() { bMemoAlreadyExists = aMemo1Content.isDocument(); } - catch(Exception&) // an exception is thrown when no file exists + catch(const Exception&) // an exception is thrown when no file exists { } if (bMemoAlreadyExists) @@ -1455,7 +1455,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem _pIndexes->dropByIndex(--i); } } - catch(SQLException) + catch(const SQLException&) { } } @@ -1467,7 +1467,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem ::ucbhelper::Content aDeleteContent( aURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment > () ); aDeleteContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } - catch(Exception&) + catch(const Exception&) { // silently ignore this .... } @@ -1979,11 +1979,11 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,c break; } } - catch( SQLException& ) + catch( const SQLException& ) { throw; } - catch ( Exception& ) + catch ( const Exception& ) { m_pColumns->getByIndex(i) >>= xCol; OSL_ENSURE( xCol.is(), "ODbaseTable::UpdateBuffer column is null!" ); @@ -2333,7 +2333,7 @@ namespace if(aValues.getLength() && aValues[0].hasValue()) throw Exception(); } - catch(Exception&) + catch(const Exception&) { throw ElementExistException(newName,NULL); } diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index 67af687fb3c4..a0b82022792d 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -86,8 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index b0f7016c5e72..a9d413ec762a 100644 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.cxx @@ -86,8 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 855f0be63242..cee7f7dc8933 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -71,12 +71,15 @@ void OEvoabDriver::disposing() for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { Reference< XComponent > xComp(i->get(), UNO_QUERY); - if (xComp.is()) { - try { - xComp->dispose(); + if (xComp.is()) + { + try + { + xComp->dispose(); } - catch (com::sun::star::lang::DisposedException e) { - xComp.clear(); + catch (const com::sun::star::lang::DisposedException&) + { + xComp.clear(); } } } diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index 87e0831513e4..8c28d56c36c9 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -77,7 +77,7 @@ struct ProviderRequest { xRet = creator( xServiceManager, sImplementationName,Factory, Services,0); } - catch(::com::sun::star::uno::Exception) + catch(const ::com::sun::star::uno::Exception&) { OSL_FAIL("Service Creation Exception"); } diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 5ad8ed3356e7..b0e774d9f9a5 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#include <limits> // included here to prevent problems if compiling with C52 #ifdef GCC #include <iostream> diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 68af0a19524e..2931d53f92ab 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -86,8 +86,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 04f15cab4a21..b102481b4fe3 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -90,7 +90,7 @@ SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStor { xFlush->flush(); } - catch(Exception&) + catch(const Exception&) { OSL_FAIL( "NativeStorageAccess::close: caught an exception while flushing!" ); } @@ -171,7 +171,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, { nBytesRead = xIn->readBytes(aData,1); } - catch(Exception& e) + catch(const Exception& e) { StorageContainer::throwJavaException(e,env); return -1; @@ -249,7 +249,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js { nBytesRead = xIn->readBytes(aData, len); } - catch(Exception& e) + catch(const Exception& e) { StorageContainer::throwJavaException(e,env); return -1; @@ -317,7 +317,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStor { nBytesRead = xIn->readBytes(aData, 4); } - catch(Exception& e) + catch(const Exception& e) { StorageContainer::throwJavaException(e,env); return -1; @@ -464,7 +464,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst "No OutputStream"); } } - catch(Exception& e) + catch(const Exception& e) { OSL_FAIL("Exception caught! : write [BII)V"); StorageContainer::throwJavaException(e,env); @@ -523,9 +523,9 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j "No OutputStream"); } } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : writeBytes(aData);"); + OSL_FAIL("Exception caught! : writeBytes(aData);"); StorageContainer::throwJavaException(e,env); } } diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index f8bc5c53b0ce..9edd67bdc4f0 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -79,21 +79,19 @@ namespace connectivity { ::comphelper::disposeComponent(m_xOutputStream); } - catch(DisposedException&) + catch(const DisposedException&) { } - catch(const Exception& e) + catch(const Exception&) { - OSL_UNUSED( e ); OSL_FAIL("Could not dispose OutputStream"); } m_xOutputStream.clear(); } } - catch(Exception& ex) + catch(const Exception&) { - OSL_UNUSED( ex ); - OSL_FAIL("Exception catched!"); + OSL_FAIL("Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -245,7 +243,7 @@ namespace connectivity xTrans->commit(); } } - catch(Exception&) + catch(const Exception&) { } rMap.erase(aFind); @@ -281,7 +279,7 @@ namespace connectivity { pHelper.reset(new StreamHelper(aStoragePair.first.first->openStreamElement(sName,_nMode))); } - catch(Exception& ) + catch(const Exception&) { ::rtl::OUString sStrippedName = removeOldURLPrefix(sOrgName); @@ -292,7 +290,7 @@ namespace connectivity { bIsStream = aStoragePair.first.first->isStreamElement(sStrippedName); } - catch(Exception& ) + catch(const Exception&) { bIsStream = sal_False; } @@ -303,7 +301,7 @@ namespace connectivity } aFind->second.second.insert(TStreamMap::value_type(sName,pHelper)); } - catch(Exception& e) + catch(const Exception& e) { #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" ); diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index ac7b319ca44c..bac05be8b0a6 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -87,8 +87,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 9bd28fa0b0d4..8a719ee3f638 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -76,22 +76,22 @@ SAL_DLLPUBLIC_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Storag { aStoragePair.first.first->renameElement(sOldName,StorageContainer::removeURLPrefix(sName,aStoragePair.first.second)); } - catch(Exception&) + catch(const Exception&) { } } } - catch(NoSuchElementException&) + catch(const NoSuchElementException&) { } return aStoragePair.first.first->isStreamElement(StorageContainer::removeURLPrefix(sName,aStoragePair.first.second)); } - catch(NoSuchElementException&) + catch(const NoSuchElementException&) { } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); + OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); if (JNI_FALSE != env->ExceptionCheck()) env->ExceptionClear(); ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); @@ -123,14 +123,14 @@ SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFil { aStoragePair.first.first->removeElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,name),aStoragePair.first.second)); } - catch(NoSuchElementException&) + catch(const NoSuchElementException&) { if (JNI_FALSE != env->ExceptionCheck()) env->ExceptionClear(); } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement"); + OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement"); StorageContainer::throwJavaException(e,env); } } @@ -168,12 +168,12 @@ SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFil } #endif } - catch(NoSuchElementException&) + catch(const NoSuchElementException&) { } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); + OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); StorageContainer::throwJavaException(e,env); } } diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 28711c7bf277..3fb691d5524a 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -183,15 +183,15 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNa } while (tmpLongVal > 0); } - catch(Exception& ) + catch(const Exception&) { } return n - tmpLongVal; } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : skip();"); + OSL_FAIL("Exception caught! : skip();"); StorageContainer::throwJavaException(e,env); } } @@ -232,9 +232,9 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNat #endif return nAvailable; } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception caught! : available();"); + OSL_FAIL("Exception caught! : available();"); StorageContainer::throwJavaException(e,env); } } @@ -276,9 +276,9 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNat { nBytesRead = xIn->readBytes(aData,nLen); } - catch(Exception& e) + catch(const Exception& e) { - OSL_FAIL("Exception catched! : skip();"); + OSL_FAIL("Exception caught! : skip();"); StorageContainer::throwJavaException(e,env); } diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index a2d9d453f20a..4ecf3f9678bd 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -809,7 +809,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } } } - catch(Exception) + catch(const Exception&) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this ); } @@ -841,7 +841,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } } } - catch(Exception) + catch(const Exception&) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this ); } @@ -899,7 +899,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } } } - catch(Exception) + catch(const Exception&) { updateObject( columnIndex,x); } @@ -1061,7 +1061,7 @@ void java_sql_ResultSet::getFastPropertyValue( break; } } - catch(Exception&) + catch(const Exception&) { } } diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index fe98be8ad1ff..32fa42f22678 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -87,8 +87,7 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 00bc6de6048e..d16fc5d4bff4 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -93,8 +93,7 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index ed9bdac5476c..e0aec4dc255c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -242,8 +242,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 481cc7863c20..50870491cf0b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -124,7 +124,7 @@ namespace ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); if ( result == ::osl::FileBase::E_None ) { - ::osl::FileStatus aStatus( FileStatusMask_Validate ); + ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate ); result = aRegistryItem.getFileStatus( aStatus ); if ( result == ::osl::FileBase::E_None ) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 5cc807fceb11..e7fe48f05b18 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -44,12 +44,6 @@ #include <vector> #include <map> -#ifdef XP_OS2 -#define INCL_DOSERRORS -#define INCL_DOSFILEMGR -#include <os2.h> -#endif - using namespace com::sun::star::mozilla; namespace connectivity { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index 6e52c40b8f71..eed61b61d26d 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx @@ -42,12 +42,6 @@ #include <vector> #include <map> -#ifdef XP_OS2 -#define INCL_DOSERRORS -#define INCL_DOSFILEMGR -#include <os2.h> -#endif - using namespace com::sun::star::mozilla; class nsProfile; namespace connectivity diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index b44436e488ce..c4c1d2110619 100755 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -31,11 +31,6 @@ PRJINC=..$/..$/.. PRJNAME=connectivity TARGET=mozbootstrap -.IF "$(OS)" == "OS2" -all: - @echo " Not building under OS/2" -.ENDIF - # --- Settings ---------------------------------- USE_DEFFILE=TRUE diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 1928961b04b7..cefb6f9fb969 100755 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -31,7 +31,7 @@ TARGET=mozab TARGET2=$(TARGET)drv VISIBILITY_HIDDEN=TRUE -.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" ) +.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) all: @echo " Not building the mozilla address book driver" @echo " dependency to Mozilla developer snapshots not feasable at the moment" diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk index 49c0bd8033a6..810be9bcb457 100755 --- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk +++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk @@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE .INCLUDE : settings.mk -.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2" +.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in LibreOffice build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 32122c6e7166..0487378f6fb6 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -87,8 +87,7 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index 602ce5e935c9..9cc27a25d906 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -123,24 +123,11 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodbc.so")); #endif /* MACOSX */ #endif -#ifdef OS2 - _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC")); -#endif if ( !pODBCso ) pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) -#ifdef OS2 - { - delete pODBCso; - _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WOD402")); - pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); - if( !pODBCso) - return sal_False; - } -#else return sal_False; -#endif return bLoaded = LoadFunctions(pODBCso); } diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index ecb1793c2076..77ab7d647171 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -88,8 +88,7 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx index dbe77cd21e48..e588085e2c38 100644 --- a/connectivity/source/drivers/odbcbase/OResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx @@ -122,7 +122,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : m_pRowStatusArray = new SQLUSMALLINT[1]; // the default value N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_STATUS_PTR,m_pRowStatusArray,SQL_IS_POINTER); } - catch(Exception&) + catch(const Exception&) { // we don't want our result destroy here } SQLINTEGER nCurType = 0; @@ -134,7 +134,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : (nValueLen & SQL_CA2_CRC_EXACT) != SQL_CA2_CRC_EXACT) m_pSkipDeletedSet = new OSkipDeletedSet(this); } - catch(Exception&) + catch(const Exception&) { // we don't want our result destroy here } try @@ -143,7 +143,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : OTools::GetInfo(m_pStatement->getOwnConnection(),m_aConnectionHandle,SQL_GETDATA_EXTENSIONS,nValueLen,NULL); m_bFetchData = !((SQL_GD_ANY_ORDER & nValueLen) == SQL_GD_ANY_ORDER && nCurType != SQL_CURSOR_FORWARD_ONLY); } - catch(Exception&) + catch(const Exception&) { // we don't want our result destroy here m_bFetchData = sal_True; } @@ -155,7 +155,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : m_bUseFetchScroll = ( N3SQLGetFunctions(m_aConnectionHandle,SQL_API_SQLFETCHSCROLL,&nSupported) == SQL_SUCCESS && nSupported == 1 ); } } - catch(Exception&) + catch(const Exception&) { m_bUseFetchScroll = sal_False; } @@ -546,7 +546,7 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLExcepti const ORowSetValue& aValue = getValue(columnIndex,SQL_C_SBIGINT,&nRet,sizeof nRet); return (&aValue == &m_aEmptyValue) ? nRet : (sal_Int64)aValue; } - catch(SQLException&) + catch(const SQLException&) { nRet = getString(columnIndex).toInt64(); } @@ -873,7 +873,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) { OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); } - catch(SQLException e) + catch(const SQLException&) { nRet = unbind(); throw; @@ -1260,7 +1260,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& *pRet = 1; } } - catch(SQLException&) + catch(const SQLException&) { *pRet = 0; } @@ -1351,7 +1351,7 @@ sal_Bool OResultSet::isBookmarkable() const break; } } - catch(Exception&) + catch(const Exception&) { return sal_False; } diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index 3ae95c951954..998dc6f01d53 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -62,9 +62,9 @@ using namespace ::comphelper; { \ THROW_SQL(nRetCode); \ } \ - catch(SQLException&) \ + catch(const SQLException&) \ { \ - OSL_FAIL("Exception in odbc catched"); \ + OSL_FAIL("Exception in odbc caught"); \ } #endif @@ -269,7 +269,7 @@ SQLLEN OStatement_Base::getRowCount () throw( SQLException) try { THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows)); } - catch (SQLException&) + catch (const SQLException&) { } return numRows; @@ -305,7 +305,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQ SQLINTEGER nLock = SQL_CONCUR_LOCK; THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle, SQL_CONCURRENCY,(SQLPOINTER)(sal_IntPtr)nLock,SQL_IS_UINTEGER)); } - catch (SQLWarning& warn) + catch (const SQLWarning& warn) { // Catch any warnings and place on the warning stack setWarning (warn); @@ -346,7 +346,7 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) try { THROW_SQL(N3SQLNumResultCols(m_aStatementHandle,&numCols)); } - catch (SQLException&) + catch (const SQLException&) { } return numCols; @@ -380,7 +380,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S try { THROW_SQL(N3SQLExecDirect(m_aStatementHandle, (SDB_ODBC_CHAR*)aSql.getStr(),aSql.getLength())); } - catch (SQLWarning& ex) { + catch (const SQLWarning& ex) { // Save pointer to warning and save with ResultSet // object once it is created. @@ -617,7 +617,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim try { hasResultSet = N3SQLMoreResults(m_aStatementHandle) == SQL_SUCCESS; } - catch (SQLWarning &ex) { + catch (const SQLWarning &ex) { // Save pointer to warning and save with ResultSet // object once it is created. @@ -1150,7 +1150,7 @@ SQLUINTEGER OStatement_Base::getCursorProperties(SQLINTEGER _nCursorType,sal_Boo OTools::GetInfo(getOwnConnection(),getConnectionHandle(),nAskFor,nValueLen,NULL); } - catch(Exception&) + catch(const Exception&) { // we don't want our result destroy here nValueLen = 0; } diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 1fb37bd2cc23..01786287ee02 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -42,11 +42,6 @@ #ifdef HAVE_64BIT_POINTERS #error "no 64 bit pointer" -#else -#ifdef OS2 -#define PVOID_TO_INT64(x) (jlong)(sal_Int32)x -#define INT64_TO_PVOID(x) (void *)x -#endif // OS2 #endif //HAVE_64BIT_POINTERS namespace comphelper diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index bd53c4b55308..a53f07209349 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -61,14 +61,6 @@ //-------------------------------------------------------------------------- -#ifdef OS2 -#define ALLREADY_HAVE_OS2_TYPES -#define DONT_TD_VOID -#include <svpm.h> -#include <odbc/sqlext.h> -#define SDB_ODBC_CHAR UCHAR -#endif // OS2 - #ifdef OS2__00 #ifdef ODBCIMP diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index db754477ce89..1c1d703e6679 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -611,7 +611,7 @@ String STR_COMMAND_NOT_FOUND }; String STR_DATABASE_NEEDS_CONVERTING { - Text [ en-US ] = "The current database need to be converted. Please insert control user and password."; + Text [ en-US ] = "The current database need to be converted. Please insert control user and password."; }; String STR_USER_NO_DELETE { diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index a994e2d6ff1c..692acde215a0 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -180,7 +180,7 @@ public: }; -#if (defined UNX) || (defined OS2) +#if (defined UNX) int main( int argc, char * argv[] ) #else int _cdecl main( int argc, char * argv[] ) diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 2123a22fd69a..8ae9926c9377 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -55,7 +55,7 @@ using namespace cppu; using ::rtl::OUString; -#if (defined UNX) || (defined OS2) +#if (defined UNX) void main( int argc, char * argv[] ) #else void _cdecl main( int argc, char * argv[] ) diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index deca6f637ab4..86e991e128e1 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -634,7 +634,7 @@ void menuMain() PRINTSTR("4 Open OE Address Book\n") PRINTSTR("Please Input your choice:") } -#if (defined UNX) || (defined OS2) +#if (defined UNX) int main( int argc, char * argv[] ) #else int _cdecl main( int argc, char * argv[] ) diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index 087d0640f5ba..9286ec1695a6 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -406,7 +406,7 @@ void usage() PRINTLN("-e test outlook express"); PRINTLN("0 < threadcount <= 100, default 100"); } -#if (defined UNX) || (defined OS2) +#if (defined UNX) int main( int argc, char * argv[] ) #else int _cdecl main( int argc, char * argv[] ) diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 9872bbeefd58..560b1b0b0860 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -104,7 +104,7 @@ class Desktop : public Application static void HandleAppEvent( const ApplicationEvent& rAppEvent ); static ResMgr* GetDesktopResManager(); - static CommandLineArgs* GetCommandLineArgs(); + static CommandLineArgs& GetCommandLineArgs(); void HandleBootstrapErrors( BootstrapError ); void SetBootstrapError( BootstrapError nError ) @@ -169,7 +169,7 @@ class Desktop : public Application ::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, const ::rtl::OUString& aFileURL ); - static void PreloadModuleData( CommandLineArgs* ); + static void PreloadModuleData( const CommandLineArgs& ); static void PreloadConfigurationData(); Reference<XStatusIndicator> m_rSplashScreen; diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx deleted file mode 100644 index 2a1a0e779b60..000000000000 --- a/desktop/os2/source/applauncher/launcher.cxx +++ /dev/null @@ -1,121 +0,0 @@ -/* -*- 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 - * - * 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. - * - ************************************************************************/ - -#include "launcher.hxx" - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <malloc.h> -#include <process.h> - -int main( int argc, char* argv[]) -{ - PPIB pib; - APIRET rc; - RESULTCODES result = {0}; - char szFail[ _MAX_PATH]; - - HAB hab = WinInitialize( 0); - HMQ hmq = WinCreateMsgQueue( hab, 0); - ERRORID erridErrorCode = 0; - erridErrorCode = WinGetLastError(hab); - - // Calculate application name - CHAR szLibpath[_MAX_PATH*2]; - CHAR szApplicationName[_MAX_PATH]; - CHAR szDrive[_MAX_PATH]; - CHAR szDir[_MAX_PATH]; - CHAR szFileName[_MAX_PATH]; - CHAR szExt[_MAX_PATH]; - - // get executable fullpath - DosGetInfoBlocks(NULL, &pib); - DosQueryModuleName(pib->pib_hmte, sizeof(szApplicationName), szApplicationName); - - // adjust libpath - _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - char* basedir = strstr( szDir, "\\PROGRAM\\"); - if (basedir) *basedir = 0; - sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%BeginLIBPATH%", - szDrive, szDir, szDrive, szDir); - DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH); - // make sure we load DLL from our path only, so multiple instances/versions - // can be loaded. - - - // adjust exe name - _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - _makepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, (".bin") ); - - // copy command line parameters - int i, len; - len = strlen(szApplicationName) + 1 + strlen( APPLICATION_SWITCH) + 1 + 1; - for( i=1; i<argc; i++) - len += strlen( argv[i]) + 1; - - char* pszCommandLine, *pszArgs; - pszCommandLine = (char*) calloc( 1, len); - strcpy( pszCommandLine, szApplicationName); - pszArgs = pszCommandLine + strlen(szApplicationName) + 1; - strcat( pszArgs, APPLICATION_SWITCH); - strcat( pszArgs, " "); - for( i=1; i<argc; i++) { - // add quotes if argument has spaces! - if (strchr( argv[i], ' ')) - strcat( pszArgs, "\""); - strcat( pszArgs, argv[i]); - if (strchr( argv[i], ' ')) - strcat( pszArgs, "\""); - strcat( pszArgs, " "); - } - pszArgs[ strlen( pszArgs) + 0] = 0; - - // execute - rc = DosExecPgm(szFail, sizeof(szFail), - EXEC_SYNC, (PCSZ)pszCommandLine, (PCSZ)NULL, &result, - (PCSZ)szApplicationName); - if (rc) { - char szMessage[ _MAX_PATH*2]; - sprintf( szMessage, "Execution failed! Contact technical support.\n\nReturn code: %d\nFailing module:%s\n", rc, szFail); - rc = WinMessageBox( HWND_DESKTOP, HWND_DESKTOP, - (PSZ)szMessage, - (PSZ)"Unable to start OpenOffice.org!", - 0, MB_ERROR | MB_OK); - WinDestroyMsgQueue( hmq); - WinTerminate( hab); - exit(1); - } - - WinDestroyMsgQueue( hmq); - WinTerminate( hab); - - exit( result.codeResult); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/launcher.hxx b/desktop/os2/source/applauncher/launcher.hxx deleted file mode 100644 index 651098ef7382..000000000000 --- a/desktop/os2/source/applauncher/launcher.hxx +++ /dev/null @@ -1,11 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - -#define INCL_DOS -#define INCL_PM -#include <os2.h> - -#define OFFICE_IMAGE_NAME ("soffice") - -extern CHAR APPLICATION_SWITCH[]; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk deleted file mode 100755 index 7eec8aee9c23..000000000000 --- a/desktop/os2/source/applauncher/makefile.mk +++ /dev/null @@ -1,121 +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. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=desktop -TARGET=applauncher -LIBTARGET=NO -TARGETTYPE=GUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/launcher.obj \ - $(OBJ)$/swriter.obj \ - $(OBJ)$/scalc.obj \ - $(OBJ)$/sdraw.obj \ - $(OBJ)$/simpress.obj \ - $(OBJ)$/sbase.obj \ - $(OBJ)$/smath.obj \ - $(OBJ)$/officeloader.obj \ - $(OBJ)$/os2quickstart.obj - -APP1TARGET=swriter -APP1NOSAL=TRUE -APP1LINKRES=$(MISC)$/$(TARGET)1.res -APP1ICON=$(SOLARRESDIR)$/icons$/ooo-writer-app.ico -APP1OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/swriter.obj - - -APP2TARGET=scalc -APP2NOSAL=TRUE -APP2LINKRES=$(MISC)$/$(TARGET)2.res -APP2ICON=$(SOLARRESDIR)$/icons$/ooo-calc-app.ico -APP2OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/scalc.obj - -APP3TARGET=sdraw -APP3NOSAL=TRUE -APP3LINKRES=$(MISC)$/$(TARGET)3.res -APP3ICON=$(SOLARRESDIR)$/icons$/ooo-draw-app.ico -APP3OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/sdraw.obj - -APP4TARGET=simpress -APP4NOSAL=TRUE -APP4LINKRES=$(MISC)$/$(TARGET)4.res -APP4ICON=$(SOLARRESDIR)$/icons$/ooo-impress-app.ico -APP4OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/simpress.obj - -APP5TARGET=sbase -APP5NOSAL=TRUE -APP5LINKRES=$(MISC)$/$(TARGET)5.res -APP5ICON=$(SOLARRESDIR)$/icons$/ooo-base-app.ico -APP5OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/sbase.obj - -APP6TARGET=smath -APP6NOSAL=TRUE -APP6LINKRES=$(MISC)$/$(TARGET)6.res -APP6ICON=$(SOLARRESDIR)$/icons$/ooo-math-app.ico -APP6OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/smath.obj - -APP7TARGET=officeloader -APP7NOSAL=TRUE -APP7LINKRES=$(MISC)$/$(TARGET)7.res -APP7ICON=$(SOLARRESDIR)$/icons$/ooo-main-app.ico -APP7OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/officeloader.obj - -APP8TARGET=os2quickstart -APP8NOSAL=TRUE -APP8LINKRES=$(MISC)$/$(TARGET)8.res -APP8ICON=$(SOLARRESDIR)$/icons$/ooo-main-app.ico -APP8OBJS = \ - $(OBJ)$/launcher.obj\ - $(OBJ)$/os2quickstart.obj - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - diff --git a/desktop/os2/source/applauncher/officeloader.cxx b/desktop/os2/source/applauncher/officeloader.cxx deleted file mode 100644 index f3124acdcfeb..000000000000 --- a/desktop/os2/source/applauncher/officeloader.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/os2quickstart.cxx b/desktop/os2/source/applauncher/os2quickstart.cxx deleted file mode 100644 index b67389272f77..000000000000 --- a/desktop/os2/source/applauncher/os2quickstart.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-quickstart" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/sbase.cxx b/desktop/os2/source/applauncher/sbase.cxx deleted file mode 100644 index ed3e7cceb378..000000000000 --- a/desktop/os2/source/applauncher/sbase.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-base" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/scalc.cxx b/desktop/os2/source/applauncher/scalc.cxx deleted file mode 100644 index 854f34e7f6c1..000000000000 --- a/desktop/os2/source/applauncher/scalc.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-calc" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/sdraw.cxx b/desktop/os2/source/applauncher/sdraw.cxx deleted file mode 100644 index b3f4bcff301a..000000000000 --- a/desktop/os2/source/applauncher/sdraw.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-draw" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/simpress.cxx b/desktop/os2/source/applauncher/simpress.cxx deleted file mode 100644 index f4cf9575eb7b..000000000000 --- a/desktop/os2/source/applauncher/simpress.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-impress" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/smath.cxx b/desktop/os2/source/applauncher/smath.cxx deleted file mode 100644 index d93b15d34519..000000000000 --- a/desktop/os2/source/applauncher/smath.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-math" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/os2/source/applauncher/swriter.cxx b/desktop/os2/source/applauncher/swriter.cxx deleted file mode 100644 index 4fc857cf2e53..000000000000 --- a/desktop/os2/source/applauncher/swriter.cxx +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "launcher.hxx" - -CHAR APPLICATION_SWITCH[] = ( "-writer" ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index ef1f2dc135b0..106bded2ea6a 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -75,8 +75,10 @@ fi if [ "$VALGRIND" != "" ]; then VALGRINDCHECK="valgrind --tool=$VALGRIND --trace-children=yes --trace-children-skip=*/java --error-exitcode=101" export VALGRINDCHECK - G_SLICE=always-malloc - export G_SLICE + if [ "$VALGRIND" = "memcheck" ]; then + G_SLICE=always-malloc + export G_SLICE + fi fi case "`uname -s`" in diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index bf05c1a15938..8991bb6334b0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -308,24 +308,21 @@ void FatalError(const ::rtl::OUString& sMessage) _exit(ExitHelper::E_FATAL_ERROR); } -static bool ShouldSuppressUI(CommandLineArgs* pCmdLine) +static bool ShouldSuppressUI(const CommandLineArgs& rCmdLine) { - return pCmdLine->IsInvisible() || - pCmdLine->IsHeadless() || - pCmdLine->IsQuickstart(); + return rCmdLine.IsInvisible() || + rCmdLine.IsHeadless() || + rCmdLine.IsQuickstart(); } -CommandLineArgs* Desktop::GetCommandLineArgs() +namespace { - static CommandLineArgs* pArgs = 0; - if ( !pArgs ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pArgs ) - pArgs = new CommandLineArgs; - } + struct theCommandLineArgs : public rtl::Static< CommandLineArgs, theCommandLineArgs > {}; +} - return pArgs; +CommandLineArgs& Desktop::GetCommandLineArgs() +{ + return theCommandLineArgs::get(); } sal_Bool InitConfiguration() @@ -481,8 +478,8 @@ static bool needsSynchronization( //compare the modification time of the extension folder and the last //modified file - ::osl::FileStatus statUser(FileStatusMask_ModifyTime); - ::osl::FileStatus statBase(FileStatusMask_ModifyTime); + ::osl::FileStatus statUser(osl_FileStatus_Mask_ModifyTime); + ::osl::FileStatus statBase(osl_FileStatus_Mask_ModifyTime); if (itemUserFile.getFileStatus(statUser) == ::osl::File::E_None) { if (itemBaseFile.getFileStatus(statBase) == ::osl::File::E_None) @@ -615,9 +612,9 @@ throw() bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath); if (aDir.open() == osl::FileBase::E_None) { - sal_Int32 n_Mask = FileStatusMask_FileURL | - FileStatusMask_FileName | - FileStatusMask_Type; + sal_Int32 n_Mask = osl_FileStatus_Mask_FileURL | + osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_Type; osl::DirectoryItem aDirItem; while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None ) @@ -626,19 +623,19 @@ throw() sal_Bool bFilter = false; osl::FileStatus aFileStatus( n_Mask ); aDirItem.getFileStatus( aFileStatus ); - if( aFileStatus.isValid( FileStatusMask_Type ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular; // Getting the information for the next recursive copy sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; rtl::OUString newSrcUnqPath; - if( aFileStatus.isValid( FileStatusMask_FileURL ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) newSrcUnqPath = aFileStatus.getFileURL(); rtl::OUString newDstUnqPath = dstUnqPath; rtl::OUString tit; - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) { ::rtl::OUString aFileName = aFileStatus.getFileName(); tit = rtl::Uri::encode( aFileName, @@ -733,7 +730,7 @@ void Desktop::Init() if ( GetBootstrapError() == BE_OK ) { - CommandLineArgs* pCmdLineArgs = GetCommandLineArgs(); + const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); // start ipc thread only for non-remote offices RTL_LOGFILE_CONTEXT( aLog2, "desktop (cd100003) ::OfficeIPCThread::EnableOfficeIPCThread" ); OfficeIPCThread::Status aStatus = OfficeIPCThread::EnableOfficeIPCThread(); @@ -746,7 +743,7 @@ void Desktop::Init() // 2nd office startup should terminate after sending cmdlineargs through pipe SetBootstrapStatus(BS_TERMINATE); } - else if ( pCmdLineArgs->IsHelp() ) + else if ( rCmdLineArgs.IsHelp() ) { // disable IPC thread in an instance that is just showing a help message OfficeIPCThread::DisableOfficeIPCThread(); @@ -793,7 +790,10 @@ void Desktop::DeInit() // clear lockfile if (m_pLockfile != NULL) - m_pLockfile->clean(); + { + delete m_pLockfile; + m_pLockfile = NULL; + } OfficeIPCThread::DisableOfficeIPCThread(); if( pSignalHandler ) @@ -854,7 +854,12 @@ sal_Bool Desktop::QueryExit() { } - if (m_pLockfile != NULL) m_pLockfile->clean(); + if (m_pLockfile != NULL) + { + delete m_pLockfile; + m_pLockfile = NULL; + } + } return bExit; @@ -1435,14 +1440,14 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError) } bInException = sal_True; - CommandLineArgs* pArgs = GetCommandLineArgs(); + const CommandLineArgs& rArgs = GetCommandLineArgs(); // save all modified documents ... if it's allowed doing so. sal_Bool bRestart = sal_False; sal_Bool bAllowRecoveryAndSessionManagement = ( - ( !pArgs->IsNoRestore() ) && // some use cases of office must work without recovery - ( !pArgs->IsHeadless() ) && - ( !pArgs->IsServer() ) && + ( !rArgs.IsNoRestore() ) && // some use cases of office must work without recovery + ( !rArgs.IsHeadless() ) && + ( !rArgs.IsServer() ) && (( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery cant work without UI ... but UI layer seams to be the reason for this crash ( Application::IsInExecute() ) // crashes during startup and shutdown should be ignored (they indicates a corrupt installation ...) ); @@ -1469,9 +1474,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError) default: { - if (m_pLockfile != NULL) { - m_pLockfile->clean(); + if (m_pLockfile != NULL) + { + delete m_pLockfile; + m_pLockfile = NULL; } + if( bRestart ) { OfficeIPCThread::DisableOfficeIPCThread(); @@ -1562,11 +1570,11 @@ int Desktop::Main() com::sun::star::uno::setCurrentContext( new DesktopContext( com::sun::star::uno::getCurrentContext() ) ); - CommandLineArgs* pCmdLineArgs = GetCommandLineArgs(); + CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); // setup configuration error handling ConfigurationErrorHandler aConfigErrHandler; - if (!ShouldSuppressUI(pCmdLineArgs)) + if (!ShouldSuppressUI(rCmdLineArgs)) aConfigErrHandler.activate(); ResMgr::SetReadStringHook( ReplaceStringHookProc ); @@ -1599,7 +1607,6 @@ int Desktop::Main() ::comphelper::getProcessServiceFactory(); Reference< ::com::sun::star::task::XRestartManager > xRestartManager; - int nAcquireCount( 0 ); try { RegisterServices( xSMgr ); @@ -1607,7 +1614,8 @@ int Desktop::Main() SetSplashScreenProgress(25); #ifndef UNX - if ( pCmdLineArgs->IsHelp() ) { + if ( rCmdLineArgs.IsHelp() ) + { displayCmdlineHelp(); return EXIT_SUCCESS; } @@ -1617,8 +1625,9 @@ int Desktop::Main() // there is no other instance using our data files from a remote host RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main -> Lockfile" ); m_pLockfile = new Lockfile; - if ( !pCmdLineArgs->IsHeadless() && !pCmdLineArgs->IsInvisible() && - !pCmdLineArgs->IsNoLockcheck() && !m_pLockfile->check( Lockfile_execWarning )) { + if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() && + !rCmdLineArgs.IsNoLockcheck() && !m_pLockfile->check( Lockfile_execWarning )) + { // Lockfile exists, and user clicked 'no' return EXIT_FAILURE; } @@ -1637,7 +1646,7 @@ int Desktop::Main() RTL_LOGFILE_CONTEXT_TRACE( aLog, "} GetEnableATToolSupport" ); // terminate if requested... - if( pCmdLineArgs->IsTerminateAfterInit() ) + if( rCmdLineArgs.IsTerminateAfterInit() ) return EXIT_SUCCESS; @@ -1763,7 +1772,7 @@ int Desktop::Main() // check whether the shutdown is caused by restart pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) ); - if ( pCmdLineArgs->IsHeadless() ) + if ( rCmdLineArgs.IsHeadless() ) { // Ensure that we use not the system file dialogs as // headless mode relies on Application::EnableHeadlessMode() @@ -1775,7 +1784,7 @@ int Desktop::Main() if ( !pExecGlobals->bRestartRequested ) { - if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() ) && + if ((!rCmdLineArgs.WantsToLoadDocument() && !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() ) && (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) && (!bExistsRecoveryData ) && (!bExistsSessionData ) && @@ -1855,8 +1864,8 @@ int Desktop::Main() SetSplashScreenProgress(80); - if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() && - !pCmdLineArgs->IsNoQuickstart() ) + if ( !bTerminateRequested && !rCmdLineArgs.IsInvisible() && + !rCmdLineArgs.IsNoQuickstart() ) InitializeQuickstartMode( xSMgr ); RTL_LOGFILE_CONTEXT( aLog2, "desktop (cd100003) createInstance com.sun.star.frame.Desktop" ); @@ -1874,6 +1883,9 @@ int Desktop::Main() return EXIT_FAILURE; } + // Release solar mutex just before we wait for our client to connect + int nAcquireCount = Application::ReleaseSolarMutex(); + // Post user event to startup first application component window // We have to send this OpenClients message short before execute() to // minimize the risk that this message overtakes type detection contruction!! @@ -1905,7 +1917,7 @@ int Desktop::Main() if ( !pExecGlobals->bRestartRequested ) { // if this run of the office is triggered by restart, some additional actions should be done - DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() ); + DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() ); Execute(); } @@ -1943,8 +1955,8 @@ int Desktop::doShutdown() delete pResMgr, pResMgr = NULL; // Restore old value - CommandLineArgs* pCmdLineArgs = GetCommandLineArgs(); - if ( pCmdLineArgs->IsHeadless() ) + const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); + if ( rCmdLineArgs.IsHeadless() ) SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog ); // remove temp directory @@ -1984,7 +1996,7 @@ int Desktop::doShutdown() IMPL_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData ) { - return GraphicFilter::GetGraphicFilter()->GetFilterCallback().Call( pData ); + return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData ); } sal_Bool Desktop::InitializeConfiguration() @@ -2071,7 +2083,7 @@ void Desktop::FlushConfiguration() sal_Bool Desktop::shouldLaunchQuickstart() { - sal_Bool bQuickstart = GetCommandLineArgs()->IsQuickstart(); + sal_Bool bQuickstart = GetCommandLineArgs().IsQuickstart(); if (!bQuickstart) { const SfxPoolItem* pItem=0; @@ -2239,7 +2251,7 @@ sal_Bool Desktop::CheckOEM() } } -void Desktop::PreloadModuleData( CommandLineArgs* pArgs ) +void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory(); @@ -2252,7 +2264,7 @@ void Desktop::PreloadModuleData( CommandLineArgs* pArgs ) if ( !xLoader.is() ) return; - if ( pArgs->IsWriter() ) + if ( rArgs.IsWriter() ) { try { @@ -2264,7 +2276,7 @@ void Desktop::PreloadModuleData( CommandLineArgs* pArgs ) { } } - if ( pArgs->IsCalc() ) + if ( rArgs.IsCalc() ) { try { @@ -2276,7 +2288,7 @@ void Desktop::PreloadModuleData( CommandLineArgs* pArgs ) { } } - if ( pArgs->IsDraw() ) + if ( rArgs.IsDraw() ) { try { @@ -2288,7 +2300,7 @@ void Desktop::PreloadModuleData( CommandLineArgs* pArgs ) { } } - if ( pArgs->IsImpress() ) + if ( rArgs.IsImpress() ) { try { @@ -2590,33 +2602,34 @@ void Desktop::OpenClients() Reference < XComponent > xFirst; sal_Bool bLoaded = sal_False; - CommandLineArgs* pArgs = GetCommandLineArgs(); + const CommandLineArgs& rArgs = GetCommandLineArgs(); SvtInternalOptions aInternalOptions; Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory(); - if (!pArgs->IsQuickstart()) { + if (!rArgs.IsQuickstart()) + { sal_Bool bShowHelp = sal_False; ::rtl::OUStringBuffer aHelpURLBuffer; - if (pArgs->IsHelpWriter()) { + if (rArgs.IsHelpWriter()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start"); - } else if (pArgs->IsHelpCalc()) { + } else if (rArgs.IsHelpCalc()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://scalc/start"); - } else if (pArgs->IsHelpDraw()) { + } else if (rArgs.IsHelpDraw()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdraw/start"); - } else if (pArgs->IsHelpImpress()) { + } else if (rArgs.IsHelpImpress()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://simpress/start"); - } else if (pArgs->IsHelpBase()) { + } else if (rArgs.IsHelpBase()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdatabase/start"); - } else if (pArgs->IsHelpBasic()) { + } else if (rArgs.IsHelpBasic()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://sbasic/start"); - } else if (pArgs->IsHelpMath()) { + } else if (rArgs.IsHelpMath()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://smath/start"); } @@ -2632,8 +2645,6 @@ void Desktop::OpenClients() aHelpURLBuffer.appendAscii("&System=UNX"); #elif defined WNT aHelpURLBuffer.appendAscii("&System=WIN"); -#elif defined OS2 - aHelpURLBuffer.appendAscii("&System=OS2"); #endif pHelp->Start(aHelpURLBuffer.makeStringAndClear(), NULL); return; @@ -2649,7 +2660,7 @@ void Desktop::OpenClients() { aIniName = aIniName.copy( 0, lastIndex+1 ); aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "perftune" )); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" )); #else aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" )); @@ -2664,12 +2675,12 @@ void Desktop::OpenClients() aPerfTuneIniFile.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "QuickstartPreloadConfiguration" )), aPreloadData, aDefault ); if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) )) { - if ( pArgs->IsWriter() || - pArgs->IsCalc() || - pArgs->IsDraw() || - pArgs->IsImpress() ) + if ( rArgs.IsWriter() || + rArgs.IsCalc() || + rArgs.IsDraw() || + rArgs.IsImpress() ) { - PreloadModuleData( pArgs ); + PreloadModuleData( rArgs ); } PreloadConfigurationData(); @@ -2684,9 +2695,9 @@ void Desktop::OpenClients() // Furter it's not acceptable to recover such documents without any UI. It can // need some time, where the user wont see any results and wait for finishing the office startup ... sal_Bool bAllowRecoveryAndSessionManagement = ( - ( !pArgs->IsNoRestore() ) && - ( !pArgs->IsHeadless() ) && - ( !pArgs->IsServer() ) + ( !rArgs.IsNoRestore() ) && + ( !rArgs.IsHeadless() ) && + ( !rArgs.IsServer() ) ); if ( ! bAllowRecoveryAndSessionManagement ) @@ -2802,23 +2813,23 @@ void Desktop::OpenClients() OfficeIPCThread::EnableRequests(); sal_Bool bShutdown( sal_False ); - if ( !pArgs->IsServer() ) + if ( !rArgs.IsServer() ) { - ProcessDocumentsRequest aRequest(pArgs->getCwdUrl()); + ProcessDocumentsRequest aRequest(rArgs.getCwdUrl()); aRequest.pcProcessed = NULL; - pArgs->GetOpenList( aRequest.aOpenList ); - pArgs->GetViewList( aRequest.aViewList ); - pArgs->GetStartList( aRequest.aStartList ); - pArgs->GetPrintList( aRequest.aPrintList ); - pArgs->GetPrintToList( aRequest.aPrintToList ); - pArgs->GetPrinterName( aRequest.aPrinterName ); - pArgs->GetForceOpenList( aRequest.aForceOpenList ); - pArgs->GetForceNewList( aRequest.aForceNewList ); - pArgs->GetConversionList( aRequest.aConversionList ); - pArgs->GetConversionParams( aRequest.aConversionParams ); - pArgs->GetConversionOut( aRequest.aConversionOut ); - pArgs->GetInFilter( aRequest.aInFilter ); + rArgs.GetOpenList( aRequest.aOpenList ); + rArgs.GetViewList( aRequest.aViewList ); + rArgs.GetStartList( aRequest.aStartList ); + rArgs.GetPrintList( aRequest.aPrintList ); + rArgs.GetPrintToList( aRequest.aPrintToList ); + rArgs.GetPrinterName( aRequest.aPrinterName ); + rArgs.GetForceOpenList( aRequest.aForceOpenList ); + rArgs.GetForceNewList( aRequest.aForceNewList ); + rArgs.GetConversionList( aRequest.aConversionList ); + rArgs.GetConversionParams( aRequest.aConversionParams ); + rArgs.GetConversionOut( aRequest.aConversionOut ); + rArgs.GetInFilter( aRequest.aInFilter ); if ( aRequest.aOpenList.getLength() > 0 || aRequest.aViewList.getLength() > 0 || @@ -2831,18 +2842,18 @@ void Desktop::OpenClients() { bLoaded = sal_True; - if ( pArgs->HasModuleParam() ) + if ( rArgs.HasModuleParam() ) { SvtModuleOptions aOpt; // Support command line parameters to start a module (as preselection) - if ( pArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::E_WRITER ); - else if ( pArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::E_CALC ); - else if ( pArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::E_IMPRESS ); - else if ( pArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::E_DRAW ); } @@ -2874,10 +2885,10 @@ void Desktop::OpenClients() ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY_THROW ); Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW ); - if ( xList->hasElements() || pArgs->IsServer() ) + if ( xList->hasElements() || rArgs.IsServer() ) return; - if ( pArgs->IsQuickstart() || pArgs->IsInvisible() || pArgs->IsBean() || Application::AnyInput( INPUT_APPEVENT ) ) + if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || rArgs.IsBean() || Application::AnyInput( INPUT_APPEVENT ) ) // soffice was started as tray icon ... return; { @@ -2893,26 +2904,26 @@ void Desktop::OpenDefault() ::rtl::OUString aName; SvtModuleOptions aOpt; - CommandLineArgs* pArgs = GetCommandLineArgs(); - if ( pArgs->IsNoDefault() ) return; - if ( pArgs->HasModuleParam() ) + const CommandLineArgs& rArgs = GetCommandLineArgs(); + if ( rArgs.IsNoDefault() ) return; + if ( rArgs.HasModuleParam() ) { // Support new command line parameters to start a module - if ( pArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITER ); - else if ( pArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_CALC ); - else if ( pArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_IMPRESS ); - else if ( pArgs->IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DATABASE ); - else if ( pArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DRAW ); - else if ( pArgs->IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_MATH ); - else if ( pArgs->IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + else if ( rArgs.IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITERGLOBAL ); - else if ( pArgs->IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + else if ( rArgs.IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITERWEB ); } @@ -2933,7 +2944,7 @@ void Desktop::OpenDefault() return; } - ProcessDocumentsRequest aRequest(pArgs->getCwdUrl()); + ProcessDocumentsRequest aRequest(rArgs.getCwdUrl()); aRequest.pcProcessed = NULL; aRequest.aOpenList = aName; OfficeIPCThread::ExecuteCmdLineRequests( aRequest ); @@ -2980,7 +2991,7 @@ String GetURL_Impl( RTL_TEXTENCODING_UTF8, true ); String aFileURL = aURL.GetMainURL(INetURLObject::NO_DECODE); - ::osl::FileStatus aStatus( FileStatusMask_FileURL ); + ::osl::FileStatus aStatus( osl_FileStatus_Mask_FileURL ); ::osl::DirectoryItem aItem; if( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aFileURL, aItem ) && ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) ) @@ -2991,7 +3002,7 @@ String GetURL_Impl( void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) { - if ( rAppEvent.GetEvent() == "APPEAR" && !GetCommandLineArgs()->IsInvisible() ) + if ( rAppEvent.GetEvent() == "APPEAR" && !GetCommandLineArgs().IsInvisible() ) { css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); @@ -3047,7 +3058,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) } } } - else if ( rAppEvent.GetEvent() == "QUICKSTART" && !GetCommandLineArgs()->IsInvisible() ) + else if ( rAppEvent.GetEvent() == "QUICKSTART" && !GetCommandLineArgs().IsInvisible() ) { // If the office has been started the second time its command line arguments are sent through a pipe // connection to the first office. We want to reuse the quickstart option for the first office. @@ -3093,11 +3104,11 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) { OUString aOpenURL(rAppEvent.GetData().GetBuffer()); - CommandLineArgs* pCmdLine = GetCommandLineArgs(); - if ( !pCmdLine->IsInvisible() && !pCmdLine->IsTerminateAfterInit() ) + const CommandLineArgs& rCmdLine = GetCommandLineArgs(); + if ( !rCmdLine.IsInvisible() && !rCmdLine.IsTerminateAfterInit() ) { ProcessDocumentsRequest* pDocsRequest = new ProcessDocumentsRequest( - pCmdLine->getCwdUrl()); + rCmdLine.getCwdUrl()); pDocsRequest->aOpenList = aOpenURL; pDocsRequest->pcProcessed = NULL; @@ -3109,11 +3120,11 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) { OUString aPrintURL(rAppEvent.GetData().GetBuffer()); - CommandLineArgs* pCmdLine = GetCommandLineArgs(); - if ( !pCmdLine->IsInvisible() && !pCmdLine->IsTerminateAfterInit() ) + const CommandLineArgs& rCmdLine = GetCommandLineArgs(); + if ( !rCmdLine.IsInvisible() && !rCmdLine.IsTerminateAfterInit() ) { ProcessDocumentsRequest* pDocsRequest = new ProcessDocumentsRequest( - pCmdLine->getCwdUrl()); + rCmdLine.getCwdUrl()); pDocsRequest->aPrintList = aPrintURL; pDocsRequest->pcProcessed = NULL; @@ -3174,41 +3185,41 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) void Desktop::OpenSplashScreen() { ::rtl::OUString aTmpString; - CommandLineArgs* pCmdLine = GetCommandLineArgs(); + const CommandLineArgs &rCmdLine = GetCommandLineArgs(); sal_Bool bVisible = sal_False; // Show intro only if this is normal start (e.g. no server, no quickstart, no printing ) - if ( !pCmdLine->IsInvisible() && - !pCmdLine->IsHeadless() && - !pCmdLine->IsQuickstart() && - !pCmdLine->IsMinimized() && - !pCmdLine->IsNoLogo() && - !pCmdLine->IsTerminateAfterInit() && - !pCmdLine->GetPrintList( aTmpString ) && - !pCmdLine->GetPrintToList( aTmpString ) && - !pCmdLine->GetConversionList( aTmpString )) + if ( !rCmdLine.IsInvisible() && + !rCmdLine.IsHeadless() && + !rCmdLine.IsQuickstart() && + !rCmdLine.IsMinimized() && + !rCmdLine.IsNoLogo() && + !rCmdLine.IsTerminateAfterInit() && + !rCmdLine.GetPrintList( aTmpString ) && + !rCmdLine.GetPrintToList( aTmpString ) && + !rCmdLine.GetConversionList( aTmpString )) { // Determine application name from command line parameters OUString aAppName; - if ( pCmdLine->IsWriter() ) + if ( rCmdLine.IsWriter() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer" )); - else if ( pCmdLine->IsCalc() ) + else if ( rCmdLine.IsCalc() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc" )); - else if ( pCmdLine->IsDraw() ) + else if ( rCmdLine.IsDraw() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw" )); - else if ( pCmdLine->IsImpress() ) + else if ( rCmdLine.IsImpress() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress" )); - else if ( pCmdLine->IsBase() ) + else if ( rCmdLine.IsBase() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "base" )); - else if ( pCmdLine->IsGlobal() ) + else if ( rCmdLine.IsGlobal() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "global" )); - else if ( pCmdLine->IsMath() ) + else if ( rCmdLine.IsMath() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "math" )); - else if ( pCmdLine->IsWeb() ) + else if ( rCmdLine.IsWeb() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "web" )); // Which splash to use OUString aSplashService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.SplashScreen" )); - if ( pCmdLine->GetStringParam( CommandLineArgs::CMD_STRINGPARAM_SPLASHPIPE ).getLength() ) + if ( rCmdLine.GetStringParam( CommandLineArgs::CMD_STRINGPARAM_SPLASHPIPE ).getLength() ) aSplashService = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.PipeSplashScreen")); bVisible = sal_True; diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 38d425ed703c..be1d1502f683 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -232,16 +232,16 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) sal_Bool bHeadlessMode = sal_False; // interpret command line arguments - CommandLineArgs* pCmdLine = GetCommandLineArgs(); + CommandLineArgs& rCmdLine = GetCommandLineArgs(); // read accept string from configuration conDcp = SvtStartOptions().GetConnectionURL(); - if ( pCmdLine->GetAcceptString( aTmpString )) + if ( rCmdLine.GetAcceptString( aTmpString )) conDcp = aTmpString; // Headless mode for FAT Office - bHeadlessMode = pCmdLine->IsHeadless(); + bHeadlessMode = rCmdLine.IsHeadless(); if ( bHeadlessMode ) Application::EnableHeadlessMode(); @@ -254,7 +254,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) // improves parallel processing on Sun ONE Webtop // servicemanager up -> copy user installation - if ( pCmdLine->IsServer() ) + if ( rCmdLine.IsServer() ) { // Check some mandatory environment states if "-server" is possible. Otherwise ignore // this parameter. @@ -266,15 +266,15 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) if ( !rEnum.is() ) { // Reset server parameter so it is ignored in the furthermore startup process - pCmdLine->SetBoolParam( CommandLineArgs::CMD_BOOLPARAM_SERVER, sal_False ); + rCmdLine.SetBoolParam( CommandLineArgs::CMD_BOOLPARAM_SERVER, sal_False ); } } } ::rtl::OUString aPortalConnect; - bool bServer = (bool)pCmdLine->IsServer(); + bool bServer = (bool)rCmdLine.IsServer(); - pCmdLine->GetPortalConnectString( aPortalConnect ); + rCmdLine.GetPortalConnectString( aPortalConnect ); if ( !configureUcb( bServer, aPortalConnect ) ) { OSL_FAIL( "Can't configure UCB" ); diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index e575ea8f3727..28182d7e0db6 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -33,6 +33,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include "osl/file.hxx" +#include "sfx2/app.hxx" #include <svl/fstathelper.hxx> #include "dispatchwatcher.hxx" @@ -62,6 +63,7 @@ #include <vector> #include <osl/thread.hxx> +#include <rtl/instance.hxx> using ::rtl::OUString; using namespace ::osl; @@ -95,11 +97,17 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags, String aFilter; SfxMedium* pMedium = new SfxMedium( aUrl, STREAM_STD_READ, sal_False ); + const SfxFilter *pSfxFilter = NULL; - SfxFilterMatcher aMatcher; if( nFlags == SFX_FILTER_EXPORT ) - aMatcher = SfxFilterMatcher( aAppl ); - aMatcher.GuessFilterIgnoringContent( *pMedium, &pSfxFilter, nFlags, 0 ); + { + SfxFilterMatcher( aAppl ).GuessFilterIgnoringContent( *pMedium, &pSfxFilter, nFlags, 0 ); + } + else + { + SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pSfxFilter, nFlags, 0 ); + } + if( pSfxFilter ) aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() : pSfxFilter->GetServiceName(); @@ -115,18 +123,14 @@ static OUString impl_GuessFilter( OUString aUrlIn, OUString aUrlOut ) return impl_GetFilterFromExt( aUrlOut, SFX_FILTER_EXPORT, aAppl ); } -Mutex* DispatchWatcher::pWatcherMutex = NULL; +namespace +{ + class theWatcherMutex : public rtl::Static<Mutex, theWatcherMutex> {}; +} Mutex& DispatchWatcher::GetMutex() { - if ( !pWatcherMutex ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pWatcherMutex ) - pWatcherMutex = new osl::Mutex(); - } - - return *pWatcherMutex; + return theWatcherMutex::get(); } // Create or get the dispatch watcher implementation. This implementation must be diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 0fde60da603f..7146a29b3fd2 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -118,8 +118,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: DispatchWatcherHashMap m_aRequestContainer; - static ::osl::Mutex* pWatcherMutex; - sal_Int16 m_nRequestCount; }; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 13421d3cde7d..063fc69b2d35 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -178,24 +178,22 @@ bool LanguageSelection::prepareLanguage() // get the selected UI language as string bool bCmdLanguage( false ); bool bIniLanguage( false ); - OUString aEmpty; OUString aLocaleString = getUserUILanguage(); if ( aLocaleString.getLength() == 0 ) { - CommandLineArgs* pCmdLineArgs = Desktop::GetCommandLineArgs(); - if ( pCmdLineArgs ) + OUString aEmpty; + + const CommandLineArgs& rCmdLineArgs = Desktop::GetCommandLineArgs(); + rCmdLineArgs.GetLanguage(aLocaleString); + if (isInstalledLanguage(aLocaleString, sal_False)) { - pCmdLineArgs->GetLanguage(aLocaleString); - if (isInstalledLanguage(aLocaleString, sal_False)) - { - bCmdLanguage = true; - bFoundLanguage = true; - aFoundLanguage = aLocaleString; - } - else - aLocaleString = aEmpty; + bCmdLanguage = true; + bFoundLanguage = true; + aFoundLanguage = aLocaleString; } + else + aLocaleString = aEmpty; if ( !bCmdLanguage ) { diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index e7c30a2ca70f..4a3d084b8bb0 100755 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -47,13 +47,11 @@ CFLAGS+=-DGNOME_VFS_ENABLED # .ELSE # DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib # .ENDIF -# .ELIF "$(OS)" == "OS2" -# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib # .ELSE # DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) # .ENDIF -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE" +.IF "$(GUI)"=="WNT" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE" CFLAGS+=-DENABLE_QUICKSTART_APPLET .ENDIF @@ -102,11 +100,8 @@ DEF1NAME = $(SHL1TARGET) OBJFILES = \ $(OBJ)$/copyright_ascii_ooo.obj \ - $(OBJ)$/main.obj -.IF "$(GUI)" != "OS2" -OBJFILES += \ + $(OBJ)$/main.obj \ $(OBJ)$/copyright_ascii_sun.obj -.ENDIF SLOFILES = $(SHL1OBJS) diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 652d4c8dd416..51cb8db878d1 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -50,7 +50,8 @@ #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> #include <osl/file.hxx> -#include "rtl/process.h" +#include <rtl/process.h> +#include <rtl/instance.hxx> #include "tools/getprocessworkingdir.hxx" using namespace desktop; @@ -223,14 +224,13 @@ bool addArgument( OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; namespace { struct Security : public rtl::Static<osl::Security, Security> {}; } -::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; // Turns a string in aMsg such as file:///home/foo/.libreoffice/3 // Into a hex string of well known length ff132a86... String CreateMD5FromString( const OUString& aMsg ) { -#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL - fprintf (stderr, "create md5 frim '%s'\n", +#if (OSL_DEBUG_LEVEL > 2) + fprintf (stderr, "create md5 from '%s'\n", (const sal_Char *)rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8)); #endif @@ -360,19 +360,15 @@ throw( RuntimeException ) { } -// ---------------------------------------------------------------------------- - -::osl::Mutex& OfficeIPCThread::GetMutex() +namespace { - // Get or create our mutex for thread-saftey - if ( !pOfficeIPCThreadMutex ) - { - ::osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); - if ( !pOfficeIPCThreadMutex ) - pOfficeIPCThreadMutex = new osl::Mutex; - } + class theOfficeIPCThreadMutex + : public rtl::Static<osl::Mutex, theOfficeIPCThreadMutex> {}; +} - return *pOfficeIPCThreadMutex; +::osl::Mutex& OfficeIPCThread::GetMutex() +{ + return theOfficeIPCThreadMutex::get(); } void OfficeIPCThread::SetDowning() @@ -469,7 +465,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { aIniName = aIniName.copy( 0, lastIndex+1 ); aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "perftune" )); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" )); #else aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" )); @@ -710,7 +706,7 @@ void SAL_CALL OfficeIPCThread::run() #endif continue; } - CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); + const CommandLineArgs &rCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); if ( aCmdLineArgs->IsQuickstart() ) { @@ -760,7 +756,7 @@ void SAL_CALL OfficeIPCThread::run() bDocRequestSent |= ( aCmdLineArgs->GetPrintToList( pRequest->aPrintToList ) && aCmdLineArgs->GetPrinterName( pRequest->aPrinterName ) ); - if ( !pCurrentCmdLineArgs->IsInvisible() ) + if ( !rCurrentCmdLineArgs.IsInvisible() ) { // Read cmdline args that can open/create documents. As they would open a window // they are only allowed if the "-invisible" is currently not used! @@ -840,8 +836,6 @@ void SAL_CALL OfficeIPCThread::run() aHelpURLBuffer.appendAscii("&System=UNX"); #elif defined WNT aHelpURLBuffer.appendAscii("&System=WIN"); -#elif defined OS2 - aHelpURLBuffer.appendAscii("&System=OS2"); #endif ApplicationEvent* pAppEvent = new ApplicationEvent( aEmpty, aEmpty, diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index e50e46c280ea..a1fe4c5f772a 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -74,7 +74,6 @@ class OfficeIPCThread : public osl::Thread { private: static OfficeIPCThread* pGlobalOfficeIPCThread; - static ::osl::Mutex* pOfficeIPCThreadMutex; osl::Pipe maPipe; osl::StreamPipe maStreamPipe; diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index a4207ef97bfd..1e72fa121423 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -53,13 +53,13 @@ extern "C" int soffice_main() #ifdef UNX // handle --version and --help already here, otherwise they would be handled // after VCL initialization that might fail if $DISPLAY is not set - desktop::CommandLineArgs* pCmdLineArgs = aDesktop.GetCommandLineArgs(); - if ( pCmdLineArgs->IsHelp() ) + const desktop::CommandLineArgs& rCmdLineArgs = aDesktop.GetCommandLineArgs(); + if ( rCmdLineArgs.IsHelp() ) { desktop::displayCmdlineHelp(); return EXIT_SUCCESS; } - else if ( pCmdLineArgs->IsVersion() ) + else if ( rCmdLineArgs.IsVersion() ) { desktop::displayVersion(); return EXIT_SUCCESS; diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 0c55c6db4aff..592821208a34 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -171,7 +171,7 @@ namespace desktop { FileBase::RC err; DirectoryItem aDirItem; DirectoryItem::get(srcUnqPath, aDirItem); - FileStatus aFileStatus(FileStatusMask_All); + FileStatus aFileStatus(osl_FileStatus_Mask_All); aDirItem.getFileStatus(aFileStatus); if( aFileStatus.getFileType() == FileStatus::Directory) @@ -240,7 +240,7 @@ namespace desktop { #ifdef UNIX // set safer permissions for the user directory by default - File::setAttributes(aUserPath, Attribute_OwnWrite| Attribute_OwnRead| Attribute_OwnExe); + File::setAttributes(aUserPath, osl_File_Attribute_OwnWrite| osl_File_Attribute_OwnRead| osl_File_Attribute_OwnExe); #endif // copy data from shared data directory of base installation diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index 3f7f8ca9f293..a62873d89c5f 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -85,13 +85,13 @@ bool singleton_entries( uno::Reference<registry::XRegistryKey> const& ); extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src index e5adb84ba596..e1f242a600c4 100644 --- a/desktop/source/deployment/gui/dp_gui_backend.src +++ b/desktop/source/deployment/gui/dp_gui_backend.src @@ -81,6 +81,6 @@ Image RID_IMG_JAVA_TYPELIB Image RID_IMG_HELP { - ImageBitmap = Bitmap { File = "commandimagelist/sc_helperdialog.bmp"; }; + ImageBitmap = Bitmap { File = "sc_helperdialog.bmp"; }; MASKCOLOR }; diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 915470108fb6..25df7f0f4caa 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -351,13 +351,13 @@ sdecl::ServiceDecl const updateDecl( extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index d678c8626465..66d5ff80633c 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1263,11 +1263,15 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) } case DISABLED_UPDATE: { - bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo ); + if ( !m_disabledUpdates.empty() ) + bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo ); if ( p->m_bIgnored ) b.append( m_ignoredUpdate ); + if ( m_disabledUpdates.empty() ) + break; + UpdateDialog::DisabledUpdate & data = m_disabledUpdates[ pos ]; if (data.unsatisfiedDependencies.getLength() != 0) { @@ -1381,7 +1385,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) //If users are going to update a shared extension then we need //to warn them typedef ::std::vector<UpdateData>::const_iterator CIT; - for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); i++) + for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); ++i) { OSL_ASSERT(i->aInstalledPackage.is()); //If the user has no write access to the shared folder then the update diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index 73ca83792592..eed15ac25be7 100755 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -35,10 +35,6 @@ USE_PCH := ENABLE_PCH := PRJINC:=..$/.. -.IF "$(GUI)"=="OS2" -TARGET = deplgui -.ENDIF - .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk DLLPRE = diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx index 22e9e357b549..a2dd27df80b2 100644 --- a/desktop/source/deployment/inc/db.hxx +++ b/desktop/source/deployment/inc/db.hxx @@ -30,8 +30,8 @@ #include <boost/noncopyable.hpp> -#ifdef SYSTEM_DB -#include <db.h> +#ifdef SYSTEM_DB_HEADER +#include SYSTEM_DB_HEADER #else #include <berkeleydb/db.h> #endif diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk index 829a6bb96bbf..a2d3d6e5e05b 100755 --- a/desktop/source/deployment/inc/dp_misc.mk +++ b/desktop/source/deployment/inc/dp_misc.mk @@ -35,8 +35,6 @@ DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) .ELSE DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib .ENDIF -.ELIF "$(OS)" == "OS2" -DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib .ELSE DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) .ENDIF diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk index 877379ad7300..bffc8241c300 100755 --- a/desktop/source/deployment/makefile.mk +++ b/desktop/source/deployment/makefile.mk @@ -32,16 +32,10 @@ TARGET = deployment ENABLE_EXCEPTIONS = TRUE NO_BSYMBOLIC = TRUE -.IF "$(GUI)"=="OS2" -TARGET = deploy -.ENDIF - .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) INCPRE += inc @@ -101,11 +95,7 @@ RESLIB1SRSFILES = \ $(SRS)$/deployment_manager.srs \ $(SRS)$/deployment_unopkg.srs -.IF "$(GUI)"=="OS2" -RESLIB1SRSFILES += $(SRS)$/deplmisc.srs -.ELSE RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs -.ENDIF .INCLUDE : target.mk diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 3bfad74a3f32..2151642df43c 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -102,7 +102,7 @@ OUString CompIdentifiers::getName(::std::vector<Reference<deploy::XPackage> > co //get the first non-null reference Reference<deploy::XPackage> extension; ::std::vector<Reference<deploy::XPackage> >::const_iterator it = a.begin(); - for (; it != a.end(); it++) + for (; it != a.end(); ++it) { if (it->is()) { @@ -250,13 +250,13 @@ void ExtensionManager::addExtensionsToMap( ::std::list<OUString>::const_iterator citNames = m_repositoryNames.begin(); int index = 0; - for (;citNames != m_repositoryNames.end(); citNames++, index++) + for (;citNames != m_repositoryNames.end(); ++citNames, ++index) { if (citNames->equals(repository)) break; } - for (int i = 0; i < seqExt.getLength(); i++) + for (int i = 0; i < seqExt.getLength(); ++i) { Reference<deploy::XPackage> const & xExtension = seqExt[i]; OUString id = dp_misc::getIdentifier(xExtension); @@ -333,7 +333,7 @@ ExtensionManager::getExtensionsWithSameIdentifier( //throw an IllegalArgumentException if there is no extension at all. typedef ::std::list<Reference<deploy::XPackage> >::const_iterator CIT; - for (CIT i = listExtensions.begin(); i != listExtensions.end(); i++) + for (CIT i = listExtensions.begin(); i != listExtensions.end(); ++i) bHasExtension |= i->is(); if (!bHasExtension) throw lang::IllegalArgumentException( diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk index 4dc6405e34bf..022f5e27e554 100755 --- a/desktop/source/deployment/manager/makefile.mk +++ b/desktop/source/deployment/manager/makefile.mk @@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) SRS1NAME = $(TARGET) SRC1FILES = \ diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 1a46cdda3d5a..ae20039bf218 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -142,6 +142,23 @@ bool existsOfficePipe() return pipe.is(); } +//get modification time +static bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime) +{ + ::osl::DirectoryItem item; + if (::osl::DirectoryItem::get(rFileURL, item) != ::osl::File::E_None) + return false; + + ::osl::FileStatus stat(osl_FileStatus_Mask_ModifyTime|osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); + if (item.getFileStatus(stat) != ::osl::File::E_None) + return false; + + if( stat.getFileType() == ::osl::FileStatus::Link ) + return getModifyTimeTargetFile(stat.getLinkTargetURL(), rTime); + + rTime = stat.getModifyTime(); + return true; +} //Returns true if the Folder was more recently modified then //the lastsynchronized file. That is the repository needs to @@ -180,15 +197,12 @@ bool compareExtensionFolderWithLastSynchronizedFile( //compare the modification time of the extension folder and the last //modified file - ::osl::FileStatus statFolder(FileStatusMask_ModifyTime); - ::osl::FileStatus statFile(FileStatusMask_ModifyTime); - if (itemExtFolder.getFileStatus(statFolder) == ::osl::File::E_None) + TimeValue timeFolder; + if (getModifyTimeTargetFile(folderURL, timeFolder)) { - if (itemFile.getFileStatus(statFile) == ::osl::File::E_None) + TimeValue timeFile; + if (getModifyTimeTargetFile(fileURL, timeFile)) { - TimeValue timeFolder = statFolder.getModifyTime(); - TimeValue timeFile = statFile.getModifyTime(); - if (timeFile.Seconds < timeFolder.Seconds) bNeedsSync = true; } @@ -203,6 +217,7 @@ bool compareExtensionFolderWithLastSynchronizedFile( OSL_ASSERT(0); bNeedsSync = true; } + return bNeedsSync; } @@ -367,7 +382,7 @@ bool office_is_running() if ( #if defined UNIX sFile.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(SOFFICE2))) -#elif defined WNT || defined OS2 +#elif defined WNT //osl_getExecutableFile should deliver "soffice.bin" on windows //even if swriter.exe, scalc.exe etc. was started. This is a bug //in osl_getExecutableFile diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index d191dd680aa0..e38d5f250dcf 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -68,7 +68,6 @@ #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_DRAGONFLY_X86 "dragonfly_x86" @@ -188,8 +187,6 @@ namespace 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))) diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk index 3e4bd68cb4c0..9c0b33d36698 100755 --- a/desktop/source/deployment/misc/makefile.mk +++ b/desktop/source/deployment/misc/makefile.mk @@ -33,28 +33,18 @@ USE_DEFFILE = TRUE ENABLE_EXCEPTIONS = TRUE VISIBILITY_HIDDEN=TRUE -.IF "$(GUI)"=="OS2" -TARGET = deplmisc -.ENDIF - .INCLUDE : settings.mk # Reduction of exported symbols: CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) SRS1NAME = $(TARGET) SRC1FILES = \ dp_misc.src -.IF "$(GUI)"=="OS2" -SHL1TARGET = $(TARGET) -.ELSE SHL1TARGET = deploymentmisc$(DLLPOSTFIX) -.ENDIF SHL1OBJS = \ $(SLO)$/dp_misc.obj \ $(SLO)$/dp_resource.obj \ @@ -78,14 +68,7 @@ SHL1STDLIBS = \ $(UNOTOOLSLIB) \ $(XMLSCRIPTLIB) \ $(COMPHELPERLIB) -.IF "$(GUI)"=="OS2" -SHL1IMPLIB = ideploymentmisc$(DLLPOSTFIX) -LIB1TARGET = $(SLB)$/_deplmisc.lib -LIB1OBJFILES = $(SHL1OBJS) -DEFLIB1NAME = _deplmisc -.ELSE SHL1IMPLIB = i$(SHL1TARGET) -.ENDIF DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk index 9bcbd50d4230..1fb637ef8e3a 100755 --- a/desktop/source/deployment/registry/configuration/makefile.mk +++ b/desktop/source/deployment/registry/configuration/makefile.mk @@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc .INCLUDE : settings.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) SRS1NAME = $(TARGET) SRC1FILES = \ diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index becfc14d254d..5054564eae25 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -429,7 +429,7 @@ void BackendDb::writeSimpleList( listNode, css::uno::UNO_QUERY_THROW)); typedef ::std::list<OUString>::const_iterator ITC_ITEMS; - for (ITC_ITEMS i = list.begin(); i != list.end(); i++) + for (ITC_ITEMS i = list.begin(); i != list.end(); ++i) { const Reference<css::xml::dom::XNode> memberNode( doc->createElementNS(sNameSpace, sPrefix + sMemberTagName), css::uno::UNO_QUERY_THROW); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 053e193729dc..02bffa948e03 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -299,7 +299,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() while ((errorNext = helpFolder.getNextItem(item)) == ::osl::File::E_None) { //No find the language folders - ::osl::FileStatus stat(FileStatusMask_Type | FileStatusMask_FileName |FileStatusMask_FileURL); + ::osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |osl_FileStatus_Mask_FileURL); if (item.getFileStatus(stat) == ::osl::File::E_None) { if (stat.getFileType() != ::osl::FileStatus::Directory) diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk index d4934f71a46f..81778bf728c0 100755 --- a/desktop/source/deployment/registry/help/makefile.mk +++ b/desktop/source/deployment/registry/help/makefile.mk @@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc .INCLUDE : settings.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) SRS1NAME = $(TARGET) SRC1FILES = \ diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk index 06b39cd2d04e..64fe173f4597 100755 --- a/desktop/source/deployment/unopkg/makefile.mk +++ b/desktop/source/deployment/unopkg/makefile.mk @@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF - SRS1NAME = $(TARGET) SRC1FILES = \ unopkg.src diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 1ed91e906886..be970b1e432d 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -644,7 +644,7 @@ strings_vr MigrationImpl::getAllFiles(const OUString& baseURL) const // work through directory contents... DirectoryItem item; - FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL); + FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); while (dir.getNextItem(item) == FileBase::E_None) { if (item.getFileStatus(fs) == FileBase::E_None) @@ -676,11 +676,6 @@ strings_vr MigrationImpl::compileFileList() strings_vr vrExclude; strings_vr vrTemp; -#ifdef SAL_OS2 - if (m_aInfo.userdata.getLength() == 0) - return vrResult; -#endif - // get a list of all files: strings_vr vrFiles = getAllFiles(m_aInfo.userdata); diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index eefb529d0ca7..fb86474c8578 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -117,7 +117,7 @@ void WelcomePage::checkEval() { Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); Reference< XMaterialHolder > xHolder(xFactory->createInstance( - OUString::createFromAscii("com.sun.star.tab.tabreg")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.tab.tabreg"))), UNO_QUERY); if (xHolder.is()) { Any aData = xHolder->getMaterial(); Sequence < NamedValue > aSeq; @@ -179,7 +179,7 @@ LicensePage::LicensePage( svt::OWizardMachine* parent, const ResId& resid, const { DirectoryItem d; DirectoryItem::get(rLicensePath, d); - FileStatus fs(FileStatusMask_FileSize); + FileStatus fs(osl_FileStatus_Mask_FileSize); d.getFileStatus(fs); sal_uInt64 nBytesRead = 0; sal_uInt64 nPosition = 0; @@ -562,9 +562,9 @@ void RegistrationPage::ActivatePage() void RegistrationPage::impl_retrieveConfigurationData() { - static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.FirstStartWizard"); - static ::rtl::OUString PATH = ::rtl::OUString::createFromAscii("TabPages/Registration/RegistrationOptions/NeverButton"); - static ::rtl::OUString KEY = ::rtl::OUString::createFromAscii("Visible"); + static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.FirstStartWizard")); + static ::rtl::OUString PATH(RTL_CONSTASCII_USTRINGPARAM("TabPages/Registration/RegistrationOptions/NeverButton")); + static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("Visible")); ::com::sun::star::uno::Any aValue; try diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx index 6e2f26c771ec..c3d24e941375 100644 --- a/desktop/source/migration/services/autocorrmigration.cxx +++ b/desktop/source/migration/services/autocorrmigration.cxx @@ -115,7 +115,7 @@ namespace migration ::osl::DirectoryItem aItem; while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None ) { - ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL ); + ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL ); if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None ) { if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory ) diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index ab8e95055724..f4adfa27ed9d 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -112,7 +112,7 @@ namespace migration ::osl::DirectoryItem aItem; while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None ) { - ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL ); + ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL ); if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None ) { if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory ) diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index 359470ea2865..195cc012b404 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -61,13 +61,13 @@ extern "C" }; -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index 95eaba845ac5..66e45a3f2da2 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -46,13 +46,13 @@ extern "C" }; -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk index 718ac0387cb9..f74dec646b1d 100755 --- a/desktop/source/migration/services/makefile.mk +++ b/desktop/source/migration/services/makefile.mk @@ -43,9 +43,7 @@ DLLPRE = .INCLUDE : cppumaker.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) SLOFILES= \ $(SLO)$/jvmfwk.obj \ diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 43d1036b65a7..dc508e712cc9 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -140,7 +140,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration() void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions ) { osl::Directory aScanRootDir( sSourceDir ); - osl::FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL); + osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); osl::FileBase::RC nRetCode = aScanRootDir.open(); if ( nRetCode == osl::Directory::E_None ) { @@ -187,7 +187,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co { // work through directory contents... osl::DirectoryItem item; - osl::FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL); + osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); TStringVector aDirectories; while ((aDir.getNextItem(item) == osl::FileBase::E_None ) && ( aResult == SCANRESULT_NOTFOUND )) diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index fa114022897a..dc3c73efff5b 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -114,7 +114,7 @@ namespace migration ::osl::DirectoryItem aItem; while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None ) { - ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL ); + ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL ); if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None ) { if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory ) diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 3489d7186b4f..bb4be7e9f4e2 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -388,9 +388,7 @@ sal_Bool FirstStartWizard::onFinish() // return sal_True; if ( svt::RoadmapWizard::onFinish() ) { -#ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments. enableQuickstart(); -#endif disableWizard(); return sal_True; } @@ -447,15 +445,15 @@ void FirstStartWizard::storeAcceptDate() Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >( xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); - NamedValue v(OUString::createFromAscii("NodePath"), - makeAny(OUString::createFromAscii("org.openoffice.Setup/Office"))); + NamedValue v(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), + makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")))); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); - Any result = pset->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate")); + Any result = pset->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LicenseAcceptDate"))); OUString aAcceptDate = _getCurrentDateString(); - pset->setPropertyValue(OUString::createFromAscii("LicenseAcceptDate"), makeAny(aAcceptDate)); + pset->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LicenseAcceptDate")), makeAny(aAcceptDate)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); // since the license is accepted the local user registry can be cleaned if required @@ -474,16 +472,16 @@ void FirstStartWizard::setPatchLevel() Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >( xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); - NamedValue v(OUString::createFromAscii("NodePath"), - makeAny(OUString::createFromAscii("org.openoffice.Office.Common/Help/Registration"))); + NamedValue v(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), + makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Help/Registration")))); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); - Any result = pset->getPropertyValue(OUString::createFromAscii("ReminderDate")); + Any result = pset->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ReminderDate"))); OUString aPatchLevel( RTL_CONSTASCII_USTRINGPARAM( "Patch" )); aPatchLevel += OUString::valueOf( getBuildId(), 10 ); - pset->setPropertyValue(OUString::createFromAscii("ReminderDate"), makeAny(aPatchLevel)); + pset->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ReminderDate")), makeAny(aPatchLevel)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); } catch (const Exception&) { @@ -546,12 +544,12 @@ void FirstStartWizard::disableWizard() Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >( xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); - NamedValue v(OUString::createFromAscii("NodePath"), - makeAny(OUString::createFromAscii("org.openoffice.Setup/Office"))); + NamedValue v(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), + makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")))); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); - pset->setPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"), makeAny(sal_True)); + pset->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStartWizardCompleted")), makeAny(sal_True)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); } catch (const Exception&) { @@ -569,7 +567,7 @@ void FirstStartWizard::enableQuickstart() aSeq[1] <<= bAutostart; Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY ); if ( xQuickstart.is() ) xQuickstart->initialize( aSeq ); diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 4c69ceaa7c12..5d7561b628e6 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -297,14 +297,12 @@ extern "C" { using namespace desktop; -void SAL_CALL -component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment **) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment **) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -void * SAL_CALL -component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) { void* pReturn = NULL ; if ( pImplementationName && pServiceManager ) diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk index 2b02a4d5a421..1125e45b1a41 100755 --- a/desktop/source/pagein/makefile.mk +++ b/desktop/source/pagein/makefile.mk @@ -29,11 +29,6 @@ PRJ=..$/.. PRJNAME=desktop TARGET=pagein -TARGETTYPE=CUI -LIBTARGET=NO - -NO_DEFAULT_STL=TRUE -LIBSALCPPRT=$(0) # --- Settings ----------------------------------------------------- @@ -41,27 +36,6 @@ LIBSALCPPRT=$(0) .INCLUDE .IGNORE : icuversion.mk -.IF "$(OS)"=="MACOSX" - -dummy: - @echo "Pagein disabled for mac" - -.ELSE - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/pagein.obj \ - $(OBJ)$/pagein-main.obj \ - $(OBJ)$/file_image_unx.obj - -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJFILES) -APP1CODETYPE=C - -# depends on libc only. -STDLIB= - # --- Targets ------------------------------------------------------ ALL: \ @@ -193,4 +167,3 @@ $(MISC)$/$(TARGET)-common : makefile.mk @-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)sofficeapp$(DLLPOST) >> $@ -.ENDIF
\ No newline at end of file diff --git a/desktop/source/pagein/pagein-main.c b/desktop/source/pagein/pagein-main.c deleted file mode 100644 index f8fe82ab0ab2..000000000000 --- a/desktop/source/pagein/pagein-main.c +++ /dev/null @@ -1,12 +0,0 @@ -#include <stdio.h> -/* - * De-coupled to allow pagein to be re-used in the unx - * splash / quick-starter - */ -extern int pagein_execute (int argc, char **argv); - -int main (int argc, char **argv) -{ - return pagein_execute (argc, argv); -} - diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk index 8384f1b24372..e96cf60f0f42 100755 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ b/desktop/source/pkgchk/unopkg/makefile.mk @@ -29,11 +29,7 @@ PRJ = ..$/..$/.. PRJNAME = desktop TARGET = unopkg -.IF "$(GUI)" == "OS2" -TARGETTYPE = CUI -.ELSE TARGETTYPE = GUI -.ENDIF ENABLE_EXCEPTIONS = TRUE LIBTARGET=NO @@ -41,9 +37,7 @@ PRJINC += ..$/..$/deployment ..$/.. .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) .IF "$(LINK_SO)"!="" APP1TARGET = so$/unopkg diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 2021e7698b9b..d8f30ed26ae3 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -355,7 +355,7 @@ void printf_packages( { typedef ::std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT; int index = 0; - for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); i++, index++) + for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index) { if (vecUnaccepted[index]) printf_unaccepted_licenses(*i); @@ -544,7 +544,7 @@ bool hasNoFolder(OUString const & folderUrl) osl::File::RC rcNext = osl::File::E_None; while ( (rcNext = dir.getNextItem(i)) == osl::File::E_None) { - osl::FileStatus stat(FileStatusMask_Type); + osl::FileStatus stat(osl_FileStatus_Mask_Type); if (i.getFileStatus(stat) == osl::File::E_None) { if (stat.getFileType() == osl::FileStatus::Directory) @@ -596,7 +596,7 @@ void removeFolder(OUString const & folderUrl) ::osl::File::RC rcNext = ::osl::File::E_None; while ( (rcNext = dir.getNextItem(i)) == ::osl::File::E_None) { - ::osl::FileStatus stat(FileStatusMask_Type | FileStatusMask_FileURL); + ::osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); if (i.getFileStatus(stat) == ::osl::File::E_None) { ::osl::FileStatus::Type t = stat.getFileType(); diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx index a2bd31eec013..014df23af2b6 100644 --- a/desktop/source/so_comp/services.cxx +++ b/desktop/source/so_comp/services.cxx @@ -93,16 +93,14 @@ getSupportedServiceNames(int p) { extern "C" { -void SAL_CALL -component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName, uno_Environment**) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -void* SAL_CALL -component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index e4e80fbe13f3..e01f96655e81 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -84,16 +84,14 @@ getSupportedServiceNames(int p) { extern "C" { -void SAL_CALL -component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName, uno_Environment**) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -void* SAL_CALL -component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index a34d8de88a61..3d3001897859 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -277,14 +277,14 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/desktop/test/deployment/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx index f0b706bc647a..f96103acea90 100644 --- a/desktop/test/deployment/boxt/boxt.cxx +++ b/desktop/test/deployment/boxt/boxt.cxx @@ -168,14 +168,14 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 39101257ad67..5eb809d11695 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -275,14 +275,14 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c index 0f47f791d5eb..d69fe62e2466 100644 --- a/desktop/unx/source/args.c +++ b/desktop/unx/source/args.c @@ -61,10 +61,10 @@ static struct { { "minimized", 0, 1, 0, 0, NULL }, /* pagein bits */ - { "writer", 0, 0, 0, 0, "@pagein-writer" }, - { "calc", 0, 0, 0, 0, "@pagein-calc" }, - { "draw", 0, 0, 0, 0, "@pagein-draw" }, - { "impress", 0, 0, 0, 0, "@pagein-impress" }, + { "writer", 0, 0, 0, 0, "pagein-writer" }, + { "calc", 0, 0, 0, 0, "pagein-calc" }, + { "draw", 0, 0, 0, 0, "pagein-draw" }, + { "impress", 0, 0, 0, 0, "pagein-impress" }, /* nothing much */ { "version", 0, 1, 1, 1, NULL }, diff --git a/desktop/source/pagein/file_image.h b/desktop/unx/source/file_image.h index 4d081713a736..4d081713a736 100755 --- a/desktop/source/pagein/file_image.h +++ b/desktop/unx/source/file_image.h diff --git a/desktop/source/pagein/file_image_unx.c b/desktop/unx/source/file_image_unx.c index fa1af9248d60..fa1af9248d60 100755 --- a/desktop/source/pagein/file_image_unx.c +++ b/desktop/unx/source/file_image_unx.c diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk index 5c5c8f3e9e88..4a590b9e12ee 100755 --- a/desktop/unx/source/makefile.mk +++ b/desktop/unx/source/makefile.mk @@ -34,10 +34,10 @@ NO_DEFAULT_STL=TRUE .IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE" CFLAGS+=-DENABLE_QUICKSTART_LIBPNG +CFLAGS+=$(LIBPNG_CFLAGS) .ENDIF STDLIB= -CFLAGS+=$(LIBPNG_CFLAGS) OBJFILES= \ $(OBJ)$/splashx.obj \ @@ -45,7 +45,7 @@ OBJFILES= \ $(OBJ)$/args.obj .IF "$(OS)"!="MACOSX" -PAGEIN_OBJS= \ +OBJFILES += \ $(OBJ)$/pagein.obj \ $(OBJ)$/file_image_unx.obj .ENDIF @@ -55,7 +55,10 @@ APP1RPATH = BRAND APP1OBJS = $(OBJFILES) $(PAGEIN_OBJS) APP1LIBSALCPPRT= APP1CODETYPE = C -APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB) $(LIBPNG_LIBS) +APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB) +.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE" +APP1STDLIBS += $(LIBPNG_LIBS) +.ENDIF .IF "$(OS)"=="SOLARIS" APP1STDLIBS+= -lsocket .ENDIF diff --git a/desktop/source/pagein/pagein.c b/desktop/unx/source/pagein.c index 3ba12f9437a2..947b4b7375d5 100755 --- a/desktop/source/pagein/pagein.c +++ b/desktop/unx/source/pagein.c @@ -107,16 +107,25 @@ int pagein_execute (int argc, char **argv) if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0)) { - char path[1024]; + char fullpath[4096]; + char *path; + strncpy (fullpath, argv[i] + 1, 3000); + if (!(path = strrchr (fullpath, '/'))) + path = fullpath; + else + path++; + if ((fp = fopen (&(argv[i][1]), "r")) == 0) { fprintf (stderr, "fopen %s: %s\n", &(argv[i][1]), strerror(errno)); continue; } - while (fgets (path, sizeof(path), fp) != 0) + while (fgets (path, 1024, fp) != 0) { path[strlen(path) - 1] = '\0', k = 0; - if (do_pagein (path, &k) == 0) + + /* paths relative to the location of the pagein file */ + if (do_pagein (fullpath, &k) == 0) { /* accumulate total size */ nbytes += k; diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 711671fe28d4..6bcb10ef149d 100755 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -144,18 +144,6 @@ int splash_load_bmp( const char *filename ) width = png_get_image_width( png_ptr, info_ptr ); height = png_get_image_height( png_ptr, info_ptr ); -#if 0 - { - int i,j; - for (j = 0; j < height; j++) { - for (i = 0; i < width*3; i++) { - fprintf (stderr, "%.2x", bitmap_rows[j][i]); - } - fprintf (stderr, "\n"); - } - } -#endif - return 1; } #else @@ -173,8 +161,6 @@ int splash_load_bmp( const char *filename ) if ( read( fd, file_header, BMP_HEADER_LEN ) != BMP_HEADER_LEN || file_header[0] != 'B' || file_header[1] != 'M' ) LOAD_FAILURE( "Not a bitmap.\n" ); -/* int file_size = UINT32( file_header + 2 ); */ - char info_header[ WIN_INFO_LEN ]; if ( read( fd, info_header, 4 ) != 4 ) LOAD_FAILURE( "Unable to read the header.\n" ); @@ -552,7 +538,7 @@ int splash_create_window( int argc, char** argv ) size_hints.min_height = height; size_hints.max_height = height; - char *name = "OpenOffice.org"; + char *name = "LibreOffice"; char *icon = "icon"; // FIXME XSetStandardProperties( display, win, name, icon, None, @@ -582,13 +568,15 @@ static void process_events() { num_events--; XNextEvent( display, &xev ); - //process_event(xev); } } // Draw the progress void splash_draw_progress( int progress ) { + if (!display) + return; + // sanity if ( progress < 0 ) progress = 0; @@ -619,7 +607,8 @@ void splash_draw_progress( int progress ) // Close the window & cleanup void splash_close_window() { - XCloseDisplay( display ); + if (display) + XCloseDisplay( display ); #ifdef USE_LIBPNG png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); #else diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index e81cd6129d0a..4436ae7b2835 100755 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -79,7 +79,7 @@ charp_to_ustr( const char *pStr ) } /* Easier debugging of rtl_uString values. */ -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 static void ustr_debug( const char *pMessage, rtl_uString *pStr ) { @@ -233,13 +233,15 @@ get_md5hash( rtl_uString *pText ) rtl_uString *pResult = NULL; sal_Int32 nCapacity = 100; -#if OSL_DEBUG_LEVEL > 0 - fprintf (stderr, "Generate pipe md5 for '%s'\n", ustr_to_str (pText)->buffer); -#endif - if ( !pText ) return NULL; +#if OSL_DEBUG_LEVEL > 1 + rtl_String *pOut = ustr_to_str( pText ); + fprintf (stderr, "Generate pipe md5 for '%s'\n", pOut->buffer); + rtl_string_release( pOut ); +#endif + unsigned char *pData = (unsigned char *)rtl_uString_getStr( pText ); sal_uInt32 nSize = rtl_uString_getLength( pText ) * sizeof( sal_Unicode ); if ( !pData ) @@ -695,7 +697,7 @@ read_percent( ChildInfo *info, int *pPercent ) } } -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Got status: %s\n", pBegin ); #endif if ( !strncasecmp( pBegin, "end", 3 ) ) @@ -728,6 +730,26 @@ system_checks( void ) /* re-use the pagein code */ extern int pagein_execute (int argc, char **argv); +#ifndef MACOSX +#define REL_PATH "/../basis-link/program/" +static char *build_pagein_path (Args *args, const char *pagein_name) +{ + char *path; + rtl_String *app_path; + + app_path = ustr_to_str (args->pAppPath); + path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 1); + strcpy (path, "@"); + strcpy (path + 1, rtl_string_getStr (app_path)); + strcat (path, REL_PATH); + strcat (path, pagein_name); + + rtl_string_release( app_path ); + + return path; +} +#endif + void exec_pagein (Args *args) { @@ -735,24 +757,20 @@ exec_pagein (Args *args) #ifdef MACOSX (void)args; #else - char *argv[5]; - rtl_String *app_path; - - app_path = ustr_to_str (args->pAppPath); + char *argv[3]; + /* don't use -L - since that does a chdir that breaks relative paths */ argv[0] = "dummy-pagein"; - argv[1] = malloc (app_path->length + sizeof ("-L/../basis-link/program") + 2); - strcpy (argv[1], "-L"); - strcat (argv[1], app_path->buffer); - strcat (argv[1], "/../basis-link/program"); - argv[2] = "@pagein-common"; - argv[3] = (char *)args->pPageinType; - argv[4] = NULL; - - rtl_string_release( app_path ); + argv[1] = build_pagein_path (args, "pagein-common"); + if (args->pPageinType) { + argv[2] = build_pagein_path (args, args->pPageinType); + } else + argv[2] = NULL; - pagein_execute (args->pPageinType ? 4 : 3, argv); + pagein_execute (args->pPageinType ? 3 : 2, argv); + if (argv[2]) + free (argv[2]); free (argv[1]); #endif } @@ -866,7 +884,7 @@ exec_javaldx (Args *args) *chomp = '\0'; } -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 fprintf (stderr, "Adding javaldx path of '%s'\n", newpath); #endif extend_library_path (newpath); @@ -914,7 +932,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) close( fd ); } -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 else ustr_debug( "Failed to connect to pipe", pPipePath ); #endif @@ -972,7 +990,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) bShortWait = sal_False; } -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Polling, result is %s\n", ( eResult == ProgressContinue )? "continue" : ( ( eResult == ProgressRestart )? "restart" : "exit" ) ); diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index de703ba5c3de..3a200dd1e927 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -178,13 +178,11 @@ uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw() extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT void* SAL_CALL -component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, aEntries ); diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index df2fe688b9fa..1c6fb2e0e46b 100755 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -47,9 +47,6 @@ VERINFONAME=verinfo .IF "$(GUI)" == "WNT" RCFILES=verinfo.rc .ENDIF -.IF "$(GUI)" == "OS2" -RCFILES=ooverinfo2.rc -.ENDIF # --- Linken der Applikation --------------------------------------- @@ -63,7 +60,6 @@ RESLIB1SRSFILES= $(SRS)$/desktop.srs .IF "$(L10N_framework)"=="" .IF "$(LINK_SO)"=="TRUE" -.IF "$(GUI)" != "OS2" APP1TARGET=so$/$(TARGET) APP1NOSAL=TRUE APP1RPATH=BRAND @@ -80,8 +76,6 @@ APP1STACK=10000000 .ENDIF # WNT -.ENDIF # "$(GUI)" != "OS2" - .ENDIF # "$(LINK_SO)"=="TRUE" APP5TARGET=soffice @@ -104,14 +98,6 @@ APP5LINKRES=$(MISC)$/ooffice5.res APP5STACK=10000000 .ENDIF # WNT -.IF "$(GUI)" == "OS2" -APP5DEF= # automatic -APP5RES= $(RES)$/oodesktop.res -APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico -APP5VERINFO=ooverinfo2.rc -APP5LINKRES=$(MISC)$/ooffice.res -.ENDIF # OS2 - .IF "$(GUI)" == "WNT" .IF "$(LINK_SO)"=="TRUE" APP6TARGET=so$/officeloader @@ -179,14 +165,9 @@ ALLTAR: $(BIN)$/so$/$(TARGET).bin .ENDIF # "$(LINK_SO)"=="TRUE" .ENDIF # WNT -.IF "$(GUI)" == "OS2" -ALLTAR: $(BIN)$/$(TARGET).bin -.ENDIF # OS2 - $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) $(COPY) $< $@ -.IF "$(GUI)" != "OS2" .IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ @@ -194,7 +175,6 @@ $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) .ENDIF # "$(LINK_SO)"=="TRUE" ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) -.ENDIF .IF "$(OS)" == "MACOSX" .IF "$(LINK_SO)"=="TRUE" @@ -247,11 +227,6 @@ $(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST) .ENDIF # WNT -.IF "$(GUI)" == "OS2" -$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) - $(COPY) $< $@ -.ENDIF # OS2 - $(MISC)$/binso_created.flg : @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@ diff --git a/desktop/win32/source/setup/setup_a.cxx b/desktop/win32/source/setup/setup_a.cxx deleted file mode 100644 index a680673e1729..000000000000 --- a/desktop/win32/source/setup/setup_a.cxx +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- 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 - * - * 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 "setup.cpp" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 83a91ad3c2ba..c0f14068823f 100755 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -45,18 +45,6 @@ ZIP3LIST= \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png -.IF "$(ENABLE_BROFFICE)"=="TRUE" -ZIP1LIST+= \ - $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \ - $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png -ZIP2LIST+= \ - $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \ - $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png -ZIP3LIST+= \ - $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left-pt_BR.png \ - $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right-pt_BR.png -.ENDIF # ENABLE_BROFFICE - ZIP1TARGET=brand ZIP1DEPS=$(ZIP1LIST) ZIP2TARGET=brand_dev diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk new file mode 100644 index 000000000000..7aab083fe94a --- /dev/null +++ b/drawinglayer/Library_drawinglayer.mk @@ -0,0 +1,182 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,drawinglayer)) + +$(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc)) + +$(eval $(call gb_Library_add_precompiled_header,drawinglayer,$(SRCDIR)/drawinglayer/inc/pch/precompiled_drawinglayer)) + +$(eval $(call gb_Library_set_include,drawinglayer,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,drawinglayer,\ + $$(DEFS) \ + -DDRAWINGLAYER_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,drawinglayer,\ + avmedia \ + basegfx \ + canvastools \ + comphelper \ + cppcanvas \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + svl \ + svt \ + tk \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,drawinglayer,\ + drawinglayer/source/animation/animationtiming \ + drawinglayer/source/attribute/fillbitmapattribute \ + drawinglayer/source/attribute/fillgradientattribute \ + drawinglayer/source/attribute/fillhatchattribute \ + drawinglayer/source/attribute/fontattribute \ + drawinglayer/source/attribute/lineattribute \ + drawinglayer/source/attribute/linestartendattribute \ + drawinglayer/source/attribute/materialattribute3d \ + drawinglayer/source/attribute/sdrallattribute3d \ + drawinglayer/source/attribute/sdrfillattribute \ + drawinglayer/source/attribute/sdrfillbitmapattribute \ + drawinglayer/source/attribute/sdrlightattribute3d \ + drawinglayer/source/attribute/sdrlightingattribute3d \ + drawinglayer/source/attribute/sdrlineattribute \ + drawinglayer/source/attribute/sdrlinestartendattribute \ + drawinglayer/source/attribute/sdrobjectattribute3d \ + drawinglayer/source/attribute/sdrsceneattribute3d \ + drawinglayer/source/attribute/sdrshadowattribute \ + drawinglayer/source/attribute/strokeattribute \ + drawinglayer/source/primitive2d/animatedprimitive2d \ + drawinglayer/source/primitive2d/backgroundcolorprimitive2d \ + drawinglayer/source/primitive2d/baseprimitive2d \ + drawinglayer/source/primitive2d/bitmapprimitive2d \ + drawinglayer/source/primitive2d/borderlineprimitive2d \ + drawinglayer/source/primitive2d/chartprimitive2d \ + drawinglayer/source/primitive2d/clippedborderlineprimitive2d \ + drawinglayer/source/primitive2d/controlprimitive2d \ + drawinglayer/source/primitive2d/discretebitmapprimitive2d \ + drawinglayer/source/primitive2d/discreteshadowprimitive2d \ + drawinglayer/source/primitive2d/embedded3dprimitive2d \ + drawinglayer/source/primitive2d/epsprimitive2d \ + drawinglayer/source/primitive2d/fillbitmapprimitive2d \ + drawinglayer/source/primitive2d/fillgradientprimitive2d \ + drawinglayer/source/primitive2d/fillhatchprimitive2d \ + drawinglayer/source/primitive2d/graphicprimitive2d \ + drawinglayer/source/primitive2d/gridprimitive2d \ + drawinglayer/source/primitive2d/groupprimitive2d \ + drawinglayer/source/primitive2d/helplineprimitive2d \ + drawinglayer/source/primitive2d/hiddengeometryprimitive2d \ + drawinglayer/source/primitive2d/invertprimitive2d \ + drawinglayer/source/primitive2d/markerarrayprimitive2d \ + drawinglayer/source/primitive2d/maskprimitive2d \ + drawinglayer/source/primitive2d/mediaprimitive2d \ + drawinglayer/source/primitive2d/metafileprimitive2d \ + drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ + drawinglayer/source/primitive2d/pagepreviewprimitive2d \ + drawinglayer/source/primitive2d/pointarrayprimitive2d \ + drawinglayer/source/primitive2d/polygonprimitive2d \ + drawinglayer/source/primitive2d/polypolygonprimitive2d \ + drawinglayer/source/primitive2d/primitivetools2d \ + drawinglayer/source/primitive2d/rendergraphicprimitive2d \ + drawinglayer/source/primitive2d/sceneprimitive2d \ + drawinglayer/source/primitive2d/sdrdecompositiontools2d \ + drawinglayer/source/primitive2d/shadowprimitive2d \ + drawinglayer/source/primitive2d/structuretagprimitive2d \ + drawinglayer/source/primitive2d/textdecoratedprimitive2d \ + drawinglayer/source/primitive2d/texteffectprimitive2d \ + drawinglayer/source/primitive2d/textenumsprimitive2d \ + drawinglayer/source/primitive2d/texthierarchyprimitive2d \ + drawinglayer/source/primitive2d/textlayoutdevice \ + drawinglayer/source/primitive2d/textlineprimitive2d \ + drawinglayer/source/primitive2d/textprimitive2d \ + drawinglayer/source/primitive2d/textstrikeoutprimitive2d \ + drawinglayer/source/primitive2d/transformprimitive2d \ + drawinglayer/source/primitive2d/transparenceprimitive2d \ + drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \ + drawinglayer/source/primitive2d/wallpaperprimitive2d \ + drawinglayer/source/primitive2d/wrongspellprimitive2d \ + drawinglayer/source/primitive3d/baseprimitive3d \ + drawinglayer/source/primitive3d/groupprimitive3d \ + drawinglayer/source/primitive3d/hatchtextureprimitive3d \ + drawinglayer/source/primitive3d/hiddengeometryprimitive3d \ + drawinglayer/source/primitive3d/modifiedcolorprimitive3d \ + drawinglayer/source/primitive3d/polygonprimitive3d \ + drawinglayer/source/primitive3d/polygontubeprimitive3d \ + drawinglayer/source/primitive3d/polypolygonprimitive3d \ + drawinglayer/source/primitive3d/sdrcubeprimitive3d \ + drawinglayer/source/primitive3d/sdrdecompositiontools3d \ + drawinglayer/source/primitive3d/sdrextrudelathetools3d \ + drawinglayer/source/primitive3d/sdrextrudeprimitive3d \ + drawinglayer/source/primitive3d/sdrlatheprimitive3d \ + drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d \ + drawinglayer/source/primitive3d/sdrprimitive3d \ + drawinglayer/source/primitive3d/sdrsphereprimitive3d \ + drawinglayer/source/primitive3d/shadowprimitive3d \ + drawinglayer/source/primitive3d/textureprimitive3d \ + drawinglayer/source/primitive3d/transformprimitive3d \ + drawinglayer/source/processor2d/baseprocessor2d \ + drawinglayer/source/processor2d/canvasprocessor \ + drawinglayer/source/processor2d/contourextractor2d \ + drawinglayer/source/processor2d/helperchartrenderer \ + drawinglayer/source/processor2d/helperwrongspellrenderer \ + drawinglayer/source/processor2d/hittestprocessor2d \ + drawinglayer/source/processor2d/linegeometryextractor2d \ + drawinglayer/source/processor2d/textaspolygonextractor2d \ + drawinglayer/source/processor2d/vclhelperbitmaprender \ + drawinglayer/source/processor2d/vclhelperbitmaptransform \ + drawinglayer/source/processor2d/vclhelperbufferdevice \ + drawinglayer/source/processor2d/vclhelpergradient \ + drawinglayer/source/processor2d/vclmetafileprocessor2d \ + drawinglayer/source/processor2d/vclpixelprocessor2d \ + drawinglayer/source/processor2d/vclprocessor2d \ + drawinglayer/source/processor3d/baseprocessor3d \ + drawinglayer/source/processor3d/cutfindprocessor3d \ + drawinglayer/source/processor3d/defaultprocessor3d \ + drawinglayer/source/processor3d/geometry2dextractor \ + drawinglayer/source/processor3d/shadow3dextractor \ + drawinglayer/source/processor3d/zbufferprocessor3d \ + drawinglayer/source/texture/texture3d \ + drawinglayer/source/texture/texture \ +)) + +$(eval $(call gb_Library_add_noexception_objects,drawinglayer,\ + drawinglayer/source/geometry/viewinformation2d \ + drawinglayer/source/geometry/viewinformation3d \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/source/ui/resource/makefile.mk b/drawinglayer/Makefile index fd6a5351bac2..a79aff831024 100755..100644 --- a/formula/source/ui/resource/makefile.mk +++ b/drawinglayer/Makefile @@ -25,21 +25,14 @@ # #************************************************************************* -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=formula -TARGET=ui_resource -ENABLE_EXCEPTIONS=TRUE +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -# --- Settings ----------------------------------------------------- +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/ModuleHelper.obj \ - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/drawinglayer/Module_drawinglayer.mk b/drawinglayer/Module_drawinglayer.mk new file mode 100644 index 000000000000..86711645030d --- /dev/null +++ b/drawinglayer/Module_drawinglayer.mk @@ -0,0 +1,35 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,drawinglayer)) + +$(eval $(call gb_Module_add_targets,drawinglayer,\ + Library_drawinglayer \ + Package_inc \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk new file mode 100644 index 000000000000..df4a75b607bb --- /dev/null +++ b/drawinglayer/Package_inc.mk @@ -0,0 +1,140 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,drawinglayer_inc,$(SRCDIR)/drawinglayer/inc)) + +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/animation/animationtiming.hxx,drawinglayer/animation/animationtiming.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillbitmapattribute.hxx,drawinglayer/attribute/fillbitmapattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillgradientattribute.hxx,drawinglayer/attribute/fillgradientattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillhatchattribute.hxx,drawinglayer/attribute/fillhatchattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fontattribute.hxx,drawinglayer/attribute/fontattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/lineattribute.hxx,drawinglayer/attribute/lineattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/linestartendattribute.hxx,drawinglayer/attribute/linestartendattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/materialattribute3d.hxx,drawinglayer/attribute/materialattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrallattribute3d.hxx,drawinglayer/attribute/sdrallattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillattribute.hxx,drawinglayer/attribute/sdrfillattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx,drawinglayer/attribute/sdrfillbitmapattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightattribute3d.hxx,drawinglayer/attribute/sdrlightattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightingattribute3d.hxx,drawinglayer/attribute/sdrlightingattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlineattribute.hxx,drawinglayer/attribute/sdrlineattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlinestartendattribute.hxx,drawinglayer/attribute/sdrlinestartendattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrobjectattribute3d.hxx,drawinglayer/attribute/sdrobjectattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrsceneattribute3d.hxx,drawinglayer/attribute/sdrsceneattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrshadowattribute.hxx,drawinglayer/attribute/sdrshadowattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/strokeattribute.hxx,drawinglayer/attribute/strokeattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/drawinglayerdllapi.h,drawinglayer/drawinglayerdllapi.h)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation2d.hxx,drawinglayer/geometry/viewinformation2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation3d.hxx,drawinglayer/geometry/viewinformation3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/animatedprimitive2d.hxx,drawinglayer/primitive2d/animatedprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx,drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/baseprimitive2d.hxx,drawinglayer/primitive2d/baseprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx,drawinglayer/primitive2d/bitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx,drawinglayer/primitive2d/borderlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/chartprimitive2d.hxx,drawinglayer/primitive2d/chartprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx,drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/controlprimitive2d.hxx,drawinglayer/primitive2d/controlprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx,drawinglayer/primitive2d/discretebitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx,drawinglayer/primitive2d/discreteshadowprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx,drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx,drawinglayer/primitive2d/embedded3dprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/epsprimitive2d.hxx,drawinglayer/primitive2d/epsprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx,drawinglayer/primitive2d/fillbitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx,drawinglayer/primitive2d/fillgradientprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx,drawinglayer/primitive2d/fillhatchprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/graphicprimitive2d.hxx,drawinglayer/primitive2d/graphicprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/gridprimitive2d.hxx,drawinglayer/primitive2d/gridprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/groupprimitive2d.hxx,drawinglayer/primitive2d/groupprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/helplineprimitive2d.hxx,drawinglayer/primitive2d/helplineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx,drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/invertprimitive2d.hxx,drawinglayer/primitive2d/invertprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx,drawinglayer/primitive2d/markerarrayprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/maskprimitive2d.hxx,drawinglayer/primitive2d/maskprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/mediaprimitive2d.hxx,drawinglayer/primitive2d/mediaprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polygonprimitive2d.hxx,drawinglayer/primitive2d/polygonprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx,drawinglayer/primitive2d/polypolygonprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/primitivetools2d.hxx,drawinglayer/primitive2d/primitivetools2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/rendergraphicprimitive2d.hxx,drawinglayer/primitive2d/rendergraphicprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sceneprimitive2d.hxx,drawinglayer/primitive2d/sceneprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx,drawinglayer/primitive2d/sdrdecompositiontools2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/shadowprimitive2d.hxx,drawinglayer/primitive2d/shadowprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx,drawinglayer/primitive2d/structuretagprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx,drawinglayer/primitive2d/textdecoratedprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx,drawinglayer/primitive2d/texteffectprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx,drawinglayer/primitive2d/textenumsprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx,drawinglayer/primitive2d/texthierarchyprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlayoutdevice.hxx,drawinglayer/primitive2d/textlayoutdevice.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlineprimitive2d.hxx,drawinglayer/primitive2d/textlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textprimitive2d.hxx,drawinglayer/primitive2d/textprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx,drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transformprimitive2d.hxx,drawinglayer/primitive2d/transformprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx,drawinglayer/primitive2d/transparenceprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx,drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx,drawinglayer/primitive2d/wallpaperprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx,drawinglayer/primitive2d/wrongspellprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/baseprimitive3d.hxx,drawinglayer/primitive3d/baseprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx,drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/groupprimitive3d.hxx,drawinglayer/primitive3d/groupprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx,drawinglayer/primitive3d/hatchtextureprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx,drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx,drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygonprimitive3d.hxx,drawinglayer/primitive3d/polygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx,drawinglayer/primitive3d/polygontubeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx,drawinglayer/primitive3d/polypolygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx,drawinglayer/primitive3d/sdrcubeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx,drawinglayer/primitive3d/sdrdecompositiontools3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx,drawinglayer/primitive3d/sdrextrudelathetools3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx,drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx,drawinglayer/primitive3d/sdrlatheprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx,drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrprimitive3d.hxx,drawinglayer/primitive3d/sdrprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx,drawinglayer/primitive3d/sdrsphereprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/shadowprimitive3d.hxx,drawinglayer/primitive3d/shadowprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/textureprimitive3d.hxx,drawinglayer/primitive3d/textureprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/transformprimitive3d.hxx,drawinglayer/primitive3d/transformprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/baseprocessor2d.hxx,drawinglayer/processor2d/baseprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/canvasprocessor.hxx,drawinglayer/processor2d/canvasprocessor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/contourextractor2d.hxx,drawinglayer/processor2d/contourextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/linegeometryextractor2d.hxx,drawinglayer/processor2d/linegeometryextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx,drawinglayer/processor2d/textaspolygonextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx,drawinglayer/processor2d/vclmetafileprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx,drawinglayer/processor2d/vclpixelprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclprocessor2d.hxx,drawinglayer/processor2d/vclprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/defaultprocessor3d.hxx,drawinglayer/processor3d/defaultprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/zbufferprocessor3d.hxx,drawinglayer/processor3d/zbufferprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture3d.hxx,drawinglayer/texture/texture3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture.hxx,drawinglayer/texture/texture.hxx)) + +# vim: set noet ts=4 sw=4: diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx index 106424b0a73a..ff10eb5672ff 100644 --- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx +++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX #define INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -40,7 +42,7 @@ namespace drawinglayer { ////////////////////////////////////////////////////////////////////////////// - class AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntry { private: AnimationEntry(const AnimationEntry&); @@ -59,7 +61,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryFixed : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: double mfDuration; @@ -78,7 +80,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLinear : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: double mfDuration; @@ -99,7 +101,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryList : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: double mfDuration; @@ -122,7 +124,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLoop : public AnimationEntryList + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { protected: sal_uInt32 mnRepeat; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx index 41ca480bfab0..96b181dbf18c 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class FillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute { private: ImpFillBitmapAttribute* mpFillBitmapAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx index 4d02d2569089..1d0b1ce30cab 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -69,7 +71,7 @@ namespace drawinglayer { namespace attribute { - class FillGradientAttribute + class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute { private: ImpFillGradientAttribute* mpFillGradientAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx index 0bb0988f5889..3828927ac8bc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -66,7 +68,7 @@ namespace drawinglayer { namespace attribute { - class FillHatchAttribute + class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute { private: ImpFillHatchAttribute* mpFillHatchAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx index 1382c506669a..2e3ebd5dad06 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer This attribute class is able to hold all parameters needed/used to completely define the parametrisation of a text portion. */ - class FontAttribute + class DRAWINGLAYER_DLLPUBLIC FontAttribute { private: ImpFontAttribute* mpFontAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx index b4e006d7b750..f9d7142e5c3d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/vector/b2enums.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineAttribute + class DRAWINGLAYER_DLLPUBLIC LineAttribute { private: ImpLineAttribute* mpLineAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx index c8745778eb21..ba6a45aaab6f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute { private: ImpLineStartEndAttribute* mpLineStartEndAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx index 2b4ea4b90743..886d87e0d063 100644 --- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class MaterialAttribute3D + class DRAWINGLAYER_DLLPUBLIC MaterialAttribute3D { private: ImpMaterialAttribute3D* mpMaterialAttribute3D; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx index c3857e617d69..1831b787f288 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineFillShadowAttribute3D + class DRAWINGLAYER_DLLPUBLIC SdrLineFillShadowAttribute3D { private: const SdrLineAttribute maLine; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx index db4e570cb23d..d9bb829fa698 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -53,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillAttribute { private: ImpSdrFillAttribute* mpSdrFillAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx index 9e5721620e06..ab7f003fee4d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillBitmapAttribute { private: ImpSdrFillBitmapAttribute* mpSdrFillBitmapAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx index edeae3cb9fee..03a731c607ba 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DLightAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DLightAttribute { private: ImpSdr3DLightAttribute* mpSdr3DLightAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx index dbe1c1f7e0cd..8de7688b5199 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -53,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrLightingAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLightingAttribute { private: ImpSdrLightingAttribute* mpSdrLightingAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx index c5f18db6f7a4..6e39600e3dfa 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <basegfx/vector/b2enums.hxx> #include <vector> @@ -52,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineAttribute { private: ImpSdrLineAttribute* mpSdrLineAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx index b832c9ca51b5..02582b56a290 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -50,7 +52,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineStartEndAttribute { private: ImpSdrLineStartEndAttribute* mpSdrLineStartEndAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx index 06d9360f6d11..f92caa1c8ff1 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DObjectAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DObjectAttribute { private: ImpSdr3DObjectAttribute* mpSdr3DObjectAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx index 44e964a53f42..594b4c45de5f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class SdrSceneAttribute + class DRAWINGLAYER_DLLPUBLIC SdrSceneAttribute { private: ImpSdrSceneAttribute* mpSdrSceneAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx index 12f41297a337..9c4b2ececdd9 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class SdrShadowAttribute + class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute { private: ImpSdrShadowAttribute* mpSdrShadowAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx index b9e4d15cd6e2..99e35ceec080 100644 --- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -45,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class StrokeAttribute + class DRAWINGLAYER_DLLPUBLIC StrokeAttribute { private: ImpStrokeAttribute* mpStrokeAttribute; diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h new file mode 100644 index 000000000000..8badcbe1fe82 --- /dev/null +++ b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * David Tardon, Red Hat Inc. <dtardon@redhat.com> + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Major Contributor(s): + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H +#define INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H + +#include <sal/types.h> + +#if defined(DRAWINGLAYER_DLLIMPLEMENTATION) +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define DRAWINGLAYER_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index e397eeb94395..0a6b21e66f58 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -63,7 +65,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive2D for C++ implementations working with those */ - class ViewInformation2D + class DRAWINGLAYER_DLLPUBLIC ViewInformation2D { private: /// pointer to private implementation class diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx index e8b6299769cb..8364577ee99d 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -61,7 +63,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive3D for C++ implementations working with those */ - class ViewInformation3D + class DRAWINGLAYER_DLLPUBLIC ViewInformation3D { private: /// pointer to private implementation class diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx index 50b3e5e6ecd9..a43f12f17584 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -58,7 +60,7 @@ namespace drawinglayer for values of [0.0 .. 0.5] the first, else the last entry will be used. This mechanism is not limited to two entries, though. */ - class AnimatedSwitchPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedSwitchPrimitive2D : public GroupPrimitive2D { private: /** @@ -115,7 +117,7 @@ namespace drawinglayer decomposition is specialized in delivering the children in the range [0.0.. 0.5] and an empty sequence else */ - class AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D { protected: public: @@ -147,7 +149,7 @@ namespace drawinglayer will be linearly combined from the decomposed values and the animation value to allow a smooth animation. */ - class AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D { private: /// the transformations diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 05b7fae6ecf8..441abf49f01c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -50,7 +52,7 @@ namespace drawinglayer It will try to buffer it's last decomposition using maLastViewport to detect changes in the get2DDecomposition call. */ - class BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the fill color to use diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index b6afe2994e08..12585e9202ce 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> @@ -142,7 +144,7 @@ namespace drawinglayer for view-independent primitives which are defined by not using ViewInformation2D in their get2DDecomposition/getB2DRange implementations. */ - class BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive2DImplBase @@ -227,7 +229,7 @@ namespace drawinglayer to identify if a new decomposition is needed at the next call (f) return maBuffered2DDecomposition */ - class BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive2D : public BasePrimitive2D { private: @@ -270,24 +272,24 @@ namespace drawinglayer namespace primitive2d { /// get B2DRange from a given Primitive2DReference - basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); /// get B2DRange from a given Primitive2DSequence - basegfx::B2DRange getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); /// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally - bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); /// concatenate sequence - void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); /// concatenate single Primitive2D - void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx index e93456151959..c3650b3fd23a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer This may change in the future to any other, maybe more general base class providing 24bit RGBA. */ - class BitmapPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BitmapPrimitive2D : public BasePrimitive2D { private: /// the RGBA Bitmap-data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 6080881cbb42..0bd537de41b3 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -48,7 +50,7 @@ namespace drawinglayer The LineStart/End overlap is defined by the Extend(Inner|Outer)(Start|End) definitions. */ - class BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx index 752b6e6985dd..b32c94291e26 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <com/sun/star/frame/XModel.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer visualisation. It is used to allow specific renderers to do something direct for visualising the chart. */ - class ChartPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ChartPrimitive2D : public GroupPrimitive2D { private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index bae79087a7a8..9c1495b0d582 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -41,7 +43,7 @@ namespace drawinglayer /** BorderLinePrimitive2D clipped by the intersection with a provided polygon. */ - class ClippedBorderLinePrimitive2D : public BorderLinePrimitive2D + class DRAWINGLAYER_DLLPUBLIC ClippedBorderLinePrimitive2D : public BorderLinePrimitive2D { private: const basegfx::B2DPolygon maIntersection; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index 41ee01581090..c4999883823e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/awt/XControlModel.hpp> @@ -47,7 +49,7 @@ namespace drawinglayer representation is limited to a quadratic pixel maximum defined in the applicatin settings. */ - class ControlPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// object's base data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 27e77f20aa44..8e33c1530f8d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> @@ -46,7 +48,7 @@ namespace drawinglayer painted in 1:1 pixel resolution. It will never be sheared, rotated or scaled with the view. */ - class DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D { private: /// the RGBA Bitmap-data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index c30bff545ddb..795f4d97b130 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -28,6 +28,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -42,7 +44,7 @@ namespace drawinglayer /** DiscreteShadow data class */ - class DiscreteShadow + class DRAWINGLAYER_DLLPUBLIC DiscreteShadow { private: /// the original shadow BitmapEx in a special form @@ -85,7 +87,7 @@ namespace drawinglayer /** DiscreteShadowPrimitive2D class */ - class DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D { private: // the object transformation of the rectangular object diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index cbc1393dd849..245a6d1bb8dc 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -51,7 +53,7 @@ namespace drawinglayer This primitive will not be visualized and decomposes to a yellow 2D rectangle to visualize that this should never be visualized */ - class Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the sequence of 3d primitives diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx index a3310c00bf24..a1533a6d5633 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gfxlink.hxx> @@ -41,7 +43,7 @@ namespace drawinglayer namespace primitive2d { /** EpsPrimitive2D class */ - class EpsPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC EpsPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 2552472b3388..503ab31d4ff5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> @@ -53,7 +55,7 @@ namespace drawinglayer decomposition, but on pixel oututs the areas where the tiled pieces are aligned tend to show up (one overlapping or empty pixel) */ - class FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index f4f780404059..2fe971b871ef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> @@ -58,7 +60,7 @@ namespace drawinglayer version is used in the MetafilePrimitive2D decomposition when the old XOR paint was recorded. */ - class FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index d27b1957f657..f7a37b2f5e3f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will deliver the hatch lines. */ - class FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx index 2f4c52ff1532..381d69b41fb6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/grfmgr.hxx> @@ -54,7 +56,7 @@ namespace drawinglayer The primitive geometry area is defined by Transform. */ - class GraphicPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GraphicPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx index edb7f43417c3..fda8dd3e9fda 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -50,7 +52,7 @@ namespace drawinglayer makes this primitive highly view-dependent and it dynamically buffers the last decomposition dependent from the Viewport used. */ - class GridPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GridPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// The geometry definition for the grid area diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index db582069df57..b2bec3c7c818 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -70,7 +72,7 @@ namespace drawinglayer - ModifiedColorPrimitive2D (for a stack of color modifications) - TransformPrimitive2D (for a transformation stack) */ - class GroupPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive2D : public BasePrimitive2D { private: /// the children. Declared private since this shall never be changed at all after construction diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx index 2e70d31a1949..26587634eaf1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -61,7 +63,7 @@ namespace drawinglayer The visualisation uses the two given colors to create a dashed line with the given dash length. */ - class HelplinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HelplinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// Helpline geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index b17d0600c8b2..341effddfc00 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer // filled nor lines' creation criteria. The whole primitive decomposes to nothing, // so no one not knowing it will be influenced. Only helper processors for hit test // (and maybe BoundRect extractors) will use it and it's children subcontent. - class HiddenGeometryPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D : public GroupPrimitive2D { public: HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx index ea20a1099614..2ef4a4184c92 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer systems. XOR painting needs read access to the target, so modern graphic systems tend to not support it anymore. */ - class InvertPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC InvertPrimitive2D : public GroupPrimitive2D { public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index eedee6013950..90d2ef9d3c5c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> @@ -53,7 +55,7 @@ namespace drawinglayer It decomposes to the needed number of BitmapPrimitive2D's, so it would be efficient to handle it directly in a renderer. */ - class MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the positions for the marker diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx index a46f7d44e835..6f2dced65eef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -52,7 +54,7 @@ namespace drawinglayer The geometrc range of this primitive is completely defined by the Mask PolyPolygon since by definition nothing outside of the mask is visible. */ - class MaskPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D { private: /// the mask PolyPolygon diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx index 9d64e204c936..bc9dcb9a495e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +50,7 @@ namespace drawinglayer background and the decomposition will try to create a graphic representation if te content (defined by the URL), e.g. a still frome for animated stuff. */ - class MediaPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MediaPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx index e4763a818648..77fb8a8cf9d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gdimtf.hxx> @@ -60,7 +62,7 @@ namespace drawinglayer have many advantages; Metafile would no longer have to be rendered by sub-systems and a standard way for converting Metafiles would exist. */ - class MetafilePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MetafilePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index c96782e60fe0..770ed83fe160 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -55,7 +57,7 @@ namespace drawinglayer If a renderer does not handle this primitive, the content will be visualized unchanged. */ - class ModifiedColorPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive2D : public GroupPrimitive2D { private: /// The ColorModifier to use diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 7fc5e13a6e62..e6d969651a68 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer those primitives to be visualized correctly, Your renderer needs to locally correct it's ViewInformation2D to reference the new XDrawPage. */ - class PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the XDrawPage visualized by this primitive. When we go forward with primitives diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index fb275d66544f..d6a60fc95b7b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer should proccess it (Currently it is only used for grid visualisation, but this may change). */ - class PointArrayPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D : public BasePrimitive2D { private: /// the array of positions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx index 2bfeabf4305a..48acedc4613a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> @@ -52,7 +54,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive2D : public BasePrimitive2D { private: /// the hairline geometry @@ -99,7 +101,7 @@ namespace drawinglayer It will be decomposed to the needed PolygonHairlinePrimitive2D if not handled directly by a renderer. */ - class PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -161,7 +163,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled PolyPolygons for fat lines. */ - class PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -218,7 +220,7 @@ namespace drawinglayer This primitive defines a waveline based on a PolygonStrokePrimitive2D where the wave is defined by wave width and wave length. */ - class PolygonWavePrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D : public PolygonStrokePrimitive2D { private: /// wave definition @@ -274,7 +276,7 @@ namespace drawinglayer eventually by start and end definitions which are normally used for arrows. */ - class PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D { private: /// geometric definitions for line start and end diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 2ae5edbb1ea0..a8f046ddab6c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -52,7 +54,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonHairlinePrimitive2Ds. */ - class PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the hairline geometry @@ -98,7 +100,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonMarkerPrimitive2Ds. */ - class PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -154,7 +156,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokePrimitive2Ds. */ - class PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -212,7 +214,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokeArrowPrimitive2Ds. */ - class PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D { private: /// geometric definitions for line start and end @@ -268,7 +270,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolyPolygonColorPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D { private: /// the PolyPolygon geometry @@ -312,7 +314,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ - class PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -357,7 +359,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ - class PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -407,7 +409,7 @@ namespace drawinglayer (including transparence). The decomosition will create a MaskPrimitive2D containing a FillBitmapPrimitive2D. */ - class PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx index 3548b8971fd3..d8d1423da26c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date DiscreteUnit accessible using getDiscreteUnit() */ - class DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used fDiscreteUnit definitions for decomposition. Since this @@ -84,7 +86,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date Viewport accessible using getViewport() */ - class ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used Viewport definition for decomposition. Since this @@ -123,7 +125,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() */ - class ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation definition for decomposition. Since this @@ -163,7 +165,7 @@ namespace drawinglayer implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() and an object transformation via getObjectTransformation() */ - class ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation and the last ObjectTransformation diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx index 7d55725cc15f..2b67fd957ca9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -60,7 +62,7 @@ namespace drawinglayer This is the class a renderer may process directly when he wants to implement an own (e.g. system-specific) 3D renderer. */ - class ScenePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ScenePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the 3D geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index a74777d7a7e2..0779cbb3a4b2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -48,24 +50,24 @@ namespace drawinglayer namespace primitive2d { // helpers to create HitTestPrimitives Line - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon, const basegfx::B2DHomMatrix& rMatrix); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx index 0ae428a6fc22..8f5b479d8b7a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -53,7 +55,7 @@ namespace drawinglayer are needed for the shadow itself; all the local decompositions of the original geometry can be reused from the renderer for shadow visualisation. */ - class ShadowPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive2D : public GroupPrimitive2D { private: /// the shadow transformation, normally just an offset diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 58da9a51fa63..23970f580baa 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <vcl/pdfwriter.hxx> @@ -50,7 +52,7 @@ namespace drawinglayer If a renderer ignores this, it just decomposes to it's child content. */ - class StructureTagPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC StructureTagPrimitive2D : public GroupPrimitive2D { private: /// the PDF structure element this grouping represents diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 33d20ca4361c..57c6c748f21b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> @@ -56,7 +58,7 @@ namespace drawinglayer a TextSimplePortionPrimitive2D and all the contained decorations (if used) as geometry. */ - class TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D { private: /// decoration definitions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 7f00c04ed34d..6770ecb96b5d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -54,7 +56,7 @@ namespace drawinglayer also be used for any other primitives) which have some TextEffect applied and create the needed geometry and embedding on decomposition. */ - class TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the text (or other) content diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx index ce4616e7b0d4..8d3100bf7ff1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/vclenum.hxx> @@ -65,8 +67,8 @@ namespace drawinglayer }; /** helper to convert LineStyle */ - TextLine mapFontUnderlineToTextLine(FontUnderline eLineStyle); - FontUnderline mapTextLineToFontUnderline(TextLine eLineStyle); + TextLine DRAWINGLAYER_DLLPUBLIC mapFontUnderlineToTextLine(FontUnderline eLineStyle); + FontUnderline DRAWINGLAYER_DLLPUBLIC mapTextLineToFontUnderline(TextLine eLineStyle); /** FontStrikeout definition */ enum TextStrikeout @@ -80,8 +82,8 @@ namespace drawinglayer }; /** helper to convert FontStrikeout */ - TextStrikeout mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); - ::FontStrikeout mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); + TextStrikeout DRAWINGLAYER_DLLPUBLIC mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); + ::FontStrikeout DRAWINGLAYER_DLLPUBLIC mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); /** TextEmphasisMark definition */ enum TextEmphasisMark diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index d5370b85fbd2..bf9ed2c5e41f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <tools/string.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer This primitive encapsulates text lines. */ - class TextHierarchyLinePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyLinePrimitive2D : public GroupPrimitive2D { private: public: @@ -70,7 +72,7 @@ namespace drawinglayer This primitive encapsulates text bullets. */ - class TextHierarchyBulletPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBulletPrimitive2D : public GroupPrimitive2D { private: public: @@ -93,7 +95,7 @@ namespace drawinglayer This primitive encapsulates text paragraphs. */ - class TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D { private: public: @@ -116,7 +118,7 @@ namespace drawinglayer This primitive encapsulates text blocks. */ - class TextHierarchyBlockPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBlockPrimitive2D : public GroupPrimitive2D { private: public: @@ -157,7 +159,7 @@ namespace drawinglayer type. Also added is a String which is type-dependent. E.g. for URL fields, it contains the URL. */ - class TextHierarchyFieldPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyFieldPrimitive2D : public GroupPrimitive2D { private: FieldType meType; @@ -199,7 +201,7 @@ namespace drawinglayer content. To suppress, this primitive needs to be parsed by the renderer without taking any action. */ - class TextHierarchyEditPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyEditPrimitive2D : public GroupPrimitive2D { private: public: diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx index 64629d8bd2d1..1a3fa97bae73 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX #define INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <tools/solar.h> #include <tools/poly.hxx> @@ -67,7 +69,7 @@ namespace drawinglayer When in the future FontHandling may move to an own library independent from VCL, primitives will be prepared. */ - class TextLayouterDevice + class DRAWINGLAYER_DLLPUBLIC TextLayouterDevice { /// internally used VirtualDevice VirtualDevice& mrDevice; @@ -139,7 +141,7 @@ namespace drawinglayer both defines FontStretching, where no stretching happens at fFontScaleY == fFontScaleX */ - Font getVclFontFromFontAttribute( + Font DRAWINGLAYER_DLLPUBLIC getVclFontFromFontAttribute( const attribute::FontAttribute& rFontAttribute, double fFontScaleX, double fFontScaleY, @@ -151,7 +153,7 @@ namespace drawinglayer above) will be set in return parameter o_rSize to allow further processing */ - attribute::FontAttribute getFontAttributeFromVclFont( + attribute::FontAttribute DRAWINGLAYER_DLLPUBLIC getFontAttributeFromVclFont( basegfx::B2DVector& o_rSize, const Font& rFont, bool bRTL, diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx index 64249c83f164..08b184e7208c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -40,7 +42,7 @@ namespace drawinglayer { namespace primitive2d { - class TextLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx index bc80b888f2c2..c48f18b32c31 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/string.hxx> @@ -101,7 +103,7 @@ namespace drawinglayer @param rFontColor The font color to use */ - class TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// text transformation (FontCoordinateSystem) @@ -180,7 +182,7 @@ namespace drawinglayer }; /// small helper to have a compare operator for Locale - bool LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); + bool DRAWINGLAYER_DLLPUBLIC LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 674545ca5554..401b00176c0c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -42,7 +44,7 @@ namespace drawinglayer { namespace primitive2d { - class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions @@ -76,7 +78,7 @@ namespace drawinglayer { namespace primitive2d { - class TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: sal_Unicode maStrikeoutChar; @@ -117,7 +119,7 @@ namespace drawinglayer { namespace primitive2d { - class TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: double mfHeight; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx index 508d81cdbf28..8f2a7daafc4e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -57,7 +59,7 @@ namespace drawinglayer different, transformed states without the need to create those thousand primitive contents. */ - class TransformPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive2D : public GroupPrimitive2D { private: // the transformation to apply to the child geometry diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 7d96f336177c..f6141884dc9b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +58,7 @@ namespace drawinglayer rendering, not the transparent one. The transparent one should/will be clipped accordingly. */ - class TransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransparencePrimitive2D : public GroupPrimitive2D { private: /// The transparence-Mask who's RGB-Values are interpreted as Luminance diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 616aa48b82e2..94a95785638e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer regions of combined transparency, but be all rendered with the defined, single transparency. */ - class UnifiedTransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparencePrimitive2D : public GroupPrimitive2D { private: /// the unified transparence diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index b3cbbaa69235..aa0fb20e8e03 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <vcl/wall.hxx> @@ -52,7 +54,7 @@ namespace drawinglayer layouting which is dependent from WallpaperStyle; thus it does not need to be handled anywhere else in the future. */ - class WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D { private: basegfx::B2DRange maObjectRange; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index be5c6b3cad67..31ac1a7d7b80 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -54,7 +56,7 @@ namespace drawinglayer The geometric definition defines a line on the X-Axis (no Y-coordinates) which will when transformed by Transformation, create the coordinate data. */ - class WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index b80bd9d0a8ed..02c7eb598329 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive3D.hpp> @@ -83,7 +85,7 @@ namespace drawinglayer That's all for 3D! */ - class BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase @@ -148,7 +150,7 @@ namespace drawinglayer The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information */ - class BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive3D : public BasePrimitive3D { private: @@ -191,24 +193,24 @@ namespace drawinglayer namespace primitive3d { /// get B3DRange from a given Primitive3DReference - basegfx::B3DRange getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); /// get range3D from a given Primitive3DSequence - basegfx::B3DRange getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); /// compare two Primitive3DReferences for equality, uses arePrimitive3DReferencesEqual internally - bool arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); /// concatenate sequence - void appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); /// concatenate single Primitive3D - void appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index 6b2a3ba9c773..0c93b4295071 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +58,7 @@ namespace drawinglayer - HatchTexturePrimitive3D (for 3D hatch fill) - TransformPrimitive3D (for a transformation stack) */ - class GroupPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive3D : public BasePrimitive3D { private: /// the children. Declared private since this shall never be changed at all after construction diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index f2f88b56bda0..586a590d3d74 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/textureprimitive3d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer primitive has no default buffering, it is necessary here to add a local buffering mechanism for the decomposition */ - class HatchTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC HatchTexturePrimitive3D : public TexturePrimitive3D { private: /// the hatch definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index 8aec150e32b4..bb9ab4f1352d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +51,7 @@ namespace drawinglayer // decomposes to nothing, so no one not knowing it will be influenced. Only // helper processors for hit test (and maybe BoundRect extractors) will // use it and it's children subcontent. - class HiddenGeometryPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive3D : public GroupPrimitive3D { public: HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index b28dca4c445b..61e5123baf61 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer visualisation. Please see the ModifiedColorPrimitive2D description for more info. */ - class ModifiedColorPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive3D : public GroupPrimitive3D { private: /// The ColorModifier to use diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 1b92bced8258..bae55721ebdb 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/polygon/b3dpolygon.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer This is one of the non-decomposable 3D primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive3D : public BasePrimitive3D { private: /// the hairline geometry @@ -92,7 +94,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled Tubes for fat lines. */ - class PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D { private: /// the line geometry diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 7d5620305134..4666f3d61b1d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +54,7 @@ namespace drawinglayer 3D objects needed for the line tubes and the edge roundings in full 3D. */ - class PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D { private: /// hold the last decompositon since it's expensive diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 77050889b487..c9d6a650e9f3 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <drawinglayer/attribute/materialattribute3d.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer It is assumed here that the PolyPolgon is a single plane in 3D. */ - class PolyPolygonMaterialPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMaterialPrimitive3D : public BasePrimitive3D { private: /// the PolyPolygon geometry diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index bef18f7042c4..a63322b5e29a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -43,7 +45,7 @@ namespace drawinglayer The cube is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrCubePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrCubePrimitive3D : public SdrPrimitive3D { protected: /// local decomposition. diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 61a67dad1c44..512f1c5b6a91 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <vector> @@ -58,25 +60,25 @@ namespace drawinglayer namespace primitive3d { // #i98295# - basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); - void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); // #i98314# - void applyTextureTo3DGeometry( + void DRAWINGLAYER_DLLPUBLIC applyTextureTo3DGeometry( ::com::sun::star::drawing::TextureProjectionMode eModeX, ::com::sun::star::drawing::TextureProjectionMode eModeY, ::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange, const basegfx::B2DVector& rTextureSize); - Primitive3DSequence create3DPolyPolygonLinePrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonLinePrimitives( const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine); - Primitive3DSequence create3DPolyPolygonFillPrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonFillPrimitives( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, @@ -84,12 +86,12 @@ namespace drawinglayer const attribute::SdrFillAttribute& rFill, const attribute::FillGradientAttribute& rFillGradient); - Primitive3DSequence createShadowPrimitive3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createShadowPrimitive3D( const Primitive3DSequence& rSource, const attribute::SdrShadowAttribute& rShadow, bool bShadow3D); - Primitive3DSequence createHiddenGeometryPrimitives3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives3D( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 7dfb986d0a0d..bf72befcd0bc 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <vector> @@ -55,7 +57,7 @@ namespace drawinglayer }; /// class to hold one Slice3D - class Slice3D + class DRAWINGLAYER_DLLPUBLIC Slice3D { protected: basegfx::B3DPolyPolygon maPolyPolygon; @@ -89,7 +91,7 @@ namespace drawinglayer typedef ::std::vector< Slice3D > Slice3DVector; /// helpers for creation - void createLatheSlices( + void DRAWINGLAYER_DLLPUBLIC createLatheSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -100,7 +102,7 @@ namespace drawinglayer bool bCloseFront, bool bCloseBack); - void createExtrudeSlices( + void DRAWINGLAYER_DLLPUBLIC createExtrudeSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -111,10 +113,10 @@ namespace drawinglayer bool bCloseBack); /// helpers for geometry extraction - basegfx::B3DPolyPolygon extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); - basegfx::B3DPolyPolygon extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); - void extractPlanesFromSlice( + void DRAWINGLAYER_DLLPUBLIC extractPlanesFromSlice( ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, bool bCreateNormals, @@ -127,7 +129,7 @@ namespace drawinglayer bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform); - void createReducedOutlines( + void DRAWINGLAYER_DLLPUBLIC createReducedOutlines( const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B3DPolygon& rLoopA, diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 06f881a7f260..22ab9b358416 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrExtrudePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrExtrudePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index b4e4f18c10aa..aa21580d364f 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrLathePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrLathePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 71f868b468aa..450b6a7ec61a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer The decomposition will include all needed 3D data for visualisation, including FatLines and fill styles. */ - class SdrPolyPolygonPrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPolyPolygonPrimitive3D : public SdrPrimitive3D { private: /// the planar polyPolygon evtl with normals and texture coordinates diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index 26d5efda687b..0f3b66fb6308 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> @@ -48,7 +50,7 @@ namespace drawinglayer */ namespace primitive3d { - class SdrPrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPrimitive3D : public BufferedDecompositionPrimitive3D { private: /// object surface attributes diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index a2ec5e5f7c46..919cbefd5a33 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -43,7 +45,7 @@ namespace drawinglayer The sphere is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrSpherePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrSpherePrimitive3D : public SdrPrimitive3D { private: /// additional geometry definitions diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index 26ac8dcd6739..d72e83493267 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +51,7 @@ namespace drawinglayer combined with the scene and camera definition to create the correct projected shadow 2D-Polygons. */ - class ShadowPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive3D : public GroupPrimitive3D { protected: /// 2D shadow definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 0eb6a6a3844e..8c816733d36c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer 3d geometry by embedding it. It is used as bae class for extended texture definitions */ - class TexturePrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TexturePrimitive3D : public GroupPrimitive3D { private: /// texture geometry definition @@ -91,7 +93,7 @@ namespace drawinglayer transparence texture definition. All 3D primitives embedded here will be shown with the given transparency. */ - class UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D { private: /// transparency definition @@ -133,7 +135,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined gradient. */ - class GradientTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GradientTexturePrimitive3D : public TexturePrimitive3D { private: /// the gradient definition @@ -172,7 +174,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined bitmap (maybe tiled if defined). */ - class BitmapTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BitmapTexturePrimitive3D : public TexturePrimitive3D { private: /// bitmap fill attribute @@ -212,7 +214,7 @@ namespace drawinglayer that gradient will be interpreted as luminance Transparence-Values. All 3D primitives embedded here will be shown with the defined transparence. */ - class TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D { public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index 544fb0b2690e..d559fab5048c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer Please see the description for TransformPrimitive2D since these primitives are pretty similar. */ - class TransformPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive3D : public GroupPrimitive3D { private: // the 3D transformation to apply diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx index 8721e0262914..bbe54c03a6dd 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -160,7 +162,7 @@ namespace drawinglayer be helpful to add many for the purpose not interesting higher level primitives to not force their decomposition to be created and/or parsed. */ - class BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor2D { private: /// The ViewInformation2D itself. It's private to isolate accesses to it @@ -198,44 +200,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -namespace drawinglayer -{ - namespace processor2d - { - /** CollectingProcessor2D class - - A processor which just collects all primitives given to it in - process(..) calls to maPrimitive2DSequence. This can e.g. be used to - hand around as instance over various methods where every called - method can add graphic content to it. - */ - class CollectingProcessor2D : public BaseProcessor2D - { - private: - primitive2d::Primitive2DSequence maPrimitive2DSequence; - - public: - CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation); - virtual ~CollectingProcessor2D(); - - /// the central processing method - virtual void process(const primitive2d::Primitive2DSequence& rSource); - - /// helpers for adding to local sequence - void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource) - { - primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource); - } - - /// data access and reset - const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } - void reset() { maPrimitive2DSequence = primitive2d::Primitive2DSequence(); } - }; - } // end of namespace processor2d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX // eof diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index 0cf9549b6b6a..4dedb400d563 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx @@ -29,6 +29,8 @@ #ifndef _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX #define _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -75,7 +77,7 @@ namespace drawinglayer A basic implementation of a renderer for com::sun::star::rendering::XCanvas as a target */ - class canvasProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D { private: // The Pixel renderer resets the original MapMode from the OutputDevice. diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx index cff47b664ad3..e0b95eb6c450 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -44,7 +46,7 @@ namespace drawinglayer A processor who extracts the contour of the primtives feeded to it in the single local PolyPolygon */ - class ContourExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC ContourExtractor2D : public BaseProcessor2D { private: /// the extracted contour diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx index 7056392860ff..96da21a9b6d3 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +51,7 @@ namespace drawinglayer This processor implements a HitTest with the feeded primitives, given tolerance and extras */ - class HitTestProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC HitTestProcessor2D : public BaseProcessor2D { private: /// discrete HitTest position diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx index d750531e905a..66c0a52021ce 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -43,7 +45,7 @@ namespace drawinglayer This processor can extract the line geometry from feeded primpitives. The hairlines and the fille geometry from fat lines are separated. */ - class LineGeometryExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D : public BaseProcessor2D { private: std::vector< basegfx::B2DPolygon > maExtractedHairlines; diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 522f3ec1136d..3dbb9d17a0a5 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/color/bcolor.hxx> @@ -73,7 +75,7 @@ namespace drawinglayer This processor extracts text in the feeded primitives to filled polygons */ - class TextAsPolygonExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC TextAsPolygonExtractor2D : public BaseProcessor2D { private: // extraction target diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx index bb7d9537da9b..b28b1da17519 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -76,7 +78,7 @@ namespace drawinglayer and the extra-data added to it (which can be seen mostly as 'extensions' or simply as 'hacks'). */ - class VclMetafileProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclMetafileProcessor2D : public VclProcessor2D { private: /// local helper(s) diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx index 273a3b82d392..8ee535ac652d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <vcl/outdev.hxx> @@ -44,7 +46,7 @@ namespace drawinglayer all feeded primitives to a VCL Window. It is the currently used renderer for all VCL editing output from the DrawingLayer. */ - class VclPixelProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D { private: /* The Pixel renderer resets the original MapMode from the OutputDevice. diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx index ef288f047ed6..fe615f3a4cb6 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -72,7 +74,7 @@ namespace drawinglayer This processor is the base class for VCL-Based processors. It has no processBasePrimitive2D implementation and thus is not usable directly. */ - class VclProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclProcessor2D : public BaseProcessor2D { protected: // the destination OutDev diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx index 4cd1242ddb29..d021236f391d 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer Please have a look at baseprocessor2d.hxx for more comments. */ - class BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor3D { private: geometry::ViewInformation3D maViewInformation3D; @@ -88,7 +90,7 @@ namespace drawinglayer hand around as instance over various methods where every called method can add graphic content to it. */ - class CollectingProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CollectingProcessor3D : public BaseProcessor3D { private: primitive3d::Primitive3DSequence maPrimitive3DSequence; diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx index f8f62fab74ce..ad66dcbb9bd3 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/defaultprocessor3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +44,7 @@ namespace drawinglayer This processor extracts all cuts of 3D plane geometries in the feeded primitives with the given cut vector, based on the ViewInformation3D given. */ - class CutFindProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CutFindProcessor : public BaseProcessor3D { private: /// the start and stop point for the cut vector diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx index 178e9f02a82b..be3278f0e167 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> @@ -78,7 +80,7 @@ namespace drawinglayer rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to e.g. base a Z-Buffer supported renderer on the 3D primitive processing. */ - class DefaultProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC DefaultProcessor3D : public BaseProcessor3D { protected: /// read-only scene infos (normal handling, etc...) diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx index 3712a57a1bca..91131a92a0a7 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -47,7 +49,7 @@ namespace drawinglayer It is e.g. used as sub-processor for contour extraction where 3D geometry is only useful as 2D projected geometry. */ - class Geometry2DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Geometry2DExtractingProcessor : public BaseProcessor3D { private: /// result holding vector (2D) diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx index 98f18b8d78ac..f245d93caeab 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -52,7 +54,7 @@ namespace drawinglayer some data to do so since we do not only offer flat projected 2D shadow, but also projections dependent on the light source */ - class Shadow3DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Shadow3DExtractingProcessor : public BaseProcessor3D { private: /// typedef for data handling diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx index 6d2a806ce630..d070e9d643d8 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/defaultprocessor3d.hxx> #include <vcl/bitmapex.hxx> @@ -65,7 +67,7 @@ namespace drawinglayer raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. */ - class ZBufferProcessor3D : public DefaultProcessor3D + class DRAWINGLAYER_DLLPUBLIC ZBufferProcessor3D : public DefaultProcessor3D { private: /// the raster target, a Z-Buffer diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx index 92040af2f65a..27117ded3412 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolor.hxx> @@ -40,7 +42,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvx { public: GeoTexSvx(); @@ -64,7 +66,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradient : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx { protected: basegfx::ODFGradientInfo maGradientInfo; @@ -100,7 +102,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientLinear : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient { public: GeoTexSvxGradientLinear(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -119,7 +121,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientAxial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient { public: GeoTexSvxGradientAxial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -138,7 +140,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRadial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRadial : public GeoTexSvxGradient { public: GeoTexSvxGradientRadial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY); @@ -157,7 +159,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientElliptical : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientElliptical : public GeoTexSvxGradient { public: GeoTexSvxGradientElliptical(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -176,7 +178,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientSquare : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientSquare : public GeoTexSvxGradient { public: GeoTexSvxGradientSquare(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -195,7 +197,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRect : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRect : public GeoTexSvxGradient { public: GeoTexSvxGradientRect(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -214,7 +216,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx { protected: basegfx::B2DHomMatrix maTextureTransform; @@ -242,7 +244,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxTiled : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled : public GeoTexSvx { protected: basegfx::B2DPoint maTopLeft; diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx index cd3cd09286a8..258653c97191 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/texture/texture.hxx> #include <vcl/bitmap.hxx> @@ -45,7 +47,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMono : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono : public GeoTexSvx { protected: basegfx::BColor maSingleColor; @@ -68,7 +70,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmap : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmap : public GeoTexSvx { protected: Bitmap maBitmap; @@ -96,7 +98,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmapTiled : public GeoTexSvxBitmap + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapTiled : public GeoTexSvxBitmap { protected: // helpers @@ -132,7 +134,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMultiHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch : public GeoTexSvx { protected: basegfx::BColor maColor; diff --git a/drawinglayer/inc/makefile.mk b/drawinglayer/inc/makefile.mk deleted file mode 100755 index ebfd7269391c..000000000000 --- a/drawinglayer/inc/makefile.mk +++ /dev/null @@ -1,47 +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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=drawinglayer -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst index d685c262e337..73993b99e5ee 100644 --- a/drawinglayer/prj/build.lst +++ b/drawinglayer/prj/build.lst @@ -1,13 +1,4 @@ dl drawinglayer : sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL dl drawinglayer usr1 - all dl_mkout NULL -dl drawinglayer\inc nmake - all dl_inc NULL -dl drawinglayer\prj get - all dl_prj NULL -dl drawinglayer\source\primitive2d nmake - all dl_primitive2d dl_inc NULL -dl drawinglayer\source\primitive3d nmake - all dl_primitive3d dl_inc NULL -dl drawinglayer\source\animation nmake - all dl_animation dl_inc NULL -dl drawinglayer\source\geometry nmake - all dl_geometry dl_inc NULL -dl drawinglayer\source\processor2d nmake - all dl_processor2d dl_inc NULL -dl drawinglayer\source\processor3d nmake - all dl_processor3d dl_inc NULL -dl drawinglayer\source\attribute nmake - all dl_attribute dl_inc NULL -dl drawinglayer\source\texture nmake - all dl_texture dl_inc NULL -dl drawinglayer\util nmake - all dl_util dl_primitive2d dl_primitive3d dl_animation dl_geometry dl_processor2d dl_processor3d dl_attribute dl_texture NULL +dl drawinglayer\prj nmake - all dl_prj NULL + diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst index 2aa924663fa3..e8c0ccc6e5c4 100644 --- a/drawinglayer/prj/d.lst +++ b/drawinglayer/prj/d.lst @@ -1,123 +1,2 @@ -..\%__SRC%\lib\idrawinglayer.lib %_DEST%\lib%_EXT%\idrawinglayer.lib -..\%__SRC%\bin\drawingl*.dll %_DEST%\bin%_EXT%\drawingl*.dll -..\%__SRC%\lib\libdrawinglayer?????.* %_DEST%\lib%_EXT%\libdrawinglayer?????.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -mkdir: %_DEST%\inc%_EXT%\drawinglayer - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive2d -..\inc\drawinglayer\primitive2d\drawinglayer_primitivetypes2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\drawinglayer_primitivetypes2d.hxx -..\inc\drawinglayer\primitive2d\transparenceprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\transparenceprimitive2d.hxx -..\inc\drawinglayer\primitive2d\animatedprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\animatedprimitive2d.hxx -..\inc\drawinglayer\primitive2d\backgroundcolorprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\backgroundcolorprimitive2d.hxx -..\inc\drawinglayer\primitive2d\baseprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\baseprimitive2d.hxx -..\inc\drawinglayer\primitive2d\bitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\bitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx -..\inc\drawinglayer\primitive2d\borderlineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\borderlineprimitive2d.hxx -..\inc\drawinglayer\primitive2d\clippedborderlineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\clippedborderlineprimitive2d.hxx -..\inc\drawinglayer\primitive2d\chartprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\chartprimitive2d.hxx -..\inc\drawinglayer\primitive2d\controlprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\controlprimitive2d.hxx -..\inc\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx -..\inc\drawinglayer\primitive2d\embedded3dprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\embedded3dprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillgradientprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillgradientprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillhatchprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillhatchprimitive2d.hxx -..\inc\drawinglayer\primitive2d\graphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\graphicprimitive2d.hxx -..\inc\drawinglayer\primitive2d\gridprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\gridprimitive2d.hxx -..\inc\drawinglayer\primitive2d\groupprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\groupprimitive2d.hxx -..\inc\drawinglayer\primitive2d\helplineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\helplineprimitive2d.hxx -..\inc\drawinglayer\primitive2d\hiddengeometryprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\hiddengeometryprimitive2d.hxx -..\inc\drawinglayer\primitive2d\invertprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\invertprimitive2d.hxx -..\inc\drawinglayer\primitive2d\markerarrayprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\markerarrayprimitive2d.hxx -..\inc\drawinglayer\primitive2d\maskprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\maskprimitive2d.hxx -..\inc\drawinglayer\primitive2d\mediaprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\mediaprimitive2d.hxx -..\inc\drawinglayer\primitive2d\metafileprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\metafileprimitive2d.hxx -..\inc\drawinglayer\primitive2d\modifiedcolorprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\modifiedcolorprimitive2d.hxx -..\inc\drawinglayer\primitive2d\pagepreviewprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\pagepreviewprimitive2d.hxx -..\inc\drawinglayer\primitive2d\pointarrayprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\pointarrayprimitive2d.hxx -..\inc\drawinglayer\primitive2d\polygonprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\polygonprimitive2d.hxx -..\inc\drawinglayer\primitive2d\polypolygonprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\polypolygonprimitive2d.hxx -..\inc\drawinglayer\primitive2d\primitivetools2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\primitivetools2d.hxx -..\inc\drawinglayer\primitive2d\sdrdecompositiontools2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\sdrdecompositiontools2d.hxx -..\inc\drawinglayer\primitive2d\sceneprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\sceneprimitive2d.hxx -..\inc\drawinglayer\primitive2d\shadowprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\shadowprimitive2d.hxx -..\inc\drawinglayer\primitive2d\structuretagprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\structuretagprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textenumsprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textenumsprimitive2d.hxx -..\inc\drawinglayer\primitive2d\texteffectprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\texteffectprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textlayoutdevice.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textlayoutdevice.hxx -..\inc\drawinglayer\primitive2d\textprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textdecoratedprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textdecoratedprimitive2d.hxx -..\inc\drawinglayer\primitive2d\texthierarchyprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\texthierarchyprimitive2d.hxx -..\inc\drawinglayer\primitive2d\transformprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\transformprimitive2d.hxx -..\inc\drawinglayer\primitive2d\unifiedtransparenceprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\unifiedtransparenceprimitive2d.hxx -..\inc\drawinglayer\primitive2d\wrongspellprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\wrongspellprimitive2d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive3d -..\inc\drawinglayer\primitive3d\drawinglayer_primitivetypes3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\drawinglayer_primitivetypes3d.hxx -..\inc\drawinglayer\primitive3d\baseprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\baseprimitive3d.hxx -..\inc\drawinglayer\primitive3d\groupprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\groupprimitive3d.hxx -..\inc\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx -..\inc\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polygontubeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygontubeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polypolygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polypolygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrcubeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrcubeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrdecompositiontools3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrdecompositiontools3d.hxx -..\inc\drawinglayer\primitive3d\sdrextrudelathetools3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrextrudelathetools3d.hxx -..\inc\drawinglayer\primitive3d\sdrextrudeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrextrudeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrlatheprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrlatheprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrpolypolygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrpolypolygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrsphereprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrsphereprimitive3d.hxx -..\inc\drawinglayer\primitive3d\shadowprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\shadowprimitive3d.hxx -..\inc\drawinglayer\primitive3d\textureprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\textureprimitive3d.hxx -..\inc\drawinglayer\primitive3d\transformprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\transformprimitive3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\animation -..\inc\drawinglayer\animation\animationtiming.hxx %_DEST%\inc%_EXT%\drawinglayer\animation\animationtiming.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\geometry -..\inc\drawinglayer\geometry\viewinformation2d.hxx %_DEST%\inc%_EXT%\drawinglayer\geometry\viewinformation2d.hxx -..\inc\drawinglayer\geometry\viewinformation3d.hxx %_DEST%\inc%_EXT%\drawinglayer\geometry\viewinformation3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor2d -..\inc\drawinglayer\processor2d\baseprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\baseprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclpixelprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclpixelprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclmetafileprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclmetafileprocessor2d.hxx -..\inc\drawinglayer\processor2d\canvasprocessor.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\canvasprocessor.hxx -..\inc\drawinglayer\processor2d\contourextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\contourextractor2d.hxx -..\inc\drawinglayer\processor2d\linegeometryextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\linegeometryextractor2d.hxx -..\inc\drawinglayer\processor2d\hittestprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\hittestprocessor2d.hxx -..\inc\drawinglayer\processor2d\textaspolygonextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\textaspolygonextractor2d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor3d -..\inc\drawinglayer\processor3d\baseprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\baseprocessor3d.hxx -..\inc\drawinglayer\processor3d\cutfindprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\cutfindprocessor3d.hxx -..\inc\drawinglayer\processor3d\defaultprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\defaultprocessor3d.hxx -..\inc\drawinglayer\processor3d\zbufferprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\zbufferprocessor3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\attribute -..\inc\drawinglayer\attribute\fillgradientattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillgradientattribute.hxx -..\inc\drawinglayer\attribute\fillhatchattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillhatchattribute.hxx -..\inc\drawinglayer\attribute\fillbitmapattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillbitmapattribute.hxx -..\inc\drawinglayer\attribute\fontattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fontattribute.hxx -..\inc\drawinglayer\attribute\materialattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\materialattribute3d.hxx -..\inc\drawinglayer\attribute\sdrallattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrallattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlineattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlineattribute.hxx -..\inc\drawinglayer\attribute\sdrlinestartendattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlinestartendattribute.hxx -..\inc\drawinglayer\attribute\sdrshadowattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrshadowattribute.hxx -..\inc\drawinglayer\attribute\sdrfillattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrfillattribute.hxx -..\inc\drawinglayer\attribute\sdrobjectattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrobjectattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlightattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlightattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlightingattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlightingattribute3d.hxx -..\inc\drawinglayer\attribute\sdrsceneattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrsceneattribute3d.hxx -..\inc\drawinglayer\attribute\sdrfillbitmapattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrfillbitmapattribute.hxx -..\inc\drawinglayer\attribute\strokeattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\strokeattribute.hxx -..\inc\drawinglayer\attribute\lineattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\lineattribute.hxx -..\inc\drawinglayer\attribute\linestartendattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\linestartendattribute.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\texture -..\inc\drawinglayer\texture\texture.hxx %_DEST%\inc%_EXT%\drawinglayer\texture\texture.hxx +..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file diff --git a/drawinglayer/source/animation/makefile.mk b/drawinglayer/prj/makefile.mk index 07f64fab65e2..e312a7ccab65 100755 --- a/drawinglayer/source/animation/makefile.mk +++ b/drawinglayer/prj/makefile.mk @@ -25,20 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=animation -ENABLE_EXCEPTIONS=TRUE +PRJ=.. +TARGET=prj -# --- Settings ---------------------------------- +.INCLUDE : settings.mk -.INCLUDE : settings.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/animationtiming.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/drawinglayer/source/attribute/makefile.mk b/drawinglayer/source/attribute/makefile.mk deleted file mode 100755 index 32cef7c7b49c..000000000000 --- a/drawinglayer/source/attribute/makefile.mk +++ /dev/null @@ -1,61 +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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=attribute -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/fillgradientattribute.obj \ - $(SLO)$/fillhatchattribute.obj \ - $(SLO)$/fillbitmapattribute.obj \ - $(SLO)$/fontattribute.obj \ - $(SLO)$/materialattribute3d.obj \ - $(SLO)$/sdrallattribute3d.obj \ - $(SLO)$/sdrlineattribute.obj \ - $(SLO)$/sdrlinestartendattribute.obj \ - $(SLO)$/sdrshadowattribute.obj \ - $(SLO)$/sdrfillattribute.obj \ - $(SLO)$/sdrobjectattribute3d.obj \ - $(SLO)$/sdrlightattribute3d.obj \ - $(SLO)$/sdrlightingattribute3d.obj \ - $(SLO)$/sdrsceneattribute3d.obj \ - $(SLO)$/sdrfillbitmapattribute.obj \ - $(SLO)$/lineattribute.obj \ - $(SLO)$/linestartendattribute.obj \ - $(SLO)$/strokeattribute.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index 8d8d757491ca..b399b98e33ba 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer Primitive2DSequence xRetval; const GDIMetaFile& rSubstituteContent = getMetaFile(); - if(rSubstituteContent.GetActionCount()) + if( rSubstituteContent.GetActionSize() ) { // the default decomposition will use the Metafile replacement visualisation. // To really use the Eps data, a renderer has to know and interpret this primitive diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk deleted file mode 100755 index 039be2c690b5..000000000000 --- a/drawinglayer/source/primitive2d/makefile.mk +++ /dev/null @@ -1,92 +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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=primitive2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/transparenceprimitive2d.obj \ - $(SLO)$/animatedprimitive2d.obj \ - $(SLO)$/baseprimitive2d.obj \ - $(SLO)$/backgroundcolorprimitive2d.obj \ - $(SLO)$/bitmapprimitive2d.obj \ - $(SLO)$/rendergraphicprimitive2d.obj \ - $(SLO)$/borderlineprimitive2d.obj \ - $(SLO)$/clippedborderlineprimitive2d.obj \ - $(SLO)$/chartprimitive2d.obj \ - $(SLO)$/controlprimitive2d.obj \ - $(SLO)$/discretebitmapprimitive2d.obj \ - $(SLO)$/discreteshadowprimitive2d.obj \ - $(SLO)$/embedded3dprimitive2d.obj \ - $(SLO)$/epsprimitive2d.obj \ - $(SLO)$/fillbitmapprimitive2d.obj \ - $(SLO)$/fillgradientprimitive2d.obj \ - $(SLO)$/fillhatchprimitive2d.obj \ - $(SLO)$/graphicprimitive2d.obj \ - $(SLO)$/gridprimitive2d.obj \ - $(SLO)$/groupprimitive2d.obj \ - $(SLO)$/helplineprimitive2d.obj \ - $(SLO)$/hiddengeometryprimitive2d.obj \ - $(SLO)$/invertprimitive2d.obj \ - $(SLO)$/markerarrayprimitive2d.obj \ - $(SLO)$/pointarrayprimitive2d.obj \ - $(SLO)$/maskprimitive2d.obj \ - $(SLO)$/mediaprimitive2d.obj \ - $(SLO)$/metafileprimitive2d.obj \ - $(SLO)$/modifiedcolorprimitive2d.obj \ - $(SLO)$/pagepreviewprimitive2d.obj \ - $(SLO)$/polypolygonprimitive2d.obj \ - $(SLO)$/polygonprimitive2d.obj \ - $(SLO)$/primitivetools2d.obj \ - $(SLO)$/sceneprimitive2d.obj \ - $(SLO)$/sdrdecompositiontools2d.obj \ - $(SLO)$/shadowprimitive2d.obj \ - $(SLO)$/structuretagprimitive2d.obj \ - $(SLO)$/texteffectprimitive2d.obj \ - $(SLO)$/textenumsprimitive2d.obj \ - $(SLO)$/textlayoutdevice.obj \ - $(SLO)$/textlineprimitive2d.obj \ - $(SLO)$/textprimitive2d.obj \ - $(SLO)$/textstrikeoutprimitive2d.obj \ - $(SLO)$/textdecoratedprimitive2d.obj \ - $(SLO)$/texthierarchyprimitive2d.obj \ - $(SLO)$/transformprimitive2d.obj \ - $(SLO)$/unifiedtransparenceprimitive2d.obj \ - $(SLO)$/wallpaperprimitive2d.obj \ - $(SLO)$/wrongspellprimitive2d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 79754917f4ee..9b35f8109ddb 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -366,7 +366,7 @@ namespace ~PropertyHolders() { - while(maPropertyHolders.size()) + while(!maPropertyHolders.empty()) { delete maPropertyHolders.back(); maPropertyHolders.pop_back(); @@ -528,7 +528,7 @@ namespace void Pop() { OSL_ENSURE(maTargetHolders.size(), "TargetHolders: POP with no property holders (!)"); - if(maTargetHolders.size()) + if(!maTargetHolders.empty()) { delete maTargetHolders.back(); maTargetHolders.pop_back(); @@ -543,7 +543,7 @@ namespace ~TargetHolders() { - while(maTargetHolders.size()) + while(!maTargetHolders.empty()) { delete maTargetHolders.back(); maTargetHolders.pop_back(); @@ -633,7 +633,7 @@ namespace PropertyHolder& rProperties, basegfx::BColor aBColor) { - if(rPositions.size()) + if(!rPositions.empty()) { if(rProperties.getTransformation().isIdentity()) { @@ -1590,7 +1590,7 @@ namespace } } - if(aTargetVector.size()) + if(!aTargetVector.empty()) { // add created text primitive to target if(rProperty.getTransformation().isIdentity()) @@ -1663,9 +1663,9 @@ namespace PropertyHolders& rPropertyHolders, const drawinglayer::geometry::ViewInformation2D& rViewInformation) { - const sal_uInt32 nCount(rMetaFile.GetActionCount()); + const size_t nCount(rMetaFile.GetActionSize()); - for(sal_uInt32 nAction(0); nAction < nCount; nAction++) + for(size_t nAction(0); nAction < nCount; nAction++) { MetaAction* pAction = rMetaFile.GetAction(nAction); @@ -1688,7 +1688,7 @@ namespace if(pA->GetColor() != aLastColor) { - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor()); aPositions.clear(); @@ -1704,7 +1704,7 @@ namespace nAction--; - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor()); } @@ -1728,7 +1728,7 @@ namespace nAction--; - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), rPropertyHolders.Current().getLineColor()); } @@ -2141,7 +2141,7 @@ namespace aTextLayouterDevice.addTextRectActions( rRectangle, pA->GetText(), pA->GetStyle(), aGDIMetaFile); - if(aGDIMetaFile.GetActionCount()) + if(aGDIMetaFile.GetActionSize()) { // cerate sub-content drawinglayer::primitive2d::Primitive2DSequence xSubContent; @@ -2981,7 +2981,7 @@ namespace { const GDIMetaFile& rContent = pA->GetGDIMetaFile(); - if(rContent.GetActionCount()) + if(rContent.GetActionSize()) { // create the sub-content with no embedding specific to the // sub-metafile, this seems not to be used. diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 62f10135aa3a..330d597ba700 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -30,6 +30,8 @@ #include "precompiled_drawinglayer.hxx" #include <drawinglayer/primitive2d/textlayoutdevice.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/scoped_disposing_ptr.hxx> #include <vcl/timer.hxx> #include <vcl/virdev.hxx> #include <vcl/font.hxx> @@ -43,14 +45,33 @@ namespace { + class ImpTimedRefDev; + + //the scoped_timed_RefDev owns a ImpTimeRefDev and releases it on dtor + //or disposing of the default XComponentContext which causes the underlying + //OutputDevice to get released + // + //The ImpTimerRefDev itself, if the timeout ever gets hit, will call + //reset on the scoped_timed_RefDev to release the ImpTimerRefDev early + //if its unused for a few minutes + class scoped_timed_RefDev : public comphelper::scoped_disposing_ptr<ImpTimedRefDev> + { + public: + scoped_timed_RefDev() : comphelper::scoped_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW))) + { + } + }; + + class the_scoped_timed_RefDev : public rtl::Static<scoped_timed_RefDev, the_scoped_timed_RefDev> {}; + class ImpTimedRefDev : public Timer { - ImpTimedRefDev** mppStaticPointerOnMe; + scoped_timed_RefDev& mrOwnerOfMe; VirtualDevice* mpVirDev; sal_uInt32 mnUseCount; public: - ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe); + ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe); ~ImpTimedRefDev(); virtual void Timeout(); @@ -58,8 +79,8 @@ namespace void releaseVirtualDevice(); }; - ImpTimedRefDev::ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe) - : mppStaticPointerOnMe(ppStaticPointerOnMe), + ImpTimedRefDev::ImpTimedRefDev(scoped_timed_RefDev& rOwnerOfMe) + : mrOwnerOfMe(rOwnerOfMe), mpVirDev(0L), mnUseCount(0L) { @@ -70,22 +91,13 @@ namespace ImpTimedRefDev::~ImpTimedRefDev() { OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); - - if(mppStaticPointerOnMe && *mppStaticPointerOnMe) - { - *mppStaticPointerOnMe = 0L; - } - - if(mpVirDev) - { - delete mpVirDev; - } + delete mpVirDev; } void ImpTimedRefDev::Timeout() { // for obvious reasons, do not call anything after this - delete (this); + mrOwnerOfMe.reset(); } VirtualDevice& ImpTimedRefDev::acquireVirtualDevice() @@ -125,24 +137,23 @@ namespace drawinglayer { namespace primitive2d { - // static pointer here - static ImpTimedRefDev* pImpGlobalRefDev = 0L; - // static methods here VirtualDevice& acquireGlobalVirtualDevice() { - if(!pImpGlobalRefDev) - { - pImpGlobalRefDev = new ImpTimedRefDev(&pImpGlobalRefDev); - } + scoped_timed_RefDev& rStdRefDevice = the_scoped_timed_RefDev::get(); - return pImpGlobalRefDev->acquireVirtualDevice(); + if(!rStdRefDevice) + rStdRefDevice.reset(new ImpTimedRefDev(rStdRefDevice)); + + return rStdRefDevice->acquireVirtualDevice(); } void releaseGlobalVirtualDevice() { - OSL_ENSURE(pImpGlobalRefDev, "releaseGlobalVirtualDevice() without prior acquireGlobalVirtualDevice() call(!)"); - pImpGlobalRefDev->releaseVirtualDevice(); + scoped_timed_RefDev& rStdRefDevice = the_scoped_timed_RefDev::get(); + + OSL_ENSURE(rStdRefDevice, "releaseGlobalVirtualDevice() without prior acquireGlobalVirtualDevice() call(!)"); + rStdRefDevice->releaseVirtualDevice(); } TextLayouterDevice::TextLayouterDevice() @@ -347,13 +358,9 @@ namespace drawinglayer if(nTextLength) { aRetval.reserve(nTextLength); - sal_Int32* pArray = new sal_Int32[nTextLength]; - mrDevice.GetTextArray(rText, pArray, nIndex, nLength); - - for(sal_uInt32 a(0); a < nTextLength; a++) - { - aRetval.push_back(pArray[a]); - } + ::std::vector<sal_Int32> aArray(nTextLength); + mrDevice.GetTextArray(rText, &aArray[0], nIndex, nLength); + aRetval.assign(aArray.begin(), aArray.end()); } return aRetval; diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index e928f8326126..b830f8fc01c9 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -254,7 +254,7 @@ namespace drawinglayer mbFilled(bFilled), mnWidthToFill(nWidthToFill) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 const xub_StrLen aStringLength(getText().Len()); OSL_ENSURE(aStringLength >= getTextPosition() && aStringLength >= getTextPosition() + getTextLength(), "TextSimplePortionPrimitive2D with text out of range (!)"); diff --git a/drawinglayer/source/primitive3d/makefile.mk b/drawinglayer/source/primitive3d/makefile.mk deleted file mode 100755 index afad990c0e28..000000000000 --- a/drawinglayer/source/primitive3d/makefile.mk +++ /dev/null @@ -1,62 +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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=primitive3d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprimitive3d.obj \ - $(SLO)$/groupprimitive3d.obj \ - $(SLO)$/hatchtextureprimitive3d.obj \ - $(SLO)$/hiddengeometryprimitive3d.obj \ - $(SLO)$/modifiedcolorprimitive3d.obj \ - $(SLO)$/polypolygonprimitive3d.obj \ - $(SLO)$/polygonprimitive3d.obj \ - $(SLO)$/polygontubeprimitive3d.obj \ - $(SLO)$/sdrcubeprimitive3d.obj \ - $(SLO)$/sdrdecompositiontools3d.obj \ - $(SLO)$/sdrextrudelathetools3d.obj \ - $(SLO)$/sdrextrudeprimitive3d.obj \ - $(SLO)$/sdrlatheprimitive3d.obj \ - $(SLO)$/sdrpolypolygonprimitive3d.obj \ - $(SLO)$/sdrprimitive3d.obj \ - $(SLO)$/sdrsphereprimitive3d.obj \ - $(SLO)$/shadowprimitive3d.obj \ - $(SLO)$/textureprimitive3d.obj \ - $(SLO)$/transformprimitive3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk deleted file mode 100755 index ec7b8aef647b..000000000000 --- a/drawinglayer/source/processor2d/makefile.mk +++ /dev/null @@ -1,58 +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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=processor2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprocessor2d.obj \ - $(SLO)$/vclhelpergradient.obj \ - $(SLO)$/vclhelperbitmaptransform.obj \ - $(SLO)$/vclhelperbitmaprender.obj \ - $(SLO)$/vclhelperbufferdevice.obj \ - $(SLO)$/vclprocessor2d.obj \ - $(SLO)$/helperchartrenderer.obj \ - $(SLO)$/helperwrongspellrenderer.obj \ - $(SLO)$/vclpixelprocessor2d.obj \ - $(SLO)$/vclmetafileprocessor2d.obj \ - $(SLO)$/contourextractor2d.obj \ - $(SLO)$/linegeometryextractor2d.obj \ - $(SLO)$/canvasprocessor.obj \ - $(SLO)$/hittestprocessor2d.obj \ - $(SLO)$/textaspolygonextractor2d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index c774ac950e72..7087ea406cb5 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -265,7 +265,7 @@ namespace drawinglayer double fOldRotate, fOldShearX; rTextCandidate.getTextTransform().decompose(aOldFontScaling, aOldTranslate, fOldRotate, fOldShearX); - long nWidthToFill = rTextCandidate.getWidthToFill( ) * aFontScaling.getX() / aOldFontScaling.getX(); + long nWidthToFill = static_cast<long>(rTextCandidate.getWidthToFill( ) * aFontScaling.getX() / aOldFontScaling.getX()); long nWidth = mpOutputDevice->GetTextArray( rTextCandidate.getText(), pDXArray, 0, 1 ); diff --git a/drawinglayer/source/processor3d/makefile.mk b/drawinglayer/source/processor3d/makefile.mk deleted file mode 100755 index 6b739b6e3d9d..000000000000 --- a/drawinglayer/source/processor3d/makefile.mk +++ /dev/null @@ -1,50 +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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=processor3d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprocessor3d.obj \ - $(SLO)$/cutfindprocessor3d.obj \ - $(SLO)$/defaultprocessor3d.obj \ - $(SLO)$/shadow3dextractor.obj \ - $(SLO)$/geometry2dextractor.obj \ - $(SLO)$/zbufferprocessor3d.obj - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 281f7c38225f..5b6536ea2d28 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -130,8 +130,8 @@ namespace } } - delete pContent; - delete pAlpha; + aContent.ReleaseAccess(pContent); + aAlpha.ReleaseAccess(pAlpha); } aRetval = BitmapEx(aContent, aAlpha); diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk deleted file mode 100755 index 3de5c47603f1..000000000000 --- a/drawinglayer/util/makefile.mk +++ /dev/null @@ -1,85 +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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=drawinglayer -TARGET=drawinglayer - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein --------------------------------------------------- - -LIB1TARGET=$(SLB)$/drawinglayer.lib -LIB1FILES=\ - $(SLB)$/primitive2d.lib \ - $(SLB)$/primitive3d.lib \ - $(SLB)$/geometry.lib \ - $(SLB)$/processor2d.lib \ - $(SLB)$/processor3d.lib \ - $(SLB)$/attribute.lib \ - $(SLB)$/animation.lib \ - $(SLB)$/texture.lib - -SHL1TARGET= drawinglayer$(DLLPOSTFIX) -SHL1IMPLIB= idrawinglayer - -SHL1STDLIBS=\ - $(VCLLIB) \ - $(BASEGFXLIB) \ - $(TOOLSLIB) \ - $(SVLLIB) \ - $(TKLIB) \ - $(CANVASTOOLSLIB) \ - $(CPPCANVASLIB) \ - $(SVTOOLLIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(AVMEDIALIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/drawinglayer.lib - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =DrawingLayer -DEFLIB1NAME =drawinglayer - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @+$(TYPE) $(TARGET).flt > $@ - diff --git a/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx index 8c900b3caa9a..e34e66f8c4c9 100644 --- a/editeng/inc/editeng/acorrcfg.hxx +++ b/editeng/inc/editeng/acorrcfg.hxx @@ -123,7 +123,7 @@ public: SvxAutoCorrCfg(); virtual ~SvxAutoCorrCfg(); - static SvxAutoCorrCfg* Get(); + static SvxAutoCorrCfg& Get(); }; diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index d3547a6a9cc7..00094cfbc436 100644 --- a/editeng/inc/editeng/eerdll.hxx +++ b/editeng/inc/editeng/eerdll.hxx @@ -47,12 +47,12 @@ class EditDLL GlobalEditData* pGlobalData; public: - EditDLL(); - ~EditDLL(); + EditDLL(); + ~EditDLL(); ResMgr* GetResMgr() const { return pResMgr; } GlobalEditData* GetGlobalData() const { return pGlobalData; } - static EditDLL* Get(); + static EditDLL& Get(); }; #define EE_DLL() EditDLL::Get() diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx index 43142eb185c5..af61e3b81fbe 100644 --- a/editeng/inc/editeng/splwrap.hxx +++ b/editeng/inc/editeng/splwrap.hxx @@ -57,7 +57,7 @@ class EDITENG_DLLPUBLIC SvxSpellWrapper { private: friend class SvxSpellCheckDialog; friend class SvxHyphenWordDialog; - friend class SvxHyphenWordDialog_Impl; + friend struct SvxHyphenWordDialog_Impl; Window* pWin; ::com::sun::star::uno::Reference< diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index e463c09f2ba2..82f49c24d733 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2262,8 +2262,7 @@ EditEngineItemPool::EditEngineItemPool( sal_Bool bPersistenRefCounts ) SetVersionMap( 4, 3994, 4022, aV4Map ); SetVersionMap( 5, 3994, 4037, aV5Map ); - DBG_ASSERT( EE_DLL(), "EditDLL?!" ); - SfxPoolItem** ppDefItems = EE_DLL()->GetGlobalData()->GetDefItems(); + SfxPoolItem** ppDefItems = EE_DLL().GetGlobalData()->GetDefItems(); SetDefaults( ppDefItems ); } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7b65b92c6e55..5185dcd12ad0 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1121,7 +1121,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie xub_Unicode nCharCode = rKeyEvent.GetCharCode(); pEditView->pImpEditView->DrawSelection(); // Autocorrection? - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); if ( ( pImpEditEngine->GetStatus().DoAutoCorrect() ) && ( SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) || pAutoCorrect->HasRunNext() ) ) diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src index b65f20c36583..add1054fbb10 100644 --- a/editeng/source/editeng/editeng.src +++ b/editeng/source/editeng/editeng.src @@ -70,7 +70,7 @@ String RID_EDITUNDO_SETSTYLE String RID_EDITUNDO_TRANSLITERATE { - Text [ en-US ] = "Case/Characters"; + Text [ en-US ] = "~Change Case"; }; diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 4a3c4cfe29db..ccb61a837c49 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -192,11 +192,8 @@ ContentInfo::ContentInfo( SfxItemPool& rPool ) : aParaAttribs( rPool, EE_PARA_ST // the real Copy constructor is nonsens, since I have to work with another Pool! ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse ) : aParaAttribs( rPoolToUse, EE_PARA_START, EE_CHAR_END ) + , pWrongs(0) { - pWrongs = NULL; - - if ( rCopyFrom.GetWrongList() ) - pWrongs = rCopyFrom.GetWrongList()->Clone(); // this should ensure that the Items end up in the correct Pool! aParaAttribs.Set( rCopyFrom.GetParaAttribs() ); aText = rCopyFrom.GetText(); @@ -210,7 +207,6 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse aAttribs.Insert( pMyAttr, aAttribs.Count() ); } - pWrongs = NULL; if ( rCopyFrom.GetWrongList() ) pWrongs = rCopyFrom.GetWrongList()->Clone(); } diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 4e1bcf8af865..ff12f775ceb1 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1055,7 +1055,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) Reference< XSpellAlternatives > xSpellAlt = xSpeller->spell( aSelected, PIMPEE->GetLanguage( aPaM2 ), aPropVals ); - Reference< XLanguageGuessing > xLangGuesser( EE_DLL()->GetGlobalData()->GetLanguageGuesser() ); + Reference< XLanguageGuessing > xLangGuesser( EE_DLL().GetGlobalData()->GetLanguageGuesser() ); // check if text might belong to a different language... LanguageType nGuessLangWord = LANGUAGE_NONE; @@ -1272,7 +1272,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { DBG_ASSERT(nId - MN_AUTOSTART < aAlt.getLength(), "index out of range"); String aWord = pAlt[nId - MN_AUTOSTART]; - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); if ( pAutoCorrect ) pAutoCorrect->PutText( aSelected, aWord, PIMPEE->GetLanguage( aPaM2 ) ); InsertText( aWord ); diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index e69db37d9f44..677202c62e31 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -76,22 +76,24 @@ #include <editeng/forbiddencharacterstable.hxx> #include <editeng/justifyitem.hxx> #include <comphelper/processfactory.hxx> - -static EditDLL* pDLL=0; +#include <rtl/instance.hxx> using namespace ::com::sun::star; -EditDLL* EditDLL::Get() +namespace +{ + class theEditDLL : public rtl::Static<EditDLL, theEditDLL> {}; +} + +EditDLL& EditDLL::Get() { - if ( !pDLL ) - pDLL = new EditDLL; - return pDLL; + return theEditDLL::get(); } GlobalEditData::GlobalEditData() + : m_aStdRefDevice(::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW)) { ppDefItems = NULL; - pStdRefDevice = NULL; } GlobalEditData::~GlobalEditData() @@ -100,7 +102,6 @@ GlobalEditData::~GlobalEditData() // Or simply keep them, since at end of excecution?! if ( ppDefItems ) SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, sal_True ); - delete pStdRefDevice; } SfxPoolItem** GlobalEditData::GetDefItems() @@ -208,30 +209,27 @@ uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGues OutputDevice* GlobalEditData::GetStdRefDevice() { - if ( !pStdRefDevice ) + if ( !m_aStdRefDevice ) { - pStdRefDevice = new VirtualDevice; - pStdRefDevice->SetMapMode( MAP_TWIP ); + m_aStdRefDevice.reset(new VirtualDevice); + m_aStdRefDevice->SetMapMode( MAP_TWIP ); } - return pStdRefDevice; + return m_aStdRefDevice.get(); } EditResId::EditResId( sal_uInt16 nId ): - ResId( nId, *EE_DLL()->GetResMgr() ) + ResId( nId, *EE_DLL().GetResMgr() ) { } EditDLL::EditDLL() { pGlobalData = new GlobalEditData; - ByteString aResMgrName( "editeng" ); - pResMgr = ResMgr::CreateResMgr( - aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); + pResMgr = ResMgr::CreateResMgr( "editeng", Application::GetSettings().GetUILocale() ); } EditDLL::~EditDLL() { - delete pResMgr; delete pGlobalData; } diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx index baf2a1d8c5bf..33a2a1584c27 100644 --- a/editeng/source/editeng/eerdll2.hxx +++ b/editeng/source/editeng/eerdll2.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> #include <editeng/forbiddencharacterstable.hxx> #include <rtl/ref.hxx> +#include <comphelper/scoped_disposing_ptr.hxx> class SfxPoolItem; @@ -40,8 +41,8 @@ class GlobalEditData private: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > xLanguageGuesser; + comphelper::scoped_disposing_solar_mutex_reset_ptr<OutputDevice> m_aStdRefDevice; SfxPoolItem** ppDefItems; - OutputDevice* pStdRefDevice; rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 473e5917c8a7..df8d6d5e810d 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -160,7 +160,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : aOnlineSpellTimer.SetTimeout( 100 ); aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) ); - pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice(); + pRefDev = EE_DLL().GetGlobalData()->GetStdRefDevice(); // Access data already from here on! SetRefDevice( pRefDev ); @@ -206,7 +206,7 @@ void ImpEditEngine::SetRefDevice( OutputDevice* pRef ) bOwnerOfRefDev = sal_False; if ( !pRef ) - pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice(); + pRefDev = EE_DLL().GetGlobalData()->GetStdRefDevice(); nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width(); @@ -223,7 +223,7 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode ) return; // When RefDev == GlobalRefDev => create own! - if ( !bOwnerOfRefDev && ( pRefDev == EE_DLL()->GetGlobalData()->GetStdRefDevice() ) ) + if ( !bOwnerOfRefDev && ( pRefDev == EE_DLL().GetGlobalData()->GetStdRefDevice() ) ) { pRefDev = new VirtualDevice; pRefDev->SetMapMode( MAP_TWIP ); @@ -2521,7 +2521,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, sal_Bool bOverwrite, Window* pFrameWin ) { EditSelection aSel( rCurSel ); - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); if ( pAutoCorrect ) { if ( aSel.HasRange() ) @@ -3825,10 +3825,10 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, sal_Bool bS if ( !pLine ) // may happen only in the range of SA! { - #ifdef DBG_UTIL - const SvxULSpaceItem& rULSpace =(const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ); - OSL_ENSURE( nY+GetYValue( rULSpace.GetLower() ) >= aDocPos.Y() , "Index in no line, GetPaM ?" ); - #endif +#if OSL_DEBUG_LEVEL > 0 + const SvxULSpaceItem& rULSpace =(const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE ); + OSL_ENSURE( nY+GetYValue( rULSpace.GetLower() ) >= aDocPos.Y() , "Index in no line, GetPaM ?" ); +#endif aPaM.SetIndex( pPortion->GetNode()->Len() ); return aPaM; } @@ -4460,13 +4460,13 @@ rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTabl { rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable; if ( !xF.is() && bGetInternal ) - xF = EE_DLL()->GetGlobalData()->GetForbiddenCharsTable(); + xF = EE_DLL().GetGlobalData()->GetForbiddenCharsTable(); return xF; } void ImpEditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { - EE_DLL()->GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars ); + EE_DLL().GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars ); } svtools::ColorConfig& ImpEditEngine::GetColorConfig() diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index f6af728d0e66..16738e029819 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3106,7 +3106,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta nTextStart = 0; nTextLen = aText.Len(); - // #b6668980# crash when accessing 0 pointer in pDXArray + // crash when accessing 0 pointer in pDXArray pTmpDXArray = new sal_Int32[ aText.Len() ]; pDXArray = pTmpDXArray; Font _aOldFont( GetRefDevice()->GetFont() ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 6f2a8ca1989c..2e2b439878a7 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2312,6 +2312,7 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) pRight = pTmp; break; default: + delete pTmp; OSL_FAIL( "wrong line" ); } } @@ -2509,6 +2510,7 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) } else { + delete pTmp; OSL_FAIL( "wrong line" ); } } @@ -3881,7 +3883,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject() const Graphic aGraphic; int nRes; pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN ); - nRes = GraphicFilter::GetGraphicFilter()-> + nRes = GraphicFilter::GetGraphicFilter(). ImportGraphic( aGraphic, *pStrLink, *pImpl->pStream, GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG ); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index f672845ca486..470362c95207 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -119,7 +119,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal } else { - SvXMLAttrContainerData* pNewImpl = new SvXMLAttrContainerData; + std::auto_ptr<SvXMLAttrContainerData> pNewImpl(new SvXMLAttrContainerData); try { @@ -168,19 +168,12 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal } if( nAttr == nCount ) - { - delete pImpl; - pImpl = pNewImpl; - } + pImpl = pNewImpl.release(); else - { - delete pNewImpl; return false; - } } catch(...) { - delete pNewImpl; return false; } } diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 15a3ddfb2d09..084c09431965 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -39,15 +39,13 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <rtl/instance.hxx> + using namespace utl; using namespace com::sun::star::uno; using ::rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) - -static SvxAutoCorrCfg* pAutoCorrCfg = 0; - SvxAutoCorrCfg::SvxAutoCorrCfg() : aBaseConfig(*this), aSwConfig(*this), @@ -230,7 +228,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) } SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(C2U("Office.Common/AutoCorrect")), + utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/AutoCorrect"))), rParent(rPar) { } @@ -539,7 +537,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) } SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(C2U("Office.Writer/AutoFunction")), + utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/AutoFunction"))), rParent(rPar) { } @@ -650,11 +648,14 @@ void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ ) Load(sal_False); } -SvxAutoCorrCfg* SvxAutoCorrCfg::Get() +namespace +{ + class theSvxAutoCorrCfg : public rtl::Static<SvxAutoCorrCfg, theSvxAutoCorrCfg>{}; +} + +SvxAutoCorrCfg& SvxAutoCorrCfg::Get() { - if( !pAutoCorrCfg ) - pAutoCorrCfg = new SvxAutoCorrCfg; - return pAutoCorrCfg; + return theSvxAutoCorrCfg::get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 85f398fbc529..87a603946d92 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" +#include <boost/scoped_ptr.hpp> + #include <osl/endian.h> #include <tools/cachestr.hxx> #include <vcl/graph.hxx> @@ -36,6 +38,7 @@ #include <svtools/rtfkeywd.hxx> #include <svtools/rtftoken.h> #include <svtools/filter.hxx> +#include <svtools/wmf.hxx> #include <editeng/svxrtf.hxx> @@ -273,7 +276,7 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) SetSrcEncoding( RTL_TEXTENCODING_MS_1252 ); const sal_Char* pFilterNm = 0; - SvCacheStream* pTmpFile = 0; + boost::scoped_ptr<SvCacheStream> pTmpFile; int nToken = 0; bool bValidBmp = true, bFirstTextToken = true; @@ -325,7 +328,7 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) { rPicType.eStyle = SvxRTFPictureType::MAC_QUICKDRAW; // Mac-Pict gets a empty header above - pTmpFile = new SvCacheStream; + pTmpFile.reset(new SvCacheStream); ByteString aStr; aStr.Fill( 512, '\0' ); pTmpFile->Write( aStr.GetBuffer(), aStr.Len() ); @@ -372,7 +375,7 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) } rPicType.nType = nVal; - pTmpFile = new SvCacheStream; + pTmpFile.reset(new SvCacheStream); } break; @@ -474,15 +477,15 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) if( bValidBmp ) { - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW; if( pFilterNm ) { String sTmp; - for( sal_uInt16 n = pGF->GetImportFormatCount(); n; ) + for( sal_uInt16 n = rGF.GetImportFormatCount(); n; ) { - sTmp = pGF->GetImportFormatShortName( --n ); + sTmp = rGF.GetImportFormatShortName( --n ); if( sTmp.EqualsAscii( pFilterNm )) { nImportFilter = n; @@ -492,11 +495,16 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) } String sTmpStr; + WMF_APMFILEHEADER aAPMHeader; + aAPMHeader.left=0; + aAPMHeader.top=0; + aAPMHeader.right=rPicType.nWidth; + aAPMHeader.bottom=rPicType.nHeight; + + WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right>0 && aAPMHeader.bottom>0?&aAPMHeader:NULL); pTmpFile->Seek( STREAM_SEEK_TO_BEGIN ); - bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, - nImportFilter ); + bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader ); } - delete pTmpFile; } if( !bValidBmp ) diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 73604f5af707..aed4fb3d2aed 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -93,8 +93,6 @@ sal_Int32 OCommonEmbeddedObject::ConvertVerbToState_Impl( sal_Int32 nVerb ) void OCommonEmbeddedObject::Deactivate() { uno::Reference< util::XModifiable > xModif( m_pDocHolder->GetComponent(), uno::UNO_QUERY ); - //MBA if ( !xModif.is() ) - //MBA throw uno::RuntimeException(); // no need to lock for the initialization uno::Reference< embed::XEmbeddedClient > xClientSite = m_xClientSite; diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index a67ac4692797..321b1ff7a3a7 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -552,7 +552,6 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag aLoadArgs.put( "InputStream", xTempInpStream ); } - // aLoadArgs.put( "AsTemplate", sal_True ); aLoadArgs.merge( m_aDocMediaDescriptor, true ); @@ -1844,7 +1843,6 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt /*sal_Bool bElExists =*/ xNameAccess->hasByName( sEntName ); m_bReadOnly = sal_False; -// sal_Int32 nStorageMode = embed::ElementModes::READWRITE; if ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) SwitchOwnPersistence( xStorage, sEntName ); diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index 6dbfe46c0c86..8f9bd4ba8d63 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -42,12 +42,12 @@ using namespace ::com::sun::star; extern "C" { -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 802056b72af7..139c3119d69a 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -129,19 +129,6 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR // TODO: return for the aspect of the document embed::VisualRepresentation aVisualRepresentation; - /* - OSL_ENSURE( m_pDocHolder->GetComponent().is(), "Running or Active object has no component!\n" ); - uno::Reference< datatransfer::XTransferable > xTransferable( m_pDocHolder->GetComponent(), uno::UNO_QUERY ); - if ( !xTransferable.is() ) - throw uno::RuntimeException(); - - datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetaFile" )), - ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); - - aVisualRepresentation.Data = xTransferable->getTransferData( aDataFlavor ); - aVisualRepresentation.Flavor = aDataFlavor;*/ return aVisualRepresentation; } diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 638eb1eeeaf6..a75c814fc9bc 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -363,7 +363,6 @@ void DocumentHolder::ResizeWindows_Impl( const awt::Rectangle& aHatchRect ) aHatchRect.Height - 2*HATCH_BORDER_WIDTH, awt::PosSize::POSSIZE ); - // Window* pWindow = VCLUnoHelper::GetWindow( m_xOwnWindow ); m_xHatchWindow->setPosSize( aHatchRect.X, aHatchRect.Y, @@ -981,9 +980,6 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo } m_xComponent = xDoc; - // done outside currently uno::Reference < container::XChild > xChild( m_xComponent, uno::UNO_QUERY ); - // done outside currently if ( xChild.is() && m_pEmbedObj ) - // done outside currently xChild->setParent( m_pEmbedObj->getParent() ); m_bReadOnly = bReadOnly; m_bAllowClosing = sal_False; @@ -1022,7 +1018,6 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) ::comphelper::NamedValueCollection aArgs; aArgs.put( "Model", m_xComponent ); aArgs.put( "ReadOnly", m_bReadOnly ); - //aArgs.put( "Hidden", sal_True ); if ( bInPlace ) aArgs.put( "PluginMode", sal_Int16(1) ); ::rtl::OUString sUrl; diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index e82136d5a37b..b5401b0aade2 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -165,8 +165,6 @@ public: void Show(); - // sal_Bool SetVisArea( sal_Int64 nAspect, const ::com::sun::star::awt::Rectangle& aRect ); - // sal_Bool GetVisArea( sal_Int64 nAspect, ::com::sun::star::awt::Rectangle *pRect ); sal_Bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ); sal_Bool GetExtent( sal_Int64 nAspect, ::com::sun::star::awt::Size *pSize ); diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index f177f19be449..ec1c7f8db7c6 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -73,7 +73,6 @@ sal_Bool ConvertBufferToFormat( void* pBuf, if( xGraphic.is() ) { SvMemoryStream aNewStream( 65535, 65535 ); -// uno::Reference < io::XOutputStream > xOut = new utl::OOutputStreamHelper( aNewStream.GetLockBytes() ); uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream ); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 ); aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" )); diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk index b7f3482fa0bb..09121474b132 100755 --- a/embeddedobj/source/msole/makefile.mk +++ b/embeddedobj/source/msole/makefile.mk @@ -110,12 +110,6 @@ SHL1STDLIBS+=\ $(OLEAUT32LIB) DEF1EXPORTFILE= exports.dxp -.ELIF "$(GUI)"=="OS2" - -SHL1STDLIBS+=\ - iembobj.lib - -DEF1EXPORTFILE= exports.dxp .ENDIF diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 341cafce10a9..2d21b886a42f 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -680,8 +680,6 @@ sal_Bool OleComponent::InitializeObject_Impl() if ( FAILED( hr ) || !m_pNativeImpl->m_pViewObject2 ) return sal_False; - // not realy needed for now, since object is updated on saving - // m_pNativeImpl->m_pViewObject2->SetAdvise( DVASPECT_CONTENT, 0, m_pImplAdviseSink ); // remove all the caches IOleCache* pIOleCache = NULL; @@ -746,8 +744,6 @@ void OleComponent::LoadEmbeddedObject( const ::rtl::OUString& aTempURL ) hr = OleLoad( m_pNativeImpl->m_pIStorage, IID_IUnknown, NULL, (void**)&m_pNativeImpl->m_pObj ); if ( FAILED( hr ) || !m_pNativeImpl->m_pObj ) { - // STATSTG aStat; - // m_pNativeImpl->m_pIStorage->Stat( &aStat, STATFLAG_NONAME ); throw uno::RuntimeException(); } @@ -1350,8 +1346,6 @@ void OleComponent::StoreOwnTmpIfNecessary() if ( FAILED( hr ) && hr != E_UNEXPECTED ) throw io::IOException(); // TODO - // STATSTG aStat; - // m_pNativeImpl->m_pIStorage->Stat( &aStat, STATFLAG_NONAME ); } } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 4d925b9daa91..85dcfd8aa139 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -521,7 +521,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) m_pOleComponent->CloseObject(); } - // GetRidOfComponent(); aGuard.clear(); StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState ); aGuard.reset(); @@ -700,7 +699,6 @@ namespace //Dump the objects content to a tempfile, just the "CONTENTS" stream if //there is one for non-compound documents, otherwise the whole content. - // //On success a file is returned which must be removed by the caller rtl::OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xObjectStream) @@ -834,8 +832,6 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw; } - // the following notification will be done asynchronously - // StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState ); } else #endif @@ -1093,9 +1089,6 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 nResult = m_nStatus; else if ( m_pOleComponent ) { - // OLE should allow to get status even in loaded state - // if ( m_nObjectState == embed::EmbedStates::LOADED ) - // changeState( m_nObjectState == embed::EmbedStates::RUNNING ); m_nStatus = m_pOleComponent->GetMiscStatus( nAspect ); m_nStatusAspect = nAspect; diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 016115fd45fe..e68789ace2ab 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -663,7 +663,6 @@ void SAL_CALL OleEmbeddedObject::translateAccelerators( } // end wrapping related part ==================== - // throw embed::WrongStateException(); } // XChild diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 541c9e9585d0..4aec3eafd7a7 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -330,8 +330,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( return xStream; } -// sal_Bool bSetSizeToRepl = sal_False; -// awt::Size aSizeToSet; sal_uInt32 nHeaderOffset = 0; if ( ( nRead >= 8 && aData[0] == -1 && aData[1] == -1 && aData[2] == -1 && aData[3] == -1 ) @@ -352,19 +350,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( nHeaderOffset += nLen - 4; } -// if ( aData[4] == 3 ) -// { -// try -// { -// -// aSizeToSet = getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); -// aSizeToSet.Width /= 364; //2540; // let the size be in inches, as wmf requires -// aSizeToSet.Height /= 364; //2540; // let the size be in inches, as wmf requires -// bSetSizeToRepl = sal_True; -// } -// catch( uno::Exception& ) -// {} -// } } else if ( nRead > 4 ) { @@ -1835,22 +1820,8 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied - if ( m_bIsLink ) - { - // just let the link store itself - // in case visual repersentation must be stored also - // the procedure should be the same as for embedded objects - - uno::Reference< io::XOutputStream > xOutStream = GetStreamForSaving(); - - // should the component detect that it is a link??? - StoreObjectToStream( xOutStream ); - } - else - { - uno::Reference< io::XOutputStream > xOutStream = GetStreamForSaving(); - StoreObjectToStream( xOutStream ); - } + // TODO: does this work for links too? + StoreObjectToStream( GetStreamForSaving() ); // the replacement is changed probably, and it must be in the object stream if ( !m_pOleComponent->IsWorkaroundActive() ) diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index e5581f750023..a058aca598e4 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -42,12 +42,12 @@ using namespace ::com::sun::star; extern "C" { -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 16f3968bd5d3..c54fb3a5314a 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -302,12 +302,6 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io // read the complete size of the Object Package if ( xInStream->readBytes( aReadSeq, 4 ) != 4 ) return sal_False; -/* - sal_uInt32 nLength = (sal_uInt8)aReadSeq[0] - + (sal_uInt8)aReadSeq[1] * 0x100 - + (sal_uInt8)aReadSeq[2] * 0x10000 - + (sal_uInt8)aReadSeq[3] * 0x1000000; -*/ // read the first header ( have no idea what does this header mean ) if ( xInStream->readBytes( aReadSeq, 2 ) != 2 || aReadSeq[0] != 2 || aReadSeq[1] != 0 ) return sal_False; diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c index 66ae7d413318..6952fe9e96ec 100755 --- a/embeddedobj/test/Container1/nativelib/nativeview.c +++ b/embeddedobj/test/Container1/nativelib/nativeview.c @@ -45,7 +45,6 @@ static LRESULT APIENTRY NativeViewWndProc( HWND , UINT , WPARAM , LPARAM ); #define SYSTEM_WIN32 1 #define SYSTEM_WIN16 2 #define SYSTEM_JAVA 3 -#define SYSTEM_OS2 4 #define SYSTEM_MAC 5 #define SYSTEM_XWINDOW 6 diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index 0da309845a6f..04f5890da39f 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -41,12 +41,12 @@ using namespace ::com::sun::star; extern "C" { -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index f17fee6d437d..95416cd186e8 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -42,12 +42,12 @@ using namespace ::com::sun::star; extern "C" { -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 73fcb296c190..d6423528021e 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -822,13 +822,13 @@ void EventAttacherImpl::removeListener extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk new file mode 100644 index 000000000000..b6694e6453ad --- /dev/null +++ b/fileaccess/Library_fileacc.mk @@ -0,0 +1,51 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Red Hat, Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# David Tardon <dtardon@redhat.com> +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,fileacc)) + +$(eval $(call gb_Library_set_include,fileacc,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,fileacc,\ + cppu \ + cppuhelper \ + sal \ + tl \ + ucbhelper \ + utl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) + +$(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) + +# vim: set noet sw=4 ts=4: diff --git a/fileaccess/Makefile b/fileaccess/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/fileaccess/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk new file mode 100644 index 000000000000..8e3d385022b8 --- /dev/null +++ b/fileaccess/Module_fileaccess.mk @@ -0,0 +1,34 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Red Hat, Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# David Tardon <dtardon@redhat.com> +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,fileaccess)) +$(eval $(call gb_Module_add_targets,fileaccess,\ + Library_fileacc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst index 0349810c3838..a37869840f49 100644 --- a/fileaccess/prj/build.lst +++ b/fileaccess/prj/build.lst @@ -1,3 +1,2 @@ -fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL -fa fileaccess usr1 - all fa_mkout NULL -fa fileaccess\source nmake - all fa_src NULL +fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL +fa fileaccess\prj nmake - all fa_prj NULL diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst index c9b2bdd18f06..e69de29bb2d1 100644 --- a/fileaccess/prj/d.lst +++ b/fileaccess/prj/d.lst @@ -1,6 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\* -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* -..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml -..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component diff --git a/drawinglayer/source/geometry/makefile.mk b/fileaccess/prj/makefile.mk index b88522166047..e312a7ccab65 100755 --- a/drawinglayer/source/geometry/makefile.mk +++ b/fileaccess/prj/makefile.mk @@ -25,20 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=geometry +PRJ=.. +TARGET=prj -# --- Settings ---------------------------------- +.INCLUDE : settings.mk -.INCLUDE : settings.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/viewinformation2d.obj \ - $(SLO)$/viewinformation3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 40257aee3749..775c929f5403 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -875,13 +875,13 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk deleted file mode 100755 index 8c8a91b0f675..000000000000 --- a/fileaccess/source/makefile.mk +++ /dev/null @@ -1,76 +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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=fileaccess -TARGET=fileacc -ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE -COMP1TYPELIST=$(TARGET) -COMPRDB=$(SOLARBINDIR)$/types.rdb - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/FileAccess.obj -# $(SLO)$/$(COMP1TYPELIST)_description.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS= \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1LIBS=$(SLB)$/$(TARGET).lib - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/fileacc.component - -$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fileacc.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fileacc.component diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk new file mode 100644 index 000000000000..325f91186ce3 --- /dev/null +++ b/formula/AllLangResTarget_for.mk @@ -0,0 +1,48 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,for)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula)) + +$(eval $(call gb_AllLangResTarget_add_srs,for,\ + formula/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,formula/res)) + +$(eval $(call gb_SrsTarget_set_include,formula/res,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/formula/source/core/inc) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,formula/res,\ + formula/source/core/resource/core_resource.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk new file mode 100644 index 000000000000..3053ee6f2b3f --- /dev/null +++ b/formula/AllLangResTarget_forui.mk @@ -0,0 +1,50 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,forui)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula)) + +$(eval $(call gb_AllLangResTarget_add_srs,forui,\ + formula/ui \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,formula/ui)) + +$(eval $(call gb_SrsTarget_set_include,formula/ui,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/formula/inc) \ + -I$(realpath $(SRCDIR)/formula/source/ui/inc) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,formula/ui,\ + formula/source/ui/dlg/formdlgs.src \ + formula/source/ui/dlg/parawin.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/Library_for.mk b/formula/Library_for.mk new file mode 100644 index 000000000000..f1ac2c82fdbe --- /dev/null +++ b/formula/Library_for.mk @@ -0,0 +1,72 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,for)) + +$(eval $(call gb_Library_add_package_headers,for,\ + formula_inc \ +)) + +$(eval $(call gb_Library_add_precompiled_header,for,$(SRCDIR)/formula/inc/pch/precompiled_formula)) + +$(eval $(call gb_Library_set_include,for,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/formula/inc/pch) \ + -I$(realpath $(SRCDIR)/formula/source/core/inc) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,for,\ + $$(DEFS) \ + -DFORMULA_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,for,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + svl \ + svt \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,for,formula/util/for)) + +$(eval $(call gb_Library_add_exception_objects,for,\ + formula/source/core/api/FormulaCompiler \ + formula/source/core/api/FormulaOpCodeMapperObj \ + formula/source/core/api/services \ + formula/source/core/api/token \ + formula/source/core/resource/core_resource \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk new file mode 100644 index 000000000000..0b77c702e9d4 --- /dev/null +++ b/formula/Library_forui.mk @@ -0,0 +1,70 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,forui)) + +$(eval $(call gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula)) + +$(eval $(call gb_Library_set_include,forui,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/formula/inc) \ + -I$(realpath $(SRCDIR)/formula/inc/pch) \ + -I$(realpath $(SRCDIR)/formula/source/ui/inc) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,forui,\ + $$(DEFS) \ + -DFORMULA_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,forui,\ + cppu \ + cppuhelper \ + for \ + sal \ + sfx \ + svl \ + svt \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,forui,\ + formula/source/ui/dlg/formula \ + formula/source/ui/dlg/FormulaHelper \ + formula/source/ui/dlg/funcpage \ + formula/source/ui/dlg/funcutl \ + formula/source/ui/dlg/parawin \ + formula/source/ui/dlg/structpg \ + formula/source/ui/resource/ModuleHelper \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/Makefile b/formula/Makefile new file mode 100644 index 000000000000..c898975e5277 --- /dev/null +++ b/formula/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk new file mode 100644 index 000000000000..0ce73ce40777 --- /dev/null +++ b/formula/Module_formula.mk @@ -0,0 +1,38 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,formula)) + +$(eval $(call gb_Module_add_targets,formula,\ + AllLangResTarget_for \ + AllLangResTarget_forui \ + Library_for \ + Library_forui \ + Package_inc \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk new file mode 100644 index 000000000000..1fc717f5b735 --- /dev/null +++ b/formula/Package_inc.mk @@ -0,0 +1,47 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,formula_inc,$(SRCDIR)/formula/inc/formula)) + +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/compiler.hrc,compiler.hrc)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/errorcodes.hxx,errorcodes.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/ExternalReferenceHelper.hxx,ExternalReferenceHelper.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formdata.hxx,formdata.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaCompiler.hxx,FormulaCompiler.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formuladllapi.h,formuladllapi.h)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formulahelper.hxx,formulahelper.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formula.hxx,formula.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaOpCodeMapperObj.hxx,FormulaOpCodeMapperObj.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,funcutl.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,grammar.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,IControlReferenceHandler.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,IFunctionDescription.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,opcode.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,tokenarray.hxx)) +$(eval $(call gb_Package_add_file,formula_inc,inc/formula/token.hxx,token.hxx)) + +# vim: set noet ts=4 sw=4: diff --git a/formula/inc/makefile.mk b/formula/inc/makefile.mk deleted file mode 100755 index dfe7226e082a..000000000000 --- a/formula/inc/makefile.mk +++ /dev/null @@ -1,47 +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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=formula -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/formula/prj/build.lst b/formula/prj/build.lst index 109a798ea3eb..aa511f7fa3c7 100644 --- a/formula/prj/build.lst +++ b/formula/prj/build.lst @@ -1,9 +1,3 @@ fml formula : BOOST:boost LIBXSLT:libxslt comphelper svx NULL fml formula usr1 - all fml_mkout NULL -fml formula\inc nmake - all fml_inc NULL -fml formula\source\core\api nmake - all fml_api fml_inc NULL -fml formula\source\core\resource nmake - all fml_core_res fml_inc NULL -fml formula\source\ui\resource nmake - all fml_ui_res fml_inc NULL -fml formula\source\ui\dlg nmake - all fml_uidlg fml_inc NULL -fml formula\util nmake - all fml_util fml_uidlg fml_core_res fml_ui_res fml_api NULL - +fml formula\prj nmake - all fml_prj NULL diff --git a/formula/prj/d.lst b/formula/prj/d.lst index 0fe5a1fe7198..e69de29bb2d1 100644 --- a/formula/prj/d.lst +++ b/formula/prj/d.lst @@ -1,37 +0,0 @@ - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid - -dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" - -# Libraries -..\%__SRC%\bin\for*.dll %_DEST%\bin%_EXT%\for*.dll -..\%__SRC%\lib\libfor*.so %_DEST%\lib%_EXT%\libfor*.so -..\%__SRC%\lib\ifor*.lib %_DEST%\lib%_EXT%\ifor*.lib -..\%__SRC%\lib\libfor*.dylib %_DEST%\lib%_EXT%\libfor*.dylib - -# Resources -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -mkdir: %_DEST%\inc%_EXT%\formula -..\inc\formula\formdata.hxx %_DEST%\inc%_EXT%\formula\formdata.hxx -..\inc\formula\formula.hxx %_DEST%\inc%_EXT%\formula\formula.hxx -..\inc\formula\formulahelper.hxx %_DEST%\inc%_EXT%\formula\formulahelper.hxx -..\inc\formula\funcutl.hxx %_DEST%\inc%_EXT%\formula\funcutl.hxx -..\inc\formula\IControlReferenceHandler.hxx %_DEST%\inc%_EXT%\formula\IControlReferenceHandler.hxx -..\inc\formula\IFunctionDescription.hxx %_DEST%\inc%_EXT%\formula\IFunctionDescription.hxx -..\inc\formula\ExternalReferenceHelper.hxx %_DEST%\inc%_EXT%\formula\ExternalReferenceHelper.hxx -..\inc\formula\formuladllapi.h %_DEST%\inc%_EXT%\formula\formuladllapi.h -..\inc\formula\opcode.hxx %_DEST%\inc%_EXT%\formula\opcode.hxx -..\inc\formula\grammar.hxx %_DEST%\inc%_EXT%\formula\grammar.hxx -..\inc\formula\FormulaCompiler.hxx %_DEST%\inc%_EXT%\formula\FormulaCompiler.hxx -..\inc\formula\FormulaOpCodeMapperObj.hxx %_DEST%\inc%_EXT%\formula\FormulaOpCodeMapperObj.hxx -..\inc\formula\compiler.hrc %_DEST%\inc%_EXT%\formula\compiler.hrc -..\inc\formula\token.hxx %_DEST%\inc%_EXT%\formula\token.hxx -..\inc\formula\tokenarray.hxx %_DEST%\inc%_EXT%\formula\tokenarray.hxx -..\inc\formula\errorcodes.hxx %_DEST%\inc%_EXT%\formula\errorcodes.hxx - - - - - -..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component diff --git a/drawinglayer/source/texture/makefile.mk b/formula/prj/makefile.mk index d0cf722afcd9..e312a7ccab65 100755 --- a/drawinglayer/source/texture/makefile.mk +++ b/formula/prj/makefile.mk @@ -25,21 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=texture -ENABLE_EXCEPTIONS=TRUE +PRJ=.. +TARGET=prj -# --- Settings ---------------------------------- +.INCLUDE : settings.mk -.INCLUDE : settings.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/texture.obj \ - $(SLO)$/texture3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 0da88cd678d0..5ac4aba165ab 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -489,7 +489,9 @@ void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eO DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range"); if (0 < eOp && sal_uInt16(eOp) < mnSymbols) { - DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || (eOp == ocCurrency), + DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || + (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) || + (eOp == ocArrayRowSep), ByteString( "OpCodeMap::putOpCode: reusing OpCode "). Append( ByteString::CreateFromInt32( sal_Int32( eOp))).Append( " ("). Append( ByteString( rStr, RTL_TEXTENCODING_ASCII_US)).Append( ')').GetBuffer()); @@ -722,6 +724,7 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp ) { + bool bRet = false; switch (eOp) { // no parameters: @@ -739,9 +742,13 @@ bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp ) case ocIndirectXL: // ocOffset results in indirect references. case ocOffset: - return true; + bRet = true; + break; + default: + bRet = false; + break; } - return false; + return bRet; } // Remove quotes, escaped quotes are unescaped. diff --git a/formula/source/core/api/makefile.mk b/formula/source/core/api/makefile.mk deleted file mode 100755 index a99f9184acc2..000000000000 --- a/formula/source/core/api/makefile.mk +++ /dev/null @@ -1,47 +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. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=formula -TARGET=core_api -ENABLE_EXCEPTIONS=TRUE -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/FormulaOpCodeMapperObj.obj \ - $(SLO)$/FormulaCompiler.obj \ - $(SLO)$/token.obj \ - $(SLO)$/services.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 4b3811f6437c..de9258d4c8ea 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -135,14 +135,19 @@ bool FormulaToken::IsMatrixFunction() const bool FormulaToken::IsExternalRef() const { + bool bRet = false; switch (eType) { case svExternalSingleRef: case svExternalDoubleRef: case svExternalName: - return true; + bRet = true; + break; + default: + bRet = false; + break; } - return false; + return bRet; } bool FormulaToken::operator==( const FormulaToken& rToken ) const diff --git a/formula/source/core/resource/makefile.mk b/formula/source/core/resource/makefile.mk deleted file mode 100755 index 96e2dfd5a841..000000000000 --- a/formula/source/core/resource/makefile.mk +++ /dev/null @@ -1,49 +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. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=formula -TARGET=core_resource - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=core_strings -SRC1FILES= \ - core_resource.src - -SLOFILES= $(EXCEPTIONSFILES) -EXCEPTIONSFILES= $(SLO)$/core_resource.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/formula/source/ui/dlg/makefile.mk b/formula/source/ui/dlg/makefile.mk deleted file mode 100755 index 688e169d26d2..000000000000 --- a/formula/source/ui/dlg/makefile.mk +++ /dev/null @@ -1,66 +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. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=formula -TARGET=uidlg -IMGLST_SRS=$(SRS)$/$(TARGET).srs -BMP_IN=$(PRJ)$/res - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - formdlgs.src \ - parawin.src - -# ... object files ............................ - -EXCEPTIONSFILES= \ - $(SLO)$/formula.obj \ - $(SLO)$/FormulaHelper.obj \ - $(SLO)$/parawin.obj \ - $(SLO)$/funcutl.obj \ - $(SLO)$/funcpage.obj \ - $(SLO)$/structpg.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk deleted file mode 100755 index 3c6f91f6073d..000000000000 --- a/formula/util/makefile.mk +++ /dev/null @@ -1,146 +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. -# -#************************************************************************* - -PRJ=.. -PRJNAME=formula -TARGET=for -TARGET2=forui -USE_DEFFILE=TRUE -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# USE_LDUMP2=TRUE -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - - -# --- formula core (for) ----------------------------------- - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/core_resource.lib \ - $(SLB)$/core_api.lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VCLLIB) \ - $(SALLIB) - -SHL1IMPLIB=i$(TARGET) -SHL1USE_EXPORTS=name -SHL1LIBS=$(LIB1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME=$(TARGET) - -# --- .res file ---------------------------------------------------------- - -RES1FILELIST=\ - $(SRS)$/core_strings.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - - -# --- formula UI core (forui) ----------------------------------- -LIB2TARGET=$(SLB)$/$(TARGET2).lib -LIB2FILES=\ - $(SLB)$/uidlg.lib \ - $(SLB)$/ui_resource.lib - -SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) - -SHL2STDLIBS= \ - $(SFXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(CPPULIB) \ - $(SO2LIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= \ - $(LB)$/ifor.lib -SHL2DEPN=$(LB)$/i$(TARGET).lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL2STDLIBS+= \ - -lfor$(DLLPOSTFIX) -SHL2DEPN=$(SHL1TARGETN) -.ELSE -SHL2STDLIBS+= \ - $(LB)$/ifor.lib -SHL2DEPN=$(LB)$/i$(TARGET).lib -.ENDIF - - -SHL2IMPLIB=i$(TARGET2) -SHL2LIBS=$(LIB2TARGET) -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME=$(SHL2TARGET) -.IF "$(GUI)"=="OS2" -DEFLIB2NAME=$(TARGET2) -.ENDIF - -SHL2USE_EXPORTS=name - -# --- .res file ---------------------------------------------------------- - -RES2FILELIST=\ - $(SRS)$/uidlg.srs - - -RESLIB2NAME=$(TARGET2) -RESLIB2IMAGES=$(PRJ)$/res -RESLIB2SRSFILES=$(RES2FILELIST) - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/for.component - -$(MISC)/for.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - for.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt for.component diff --git a/formula/util/makefile.pmk b/formula/util/makefile.pmk deleted file mode 100755 index db2375e91714..000000000000 --- a/formula/util/makefile.pmk +++ /dev/null @@ -1,42 +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. -# -#************************************************************************* - -# define FORMULA_DLLIMPLEMENTATION (see @ dllapi.h) -CDEFS += -DFORMULA_DLLIMPLEMENTATION - -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" -CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index 83e915bbb6ca..405f201d1058 100644 --- a/fpicker/source/aqua/FPentry.cxx +++ b/fpicker/source/aqua/FPentry.cxx @@ -70,7 +70,7 @@ extern "C" // component_getImplementationEnvironment //------------------------------------------------ -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -80,7 +80,7 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 29eb084335fc..55e4f9afd574 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -55,8 +55,7 @@ static cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index b66cd8ac05a6..b69a12f22bbc 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -76,8 +76,18 @@ namespace svt //-------------------------------------------------------------------- SmartContent::~SmartContent() { - //Do not delete the content. Because the content will be used by the cache. - //DELETEZ( m_pContent ); + /* This destructor originally contained the following blurb: "Do + not delete the content. Because the content will be used by + the cache." This is just plain silly, because it relies on + the provider caching created contents (which is done by + ucbhelper::ContentProviderImplHelper, but we do not actually + expect all providers to use that, right?) Otherwise we are + just leaking memory. + + TODO: If there is real need for caching the content, it must + be done here. + */ + delete m_pContent; } //-------------------------------------------------------------------- @@ -254,8 +264,8 @@ namespace svt Reference< XContent > xParent( xChild->getParent(), UNO_QUERY ); if ( xParent.is() ) { - String aParentURL = String( xParent->getIdentifier()->getContentIdentifier() ); - bRet = ( aParentURL.Len() > 0 && aParentURL != (String)(m_pContent->getURL()) ); + const ::rtl::OUString aParentURL( xParent->getIdentifier()->getContentIdentifier() ); + bRet = ( !aParentURL.isEmpty() && aParentURL != m_pContent->getURL() ); // now we're definately valid m_eState = VALID; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index bda16353eb34..b98b68beedb7 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -329,7 +329,7 @@ namespace void convertStringListToUrls( const String& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) { const sal_Unicode s_cSeparator = -#if defined(WNT) || defined(OS2) +#if defined(WNT) ';' #else ':' @@ -369,7 +369,7 @@ namespace void operator()( String& _rURL ) { INetURLObject aURL( _rURL ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) if ( aURL.getSegmentCount() > 1 ) #endif aURL.removeFinalSlash( ); @@ -2563,7 +2563,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt if ( nPathTokenPos == STRING_NOTFOUND ) { String aDelim( -#if defined(WNT) || defined(OS2) +#if defined(WNT) '\\' #else '/' @@ -2571,12 +2571,6 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt ); nPathTokenPos = aReversePath.Search( aDelim ); -#if defined(OS2) - if ( nPathTokenPos == STRING_NOTFOUND ) - { - nPathTokenPos = aReversePath.Search( '/' ); - } -#endif #if !defined( UNX ) if ( nPathTokenPos == STRING_NOTFOUND ) { diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index d2463dc4c48a..c4dd0ecfd815 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -92,7 +92,7 @@ extern "C" // component_getImplementationEnvironment //------------------------------------------------ -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -102,7 +102,7 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/fpicker/source/unx/kde/kdefpmain.cxx b/fpicker/source/unx/kde/kdefpmain.cxx index 2300fe61a2c4..be4022664014 100644 --- a/fpicker/source/unx/kde/kdefpmain.cxx +++ b/fpicker/source/unx/kde/kdefpmain.cxx @@ -51,10 +51,10 @@ static KCmdLineOptions sOptions[] = int main( int argc, char* argv[] ) { - // we fake the name of the application to have "OpenOffice.org" in the + // we fake the name of the application to have "LibreOffice" in the // title - KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "OpenOffice.org" ), - "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for OpenOffice.org." ), + KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ), + "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for LibreOffice." ), KAboutData::License_LGPL, "(c) 2004, Jan Holesovsky" ); qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk index e1bc4db47d36..20b27d5c7c9a 100644 --- a/fpicker/source/unx/kde/makefile.mk +++ b/fpicker/source/unx/kde/makefile.mk @@ -48,6 +48,10 @@ dummy: CFLAGS+= $(KDE_CFLAGS) +.IF "$(COM)" == "GCC" +CFLAGSCXX+=-Wno-shadow +.ENDIF + # --- Files -------------------------------------------------------- SLOFILES =\ diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx index 0dd047c399f0..2dbf9997f320 100644 --- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx +++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx @@ -51,12 +51,12 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS // the three uno functions that will be exported extern "C" { - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) + SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx index edef224c003e..3518001d265e 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx @@ -150,6 +150,7 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException ); + using cppu::WeakComponentImplHelperBase::disposing; // XServiceInfo diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx index 9a874329281c..bd25db73e8ed 100644 --- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx +++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx @@ -64,7 +64,7 @@ extern "C" // component_getImplementationEnvironment ////////////////////////////////////////////////////////////////////////// -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -98,7 +98,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr // ////////////////////////////////////////////////////////////////////////// -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index beaa3088ff46..b18f24d3f57b 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -95,7 +95,7 @@ extern "C" // component_getImplementationEnvironment //------------------------------------------------ -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -105,7 +105,7 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx index 73a048c21ff7..ce9b292084d5 100644 --- a/fpicker/source/win32/folderpicker/Fopentry.cxx +++ b/fpicker/source/win32/folderpicker/Fopentry.cxx @@ -78,7 +78,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -89,7 +89,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk index 4157d339bd3a..e497e794c185 100644 --- a/fpicker/test/makefile.mk +++ b/fpicker/test/makefile.mk @@ -31,10 +31,6 @@ PRJNAME=SV TARGET=svdem LIBTARGET=NO -.IF "$(GUI)" == "OS2" -TARGETTYPE=GUI -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : svpre.mk diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index d2df1bac7931..d2df1bac7931 100755..100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h index e52133e17889..e52133e17889 100755..100644 --- a/framework/inc/arguments.h +++ b/framework/inc/arguments.h diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index fc279d9dac3d..fc279d9dac3d 100755..100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 05af2f8ce35f..05af2f8ce35f 100755..100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h index 8f4b50cf77e0..8f4b50cf77e0 100755..100644 --- a/framework/inc/fwidllapi.h +++ b/framework/inc/fwidllapi.h diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h index a22303386b68..a22303386b68 100755..100644 --- a/framework/inc/fwkdllapi.h +++ b/framework/inc/fwkdllapi.h diff --git a/framework/inc/general.h b/framework/inc/general.h index f674a3039644..f674a3039644 100755..100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index b5cd1f6a4ac1..db121324ed1c 100755..100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -29,9 +29,7 @@ #define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" #define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG" -#define HID_STATUSBAR "FWK_HID_STATUSBAR" -#define HID_SVX_COMMON_MACRO_ORGANIZER "FWK_HID_SVX_COMMON_MACRO_ORGANIZER" -#define HID_SVX_BASIC_MACRO_ORGANIZER "FWK_HID_SVX_BASIC_MACRO_ORGANIZER" +#define HID_STATUSBAR "FWK_HID_STATUSBAR" #endif // #ifndef _FRAMEWORK_HELPID_HRC diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h index 4d74ea088c2e..4d74ea088c2e 100755..100644 --- a/framework/inc/loadstate.h +++ b/framework/inc/loadstate.h diff --git a/framework/inc/properties.h b/framework/inc/properties.h index c04984cf5aaa..c04984cf5aaa 100755..100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 88ec160e50ec..88ec160e50ec 100755..100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 02b376b9fa2a..02b376b9fa2a 100755..100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h diff --git a/framework/inc/services.h b/framework/inc/services.h index 08c4e24c0795..232d9240810c 100755..100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -53,7 +53,6 @@ namespace framework{ #define SERVICENAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.util.URLTransformer" ) #define SERVICENAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.mozilla.Plugin" ) #define SERVICENAME_BRIDGEFACTORY DECLARE_ASCII("com.sun.star.bridge.BridgeFactory" ) -#define SERVICENAME_INIMANAGER DECLARE_ASCII("com.sun.star.config.INIManager" ) #define SERVICENAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper" ) #define SERVICENAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.framework.LoginDialog" ) #define SERVICENAME_CONFIGURATION DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 83754a884c28..83754a884c28 100755..100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h diff --git a/framework/inc/targets.h b/framework/inc/targets.h index cb5d84b52db1..cb5d84b52db1 100755..100644 --- a/framework/inc/targets.h +++ b/framework/inc/targets.h diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx deleted file mode 100644 index f7e82da58413..000000000000 --- a/framework/source/application/framework.cxx +++ /dev/null @@ -1,257 +0,0 @@ -/* -*- 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 - * - * 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_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include <helper/oinstanceprovider.hxx> -#include <classes/servicemanager.hxx> -#include <macros/debug.hxx> -#include <osl/process.h> - -#include <defines.hxx> - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XFrames.hpp> - -#include <com/sun/star/connection/XConnection.hpp> - -#include <com/sun/star/bridge/XBridgeFactory.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include <comphelper/processfactory.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <svtools/unoiface.hxx> -#include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -using namespace ::rtl ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::connection ; -using namespace ::com::sun::star::bridge ; - -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -#define APPLICATIONNAME "FrameWork" -#define COMMANDARGUMENT_PLUGIN DECLARE_ASCII("-plugin" ) -#define NAME_PLUGINBRIDGE DECLARE_ASCII("mozilla plugin bridge" ) -#define PROTOCOL_PLUGINBRIDGE DECLARE_ASCII("urp" ) - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short normal application - @descr An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3! - On 1 stand the desktop himself as the only one, on 2 are all tasks present ... and then comes frames only. - A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as - set/get of a frame window, component or controller. - - @implements XInterface - XTypeProvider - XServiceInfo - XFramesSupplier - XFrame - XComponent - XStatusIndicatorSupplier - XDispatchProvider - XDispatchProviderInterception - XBrowseHistoryRegistry - XLoadEventListener - XEventListener - XWindowListener - XTopWindowListener - [ XDebugging, if TEST_TREE is defined! ] - @base OMutexMember - OWeakObject - - @devstatus deprecated -*//*-*************************************************************************************************************/ -class FrameWork : public Application -{ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - - public: - void Main(); - - private: - void impl_analyzeCommandArguments(); - - private: - sal_Bool m_bUsePlugIn ; - -}; // class FrameWork - -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// global variables -//_________________________________________________________________________________________________________________ - -FrameWork aFrameWork ; - -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - -//***************************************************************************************************************** -// private methods -//***************************************************************************************************************** -void FrameWork::impl_analyzeCommandArguments() -{ - // First reset all member variables which present states of incoming arguments! - m_bUsePlugIn = sal_False; // depends from "/plugin" - - // Then step over all given arguments and search for supported one. - OUString sArgument ; - sal_uInt32 nCount = osl_getCommandArgCount(); - for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) - { - // If extraction of current argument successfull ... - if ( osl_getCommandArg( nArgument, &sArgument.pData ) == osl_Process_E_None ) - { - // ... search for matching with supported values. - if ( sArgument == COMMANDARGUMENT_PLUGIN ) - { - // We found "/plugin" => set internal equivalent. - m_bUsePlugIn = sal_True; - } - } - } -} - -//_________________________________________________________________________________________________________________ -// main -//_________________________________________________________________________________________________________________ - -void FrameWork::Main() -{ - //------------------------------------------------------------------------------------------------------------- - // a) Initialize ouer application - - // Analyze command arguments. - impl_analyzeCommandArguments(); - - // Create new global servicemanager. - ServiceManager aManager; - Reference< XMultiServiceFactory > xGlobalServiceManager = aManager.getGlobalUNOServiceManager(); - - if ( xGlobalServiceManager.is() == sal_True ) - { - // If it was successful - set in as static value in UNOTOOLS! - setProcessServiceFactory( xGlobalServiceManager ); - - //--------------------------------------------------------------------------------------------------------- - // b) Create root of ouer frame tree - - // Create top of frame hierarchy - the desktop. - Reference< XDesktop > xDesktop( xGlobalServiceManager->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); - // Safe impossible cases - // We need the desktop for working. - LOG_ASSERT( !(xDesktop.is()==sal_False), "FrameWork::Main()\nCan't instanciate desktop!Servicename unknown?\n" ) - - //--------------------------------------------------------------------------------------------------------- - // c) Initialize connection to possible PlugIn dll. - -// OPipeConnection removed, connection to plugin now uses acceptor service - //--------------------------------------------------------------------------------------------------------- - // d) Initialize new task with a HTML-URL in it. - - // Cast desktop to right interface to do this. - Reference< XDispatchProvider > xDispatchProvider( xDesktop, UNO_QUERY ); - // Safe impossible cases. - // Desktop MUST support these interface! - LOG_ASSERT( !(xDispatchProvider.is()==sal_False), "FrameWork::Main()\nDesktop don't support XDispatchProvider interface.\n" ) - if ( xDispatchProvider.is() == sal_True ) - { - // Build URL ... - OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "file://e|/dokumentation/Documentation/projekte/services/inimanager/inimanager/index.html" )); - URL aURL; - aURL.Complete = sURL; - // ... and dispatch it. - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, FRAMETYPE_BLANK, 0 ); - xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); - - // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) - - // Build URL ... - sURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "file://d|/menu.htm" )); - aURL.Complete = sURL; - // ... and dispatch it. - xDispatch = xDispatchProvider->queryDispatch( aURL, FRAMETYPE_BLANK, 0 ); - xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); - - // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) - } - - // Set running-mode for application. - Execute(); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx deleted file mode 100644 index 45a2d0329ff8..000000000000 --- a/framework/source/application/login.cxx +++ /dev/null @@ -1,296 +0,0 @@ -/* -*- 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 - * - * 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_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include <services/logindialog.hxx> -#include <classes/servicemanager.hxx> -#include <macros/generic.hxx> -#include <macros/debug.hxx> -#include <services.h> - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/awt/XDialog.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include <comphelper/processfactory.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <osl/process.h> -#include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> -#include <vcl/event.hxx> -#include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> -#include <vcl/msgbox.hxx> - -#include <stdio.h> - -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -#define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file -#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager -#define SEPERATOR "\n" // used to seperate parts in temp. file - -#define MINARGUMENTCOUNT 1 // count of min. required arguments -#define ARGUMENTFOUND 0 // OUString::compareTo returns 0 if searched string match given one -#define ARGUMENTLENGTH 3 // length of fixed part of any argument to detect it easier! - -#define ARGUMENT_TEMPFILE DECLARE_ASCII("-f=") // we support "-f=c:\temp\test.txt" to write dialog data in temp. file -#define ARGUMENT_DIALOGPARENT DECLARE_ASCII("-p=") // we support "-p=36748322" as window handle of parent for vcl dialog - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -using namespace ::rtl ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; - -//_________________________________________________________________________________________________________________ -// defines -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short implement command application to show login dialog and save his information in temp. file! - @descr We need this temp. file to share informations between our dialog and different processes, which - can't use vcl directly. Caller of this executable give us the file name as an argument - we save - all informations in it - caller can read it and MUST delete temp. file. - This is neccessary for example; to hide the password! - - @implements - - - @base Application -*//*-*************************************************************************************************************/ -class LoginApplication : public Application -{ - //************************************************************************************************************* - // public methods - //************************************************************************************************************* - public: - void Main(); - - //************************************************************************************************************* - // private methods - //************************************************************************************************************* - private: - void impl_parseCommandline(); // search supported arguments on command line - - //************************************************************************************************************* - // private variables - //************************************************************************************************************* - private: - OString m_sTempFile ; // name of temp. file in system notation - sal_Int32 m_nParentHandle ; // a parent window handle for used vcl dialog - -}; // class LoginApplication - -//_________________________________________________________________________________________________________________ -// global variables -//_________________________________________________________________________________________________________________ - -LoginApplication gLoginApplication; - -//_________________________________________________________________________________________________________________ -// main -//_________________________________________________________________________________________________________________ - -void LoginApplication::Main() -{ - // Init global uno servicemanager. - ServiceManager aManager; - Reference< XMultiServiceFactory > xServiceManager = aManager.getSharedUNOServiceManager( DECLARE_ASCII("login.rdb") ); - LOG_ASSERT( !(xServiceManager.is()==sal_False), "LoginApplication::Main()\nCould not create uno service manager!\n" ) - - // Parse command line and set found arguments on application member. - impl_parseCommandline(); - LOG_ASSERT( !(m_sTempFile.getLength()<1), "LoginApplication::Main()\nWrong or missing argument for temp. file detected!\n" ) - - // Try to get neccessary dialog service. - // By the way - cast it to interface XPropertySet too - we need it later. - // (define SERVICENAME... comes from defines.hxx!) - Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); - Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY ); - - // Work with valid ressources only! - // Otherwise do nothing ... - if ( - ( xLoginDialog.is() == sal_True ) && - ( xPropertySet.is() == sal_True ) && - ( m_sTempFile.getLength() > 0 ) - ) - { - // Exist a parent window? YES => set right property. - if( m_nParentHandle != 0 ) - { - Any aParentWindow; - aParentWindow <<= m_nParentHandle; - xPropertySet->setPropertyValue( PROPERTYNAME_PARENTWINDOW, aParentWindow ); - } - - Any aConnectionType; - aConnectionType <<= PROPERTYNAME_HTTPS; - xPropertySet->setPropertyValue( PROPERTYNAME_CONNECTIONTYPE, aConnectionType ); - - // Show login dialog and get decision of user. - sal_Bool bDecision = (sal_Bool)(xLoginDialog->execute()); - - OUString sUserName ; - OUString sPassword ; - OUString sServer ; - OUString sConnectionType ; - sal_Int32 nPort=0 ; // We need this default if follow "if"-statement "failed"! - - // If user say "OK" ... get values from dialog. - // If user say "NO" ... leave it. Then we save empty informations later ... - if( bDecision == sal_True ) - { - // defines PROPERTYNAME... comes from logindialog.hxx! - xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME ) >>= sUserName ; - xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD ) >>= sPassword ; - xPropertySet->getPropertyValue( PROPERTYNAME_SERVER ) >>= sServer ; - xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType ; - if( sConnectionType.getLength() > 0 ) - { - xPropertySet->getPropertyValue( sConnectionType ) >>= nPort; - } - } - - // Build string for output. - // At this point it doesnt matter if information exist or not! - // Format of output: "<decision> [0|1] SEPERATOR - // <username> [string] SEPERATOR - // <password> [string] SEPERATOR - // <servername> [string] SEPERATOR - // <port> [int] SEPERATOR" - OUStringBuffer sBuffer( 1000 ); - - if( bDecision == sal_True ) - { - sBuffer.appendAscii( "1" ); - } - else - { - sBuffer.appendAscii( "0" ); - } - sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sUserName ); - sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sPassword ); - sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sServer ); - sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sConnectionType ); - sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( nPort ); - sBuffer.appendAscii ( SEPERATOR ); - - // Write informations in temp. file. - // If given file name isnt valid ... caller will have a problem!!! - // If fil already exist (That's out of specification!!!) we overwrite it everytime. - FILE* pFile = fopen( m_sTempFile.getStr(), "w" ); - LOG_ASSERT( !(pFile==NULL), "LoginApplication::Main()\nCould not open file!\n" ); - if( pFile != NULL ) - { - OString sEncodedOut = U2B_ENC( sBuffer.makeStringAndClear(), TEMPFILE_ENCODING ); - fprintf( pFile, sEncodedOut.getStr() ); - fclose ( pFile ); - } - } -} - -//***************************************************************************************************************** -// private method -//***************************************************************************************************************** -void LoginApplication::impl_parseCommandline() -{ - // Step over all arguments, search for supported ones and try to get his values. - // Set it on our member. Caller of this method must control setted values. - - sal_uInt32 nCount = osl_getCommandArgCount(); - sal_uInt32 nArgument = 0 ; - OUString sArgument ; - OUString sValue ; - - // Warn programmer if argument count isnt ok! - LOG_ASSERT( !(nCount!=MINARGUMENTCOUNT), "LoginApplication::impl_parseCommandline()\nWrong argument count detected!\n" ) - - // Reset all possible argument variables to defaults if someone is missing. - m_sTempFile = OString(); - m_nParentHandle = 0 ; - - // Step over all arguments ... - for( nArgument=0; nArgument<nCount; ++nArgument ) - { - // .. but work with valid ones only! - // Don't check values here. Caller of this method must decide between wrong and allowed values! - osl_getCommandArg( nArgument, &sArgument.pData ); - - //_____________________________________________________________________________________________________ - // Look for "-f=<temp. file name>" - if( sArgument.compareTo( ARGUMENT_TEMPFILE, ARGUMENTLENGTH ) == ARGUMENTFOUND ) - { - sValue = sArgument.copy( ARGUMENTLENGTH ); - m_sTempFile = U2B(sValue); - } - else - //_____________________________________________________________________________________________________ - // Look for "-p=<parent window handle>" - if( sArgument.compareTo( ARGUMENT_DIALOGPARENT, ARGUMENTLENGTH ) == ARGUMENTFOUND ) - { - sValue = sArgument.copy( ARGUMENTLENGTH ); - m_nParentHandle = sValue.toInt32(); - } - } - - // Parent window handle is an optional argument ... but should be used mostly! - // Warn programmer. - LOG_ASSERT( !(m_nParentHandle==0), "Login.exe\nYou should give me a parent window handle!\n" ) -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index e56725288813..2f02cc09b39b 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -225,7 +225,7 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath ) if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) ) aFileURL = rFilePath; - ::osl::FileStatus aStatus( FileStatusMask_FileURL ); + ::osl::FileStatus aStatus( osl_FileStatus_Mask_FileURL ); ::osl::DirectoryItem aItem; if( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aFileURL, aItem ) && ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) ) diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index f52a48ac096a..11627487cd2c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1353,8 +1353,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU // Use graphic class to also support more graphic formats (bmp,png,...) Graphic aGraphic; - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - pGF->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); + rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ); BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 891504adbe71..6ff5c28b3f66 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -651,7 +651,7 @@ namespace framework ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); if ( nElements == 0 ) - throw EmptyUndoStackException( ::rtl::OUString::createFromAscii( "stack is empty" ), getXUndoManager() ); + throw EmptyUndoStackException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stack is empty" )), getXUndoManager() ); aGuard.clear(); // <--- SYNCHRONIZED @@ -1116,7 +1116,7 @@ namespace framework IUndoManager& rUndoManager = m_pImpl->getUndoManager(); if ( rUndoManager.IsUndoEnabled() ) - throw NotLockedException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), m_pImpl->getXUndoManager() ); + throw NotLockedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Undo manager is not locked" )), m_pImpl->getXUndoManager() ); rUndoManager.EnableUndo( true ); // <--- SYNCHRONIZED } diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index a095aa480a3c..04faeb2cf604 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -339,12 +339,11 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... its a check only if (xWindowCheck.is()) { - // --> PB 2007-06-18 #i76867# top and system window is required. + // #i76867# top and system window is required. SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xWindow( xWindowCheck, uno::UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); return ( pWindow && pWindow->IsSystemWindow() ); - // <-- } return sal_False; @@ -381,7 +380,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::lang::XMul xDispatcher->executeDispatch( xProvider, aDockWinCommand, - ::rtl::OUString::createFromAscii("_self"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0, aArgs); } diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 745ce809def6..847766c2a662 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -190,6 +190,7 @@ LayoutManager::~LayoutManager() { Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); m_aAsyncLayoutTimer.Stop(); + delete m_pGlobalSettings; } // Internal helper function @@ -2934,7 +2935,7 @@ throw( RuntimeException ) m_xFrame.clear(); delete m_pGlobalSettings; m_pGlobalSettings = 0; - m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >(); + m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >(); bDisposeAndClear = sal_True; } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 597066fbbb22..defe4e6c7a1b 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -295,7 +295,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() aRowColumnSizes[nCurrDockingArea].clear(); aRowColumnSizes[nCurrDockingArea].push_back( 0 ); - for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ ) + for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter ) { uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY ); if ( xUIElement.is() ) @@ -477,7 +477,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 ); WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == rResourceURL ) { @@ -554,7 +554,7 @@ void ToolbarLayoutManager::destroyToolbars() aWriteLock.unlock(); UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { uno::Reference< lang::XComponent > xComponent( pIter->m_xUIElement, uno::UNO_QUERY ); if ( xComponent.is() ) @@ -578,6 +578,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL ) aUIElement.m_bVisible = true; implts_writeWindowStateData( aUIElement ); implts_setToolbar( aUIElement ); + implts_sortUIElements(); return true; } @@ -621,7 +622,7 @@ void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars ) UIElement aUIElement; SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { if ( implts_readWindowStateData( pIter->m_aName, aUIElement ) && ( pIter->m_bVisible != aUIElement.m_bVisible ) && !pIter->m_bMasterHide ) @@ -644,7 +645,7 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible ) SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement ); if ( pWindow && pIter->m_bFloating ) @@ -667,7 +668,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { pIter->m_bMasterHide = !bVisible; Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement ); @@ -781,7 +782,7 @@ bool ToolbarLayoutManager::dockAllToolbars() ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() && pIter->m_bFloating && pIter->m_bVisible ) @@ -828,7 +829,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) ::std::vector< uno::Reference< ui::XUIFunctionListener > > aListenerArray; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1219,7 +1220,7 @@ void ToolbarLayoutManager::implts_reparentToolbars() if ( pContainerWindow ) { UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -1804,7 +1805,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName ) UIElementVector::iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) return *pIter; @@ -1828,7 +1829,7 @@ UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::X UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1850,7 +1851,7 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const :: uno::Reference< awt::XWindow > xWindow; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -1940,7 +1941,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement ) // Try to find a cascaded position for the new floating window UIElementVector::const_iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1979,7 +1980,7 @@ void ToolbarLayoutManager::implts_sortUIElements() // We have to reset our temporary flags. UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) pIter->m_bUserActive = sal_False; aWriteLock.unlock(); } @@ -2023,7 +2024,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD aWindowVector.reserve(m_aUIElements.size()); xDockAreaWindow = m_xDockAreaWindows[eDockingArea]; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating ) { @@ -2207,7 +2208,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; UIElementVector::iterator pEnd = m_aUIElements.end(); - for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea ) { @@ -3278,7 +3279,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) && ( pIter->m_aName != rUIElement.m_aName )) { @@ -3922,7 +3923,7 @@ throw (uno::RuntimeException) UIElementVector::iterator pIter; WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -4116,7 +4117,7 @@ uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolb { sal_uInt32 nCount(0); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index f1891793fa7a..7b749648d34c 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -26,6 +26,8 @@ #include "MenuItemInfo.hxx" #include "MenuItemStatusListener.hxx" +#include <boost/foreach.hpp> + #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/SystemDependentXWindow.hpp> #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> @@ -113,6 +115,62 @@ using com::sun::star::ui::XModuleUIConfigurationManagerSupplier; using com::sun::star::util::URL; using com::sun::star::util::XURLTransformer; + +namespace +{ + static Sequence<Any> lcl_initArgs(const OUString& sModuleName, const Reference<XFrame> xFrame) + { + // These are the arguments needed for the XPopupMenuController + Sequence<Any> aResult(2); + PropertyValue item; + + item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleName")); + item.Value <<= sModuleName; + aResult[0] <<= item; + + item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Frame")); + item.Value <<= xFrame; + aResult[1] <<= item; + return aResult; + }; + + struct DispatchConnection + { + Reference<XDispatch> m_xDispatch; + URL m_aUrl; + DispatchConnection(Reference<XDispatch> xDispatch, URL aUrl) + : m_xDispatch(xDispatch), m_aUrl(aUrl) + {} + }; +} + +namespace framework { namespace lomenubar +{ + class DispatchRegistry + { + private: + ::std::vector<DispatchConnection> m_vDispatchConnections; + const Reference<XStatusListener> m_xStatusListener; + public: + DispatchRegistry(const Reference<XStatusListener> xStatusListener) + : m_xStatusListener(xStatusListener) + {} + ~DispatchRegistry() + { + BOOST_FOREACH(const DispatchConnection& rConnection, m_vDispatchConnections) + { + rConnection.m_xDispatch->removeStatusListener(m_xStatusListener, rConnection.m_aUrl); + } + } + void Connect(Reference<XDispatch> xDispatch, URL aURL) + { + const DispatchConnection connection(xDispatch, aURL); + m_vDispatchConnections.push_back(connection); + xDispatch->addStatusListener(m_xStatusListener, aURL); + } + }; +}} + // ------------------------ Item callbacks --------------------------- // Item activated. It distpatches the command associated to a given menu item. void @@ -131,9 +189,9 @@ item_about_to_show (DbusmenuMenuitem *item, gpointer user_data) FrameHelper *helper = (FrameHelper*)user_data; Reference < XFrame > xFrame = helper->getFrame (); Reference< XPropertySet > frameProps (xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); - Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString::createFromAscii("private:resource/menubar/menubar")), + Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))), UNO_QUERY); Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY); @@ -142,7 +200,7 @@ item_about_to_show (DbusmenuMenuitem *item, gpointer user_data) return FALSE; } - Reference < XMenu > xMenu(menuPropSet->getPropertyValue(OUString::createFromAscii("XMenuBar")), + Reference < XMenu > xMenu(menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))), UNO_QUERY); if (!xMenu.is()) { @@ -198,31 +256,30 @@ destroy_menu_item_info (gpointer data) FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, DbusmenuServer* server) + : m_xStatusListener(new MenuItemStatusListener(this)) + , m_pDispatchRegistry(new framework::lomenubar::DispatchRegistry(m_xStatusListener)) + , m_xMSF(rServiceManager) + , m_xTrans(m_xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer" ))), UNO_QUERY) + , m_xMM(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"))),UNO_QUERY) + , m_xPCF(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.PopupMenuControllerFactory"))), UNO_QUERY) + , m_xFrame(xFrame) + , m_xdp(xFrame, UNO_QUERY) + , m_args(lcl_initArgs(m_xMM->identify(xFrame), xFrame)) + , m_server(server) + , m_root(NULL) + , m_watcher_set(FALSE) + , m_blockDetach(FALSE) { - m_xMSF = rServiceManager; - this->m_xFrame = xFrame; - this->m_server = server; //Get xUICommands database (to retrieve labels, see FrameJob::getLabelFromCommandURL ()) - Reference < XNameAccess > xNameAccess (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.UICommandDescription")), + Reference < XNameAccess > xNameAccess (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription"))), UNO_QUERY); - m_xMM = Reference < XModuleManager> (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.ModuleManager")), - UNO_QUERY); xNameAccess->getByName(m_xMM->identify(xFrame)) >>= m_xUICommands; - m_xdp = Reference < XDispatchProvider > (xFrame, UNO_QUERY); - m_xTrans = Reference < XURLTransformer > (m_xMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY); - - m_xSL = (XStatusListener*)new MenuItemStatusListener (this); // This initializes the shortcut database getAcceleratorConfigurations (xFrame->getController()->getModel (), m_xMM); - // This information is needed for the dynamic submenus - m_xPCF = Reference < XMultiComponentFactory > (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.PopupMenuControllerFactory")), - UNO_QUERY); - - // This is a hash table that maps Command URLs to MenuItemInfo classes // to cache command information m_commandsInfo = g_hash_table_new_full (g_str_hash, @@ -230,24 +287,6 @@ FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >& rServiceManag g_free, destroy_menu_item_info); - // These are the arguments needed for the XPopupMenuController - m_args = Sequence < Any > (2); - PropertyValue item; - - item.Name = OUString::createFromAscii("ModuleName"); - item.Value <<= m_xMM->identify (xFrame); - m_args[0] <<= item; - - item.Name = OUString::createFromAscii("Frame"); - item.Value <<= xFrame; - m_args[1] <<= item; - - m_root = NULL; - m_watcher_set = FALSE; - - //This variable prevents the helper from being disconnected from the frame - //for special cases of component dettaching like print preview - m_blockDetach = FALSE; } void SAL_CALL @@ -256,6 +295,7 @@ FrameHelper::disposing (const EventObject& /*aEvent*/ ) throw (RuntimeException) FrameHelper::~FrameHelper() { + ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry>().swap(m_pDispatchRegistry); if (m_server) g_object_unref (m_server); @@ -291,12 +331,6 @@ FrameHelper::getFrame () return m_xFrame; } -XStatusListener* -FrameHelper::getStatusListener () -{ - return m_xSL; -} - GHashTable* FrameHelper::getCommandsInfo () { @@ -343,9 +377,9 @@ FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException m_xFrame->removeFrameActionListener (this); Reference< XPropertySet > frameProps (m_xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); - xLayoutManager->showElement (OUString::createFromAscii("private:resource/menubar/menubar")); + xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))); unsigned long xid = getXID(); @@ -447,7 +481,7 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, continue; // We drop the WindowList, doesn't work properly and it's useless anyhow - if (oUCommand.equals (OUString::createFromAscii (".uno:WindowList"))) + if (oUCommand.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:WindowList")))) continue; //We set the default properties (in case it was not visible or a separator) @@ -540,9 +574,9 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, commandURL.Complete = oUCommand; m_xTrans->parseStrict (commandURL); - Reference < XDispatch > xDispatch = m_xdp->queryDispatch (commandURL, OUString(), 0); - if (xDispatch.is()) - xDispatch->addStatusListener (m_xSL, commandURL); + Reference < XDispatch > xDispatch = m_xdp->queryDispatch (commandURL, OUString(), 0); + if(xDispatch.is()) + m_pDispatchRegistry->Connect(xDispatch, commandURL); Reference < XPopupMenu > subPopMenu (xMenu->getPopupMenu (id), UNO_QUERY); @@ -551,7 +585,7 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, if (isSpecialSubmenu (oUCommand)) { Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString::createFromAscii ("DefaultContext")), + Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), UNO_QUERY); Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand, @@ -559,7 +593,7 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, xContext), UNO_QUERY); - Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")), + Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))), UNO_QUERY); if (xRFC.is () && xPO.is ()) @@ -636,16 +670,16 @@ FrameHelper::rebuildMenuFromRoot () { Reference < XFrame > xFrame = getFrame (); Reference < XPropertySet > frameProps (xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager (frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager (frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); - Reference < XUIElement > menuBar (xLayoutManager->getElement (OUString::createFromAscii("private:resource/menubar/menubar")), + Reference < XUIElement > menuBar (xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))), UNO_QUERY); Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY); if (!menuPropSet.is ()) return; - Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString::createFromAscii("XMenuBar")), + Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))), UNO_QUERY); if (!xMenu.is ()) return; @@ -680,15 +714,13 @@ FrameHelper::isSpecialSubmenu (OUString command) void FrameHelper::dispatchCommand (OUString command) { - OUString target = OUString::createFromAscii (""); + OUString target = OUString(RTL_CONSTASCII_USTRINGPARAM("")); Reference < XDispatchHelper > xdh (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), UNO_QUERY); - //g_debug ("%s", OUStringToOString (command, RTL_TEXTENCODING_ASCII_US).getStr()); - // This is a special case, we don't want the helper to be disconnected from the frame // when PrintPreview dettaches. See the frameAction method. - if (command.equals (OUString::createFromAscii (".uno:PrintPreview"))) + if (command.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintPreview")))) { m_blockDetach = TRUE; } @@ -696,18 +728,18 @@ FrameHelper::dispatchCommand (OUString command) // This is a special case for the recentfilelist if (command.matchAsciiL ("vnd.sun.star.popup:RecentFileList", 33, 0)) { - target = OUString::createFromAscii ("_default"); + target = OUString(RTL_CONSTASCII_USTRINGPARAM("_default")); Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString::createFromAscii ("DefaultContext")), + Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), UNO_QUERY); - Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString::createFromAscii (".uno:RecentFileList"), + Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:RecentFileList")), m_args, xContext), UNO_QUERY); Reference < XMenuListener > xML (xRFC, UNO_QUERY); - Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")), + Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))), UNO_QUERY); if (xRFC.is () && xPO.is ()) @@ -736,7 +768,7 @@ FrameHelper::dispatchCommand (OUString command) } if (command.matchAsciiL ("private:factory/", 16, 0)) - target = OUString::createFromAscii ("_blank"); + target = OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")); xdh->executeDispatch (Reference < XDispatchProvider > (m_xFrame, UNO_QUERY), command, @@ -757,14 +789,14 @@ FrameHelper::getAcceleratorConfigurations (Reference < XModel > xModel, this->m_docAccelConf = docAccelConf; //Get module shurtcut database - Reference< XModuleUIConfigurationManagerSupplier > modUISupplier(m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")), + Reference< XModuleUIConfigurationManagerSupplier > modUISupplier(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))), UNO_QUERY); Reference< XUIConfigurationManager > modUIManager = modUISupplier->getUIConfigurationManager(xModuleManager->identify(m_xFrame)); Reference< XAcceleratorConfiguration > modAccelConf(modUIManager->getShortCutManager(), UNO_QUERY); this->m_modAccelConf = modAccelConf; //Get global shortcut database - Reference< XAcceleratorConfiguration > globAccelConf(m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration")), + Reference< XAcceleratorConfiguration > globAccelConf(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration"))), UNO_QUERY); this->m_globAccelConf = globAccelConf; } @@ -821,7 +853,7 @@ FrameHelper::findShortcutForCommand (OUString command) {} //NOTE: For some reason this item does not return its shortcut. Setting manually: - if (command.equals (OUString::createFromAscii (".uno:HelpIndex"))) + if (command.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:HelpIndex")))) { kev.KeyCode = awt::Key::F1; } diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx index a976bace269e..9264f26d2654 100644 --- a/framework/source/lomenubar/FrameHelper.hxx +++ b/framework/source/lomenubar/FrameHelper.hxx @@ -24,24 +24,28 @@ #ifndef __FRAME_HELPER_HXX__ #define __FRAME_HELPER_HXX__ +#include <vector> + +#include <boost/scoped_ptr.hpp> + #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/XMenu.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/FrameAction.hpp> +#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XFrameActionListener.hpp> +#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <cppuhelper/implbase1.hxx> +#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> +#include <com/sun/star/util/XURLTransformer.hpp> +#include <cppuhelper/implbase1.hxx> //#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wignored-qualifiers" @@ -73,6 +77,12 @@ using com::sun::star::util::XURLTransformer; using com::sun::star::ui::XAcceleratorConfiguration; using rtl::OUString; + +namespace framework { namespace lomenubar +{ + class DispatchRegistry; +}} + /* This class is a helper in charge of closing the dbusmenu server when a frame is closed, * and also allows the menuitem callbacks to dispatch commands. */ @@ -80,23 +90,25 @@ using rtl::OUString; class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener > { private: - Reference < XFrame > m_xFrame; - Reference < XMultiServiceFactory > m_xMSF; + const Reference < XStatusListener > m_xStatusListener; + ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry> m_pDispatchRegistry; + const Reference < XMultiServiceFactory > m_xMSF; + const Reference < XURLTransformer > m_xTrans; + const Reference < XModuleManager> m_xMM; + const Reference < XMultiComponentFactory > m_xPCF; + const Reference < XFrame > m_xFrame; + const Reference < XDispatchProvider > m_xdp; + const Sequence < Any > m_args; Reference < XNameAccess > m_xUICommands; DbusmenuServer *m_server; DbusmenuMenuitem *m_root; gboolean m_watcher_set; guint m_watcher; - XStatusListener *m_xSL; - Reference < XURLTransformer > m_xTrans; - Reference < XDispatchProvider > m_xdp; GHashTable *m_commandsInfo; + //This variable prevents the helper from being disconnected from the frame + //for special cases of component dettaching like print preview gboolean m_blockDetach; - //These object/methods are used to recreate dynamic popupmenus - Reference < XMultiComponentFactory > m_xPCF; - Reference < XModuleManager> m_xMM; - Sequence < Any > m_args; gboolean isSpecialSubmenu (OUString command); @@ -131,7 +143,6 @@ class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener > Reference < XFrame > getFrame (); unsigned long getXID (); GHashTable* getCommandsInfo (); - XStatusListener* getStatusListener (); ::rtl::OUString getLabelFromCommandURL (::rtl::OUString); //Menu Related actions diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx index 27b0350a2100..226d0fe8d4d9 100644 --- a/framework/source/lomenubar/FrameJob.cxx +++ b/framework/source/lomenubar/FrameJob.cxx @@ -190,9 +190,9 @@ on_registrar_available (GDBusConnection * /*connection*/, //Hide menubar Reference < XFrame > xFrame = helper->getFrame (); Reference< XPropertySet > frameProps (xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); - xLayoutManager->hideElement (OUString::createFromAscii("private:resource/menubar/menubar")); + xLayoutManager->hideElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))); return; } @@ -209,9 +209,9 @@ on_registrar_unavailable (GDBusConnection * /*connection*/, FrameHelper *helper = (FrameHelper*)user_data; Reference < XFrame > xFrame = helper->getFrame (); Reference< XPropertySet > frameProps (xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); - xLayoutManager->showElement (OUString::createFromAscii("private:resource/menubar/menubar")); + xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))); return; } // ------------------------------- FrameJob -------------------------------------------- @@ -270,7 +270,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame) Reference< XPropertySet > frameProps (xFrame, UNO_QUERY); - Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")), + Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), UNO_QUERY); if (!xLayoutManager.is()) { @@ -278,7 +278,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame) return; } - Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString::createFromAscii("private:resource/menubar/menubar")), + Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))), UNO_QUERY); Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY); @@ -288,7 +288,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame) return; } - Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString::createFromAscii("XMenuBar")), + Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))), UNO_QUERY); if (!xMenu.is ()) diff --git a/framework/source/lomenubar/HACKING b/framework/source/lomenubar/HACKING new file mode 100644 index 000000000000..49d016f32c41 --- /dev/null +++ b/framework/source/lomenubar/HACKING @@ -0,0 +1,99 @@ +LibreOffice DbusMenu Integration Source Code +============================================ +There are three main classes, DesktopJob, FrameJob and FrameHelper implemented +in their respective .cxx/.h files: + +- src/DesktopJob.cxx +- src/DesktopJob.h + +- src/FrameJob.cxx +- src/FrameJob.h + +- src/FrameHelper.cxx +- src/FrameHelper.h + +The first two classes are Jobs executed synchronously on two events, the events +that trigger these jobs are defined in data/Jobs.xcu. Further explanation on +each class can be found below. + +The FrameHelper class performs most of the tasks regarding communication between + +The src/export.cxx code is the entry point for the resulting shared object +that conforms this extension. It exports the information needed to register and +access all the interfaces implemented by the two jobs exported. + +GLib Integration +---------------- +This extension assumes the presence of the GLib mainloop in the application, +it is not recommended its installation on LibreOffice deployments that do not +provide integration with the glib mainloop. + +g_type_init() is called in DesktopJob for safety. + +DesktopJob +---------- +This class is a XJob that is instantiated and executed on LibreOffice startup +just once during the lifetime of the process. + +This class does nothing but trying to acquire the "org.libreoffice.dbusmenu" +busname. Once the executed method returns the object instance is destroyed. + +FrameJob & FrameHelper +---------------------- +This class is a XJob that is instantiated and executed every time a document is +created or loaded. It watches for the presence of the +com.canonical.AppMenu.Registrar well-known D-Bus name. + +Afterwards it creates an instance of the FrameHelper class. FrameHelper is an +XFrameActionListener that subscribes to the XFrame that represents the current +Window. The lifetime of this FrameHelper is bound to the life of the current +document being viewed/edited. + +FrameHelper creates the initial structure of Dbusmenu menuitems, and the +dbusmenu server. If FrameHelper is destroyed, the frame is unregistered and +the server shutdown. It also stops watching com.canonical.AppMenu.Registrar +presence. + +Listening for menu changes - MenuItemInfo & MenuItemStatusListener +------------------------------------------------------------------ +FrameHelper subscribes creates a cache in the commandsInfo GHashTable property. +This cache maps each command URL with a MenuItemInfo object that stores the +current information for a given menu item. + +To listen for menu changes and update the cache, FrameHelper creates an instance +of MenuItemStatusListener per each command url. This listeners update the data +for the respective MenuItemInfo associated to the command URL it is listening +for. The source code for these two classes can be found in the following +respective files: + +- src/MenuItemInfo.h +- src/MenuItemInfo.cxx + +- src/MenuItemStatusListener.h +- src/MenuItemStatusListener.cxx + +Special Popup Menus +------------------- +This is the set of special popup menus: +- .uno:CharFontName +- .uno:FontHeight +- .uno:ObjectMenue +- .uno:InsertPageHeader +- .uno:InsertPageFooter +- .uno:ChangeControlType +- .uno:AvailableToolbars +- .uno:ScriptOrganizer +- .uno:RecentFileList +- .uno:AddDirect +- .uno:AutoPilotMenu + +These menus cannot be introspected as they are created dinamically when the user +clicks on the menu. Therefor they are treated differently, see the usage of +isSpecialSubmenu in the rebuildMenu method from the FrameHelper class. + +In the case of the recent file list, the command URLs provided by this +workaround are not enough to open the document. A workaround for this is present +in the FrameHelper::dispatchCommand method. + +For further reference on this type of submenus follow this link: +http://wiki.services.openoffice.org/wiki/Framework/Tutorial/Popup_Menu_Controller diff --git a/framework/source/lomenubar/Jobs.xcu b/framework/source/lomenubar/Jobs.xcu new file mode 100644 index 000000000000..de2bb6087691 --- /dev/null +++ b/framework/source/lomenubar/Jobs.xcu @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <node oor:name="Jobs"> + <node oor:name="AppMenuDesktopJob" oor:op="replace"> + <prop oor:name="Service"> + <value>org.libreoffice.comp.framework.lomenubar.DesktopJob</value> + </prop> + </node> + <node oor:name="AppMenuFrameJob" oor:op="replace"> + <prop oor:name="Service"> + <value>org.libreoffice.comp.framework.lomenubar.FrameJob</value> + </prop> + </node> + </node> + <node oor:name="Events"> + <node oor:name="OnStartApp" oor:op="replace"> + <node oor:name="JobList"> + <node oor:name="AppMenuDesktopJob" oor:op="replace"/> + </node> + </node> + <node oor:name="onDocumentOpened" oor:op="replace"> + <node oor:name="JobList"> + <node oor:name="AppMenuFrameJob" oor:op="replace"/> + </node> + </node> + <!--node oor:name="OnNew" oor:op="replace"> + <node oor:name="JobList"> + <node oor:name="AppMenuFrameJob" oor:op="replace"/> + </node> + </node--> + + </node> +</oor:component-data> diff --git a/framework/source/lomenubar/MenuItemInfo.cxx b/framework/source/lomenubar/MenuItemInfo.cxx index 641c2c4b2017..cdffa6340b08 100644 --- a/framework/source/lomenubar/MenuItemInfo.cxx +++ b/framework/source/lomenubar/MenuItemInfo.cxx @@ -73,31 +73,31 @@ MenuItemInfo::setVisible (gboolean is_visible) //Getters gchar* -MenuItemInfo::getLabel () +MenuItemInfo::getLabel const() { return m_label; } gboolean -MenuItemInfo::getEnabled () +MenuItemInfo::getEnabled const() { return m_is_enabled; } gint -MenuItemInfo::getCheckState () +MenuItemInfo::getCheckState const() { return m_check_state; } const gchar* -MenuItemInfo::getCheckType () +MenuItemInfo::getCheckType const() { return m_check_type; } gboolean -MenuItemInfo::getVisible () +MenuItemInfo::getVisible const() { return m_is_visible; } diff --git a/framework/source/lomenubar/MenuItemInfo.hxx b/framework/source/lomenubar/MenuItemInfo.hxx index 5699432ef9f6..22c40a9db36b 100644 --- a/framework/source/lomenubar/MenuItemInfo.hxx +++ b/framework/source/lomenubar/MenuItemInfo.hxx @@ -45,10 +45,10 @@ class MenuItemInfo { void setVisible (gboolean is_visible); //Getters - gchar* getLabel (); - gboolean getEnabled (); - gint getCheckState (); - const gchar* getCheckType (); - gboolean getVisible (); + gchar* getLabel const(); + gboolean getEnabled const(); + gint getCheckState const(); + const gchar* getCheckType const(); + gboolean getVisible const(); }; #endif // __MENU_ITEM_INFO_HXX__ diff --git a/framework/source/lomenubar/MenuItemStatusListener.cxx b/framework/source/lomenubar/MenuItemStatusListener.cxx index f5e216dad4a1..6b7f7384f906 100644 --- a/framework/source/lomenubar/MenuItemStatusListener.cxx +++ b/framework/source/lomenubar/MenuItemStatusListener.cxx @@ -6,9 +6,9 @@ using com::sun::star::frame::status::Visibility; MenuItemStatusListener::MenuItemStatusListener (FrameHelper *helper) + : m_helper(helper) { - if (!helper) throw ("FrameHelper cannot be NULL"); - this->m_helper = helper; + OSL_ENSURE(m_helper, "FrameHelper cannot be NULL"); } void SAL_CALL diff --git a/framework/source/lomenubar/MenuItemStatusListener.hxx b/framework/source/lomenubar/MenuItemStatusListener.hxx index df0353739cd7..7fdab64ad23c 100644 --- a/framework/source/lomenubar/MenuItemStatusListener.hxx +++ b/framework/source/lomenubar/MenuItemStatusListener.hxx @@ -19,7 +19,7 @@ class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener > { private: guint16 m_id; - FrameHelper *m_helper; + FrameHelper* const m_helper; public: MenuItemStatusListener (FrameHelper *helper); diff --git a/framework/source/lomenubar/README b/framework/source/lomenubar/README new file mode 100644 index 000000000000..45176349b094 --- /dev/null +++ b/framework/source/lomenubar/README @@ -0,0 +1,15 @@ +LibreOffice Global Menubar Extension for DBusMenu +================================================= + +This library is an extension for LibreOffice that exports the Menubar structure, +actions and shortcuts through the DBusMenu D-Bus interface. If there is a +present DbusMenu client (The Unity panel or the Appmenu applet for GNOME Panel +for instance), LibreOffice will had its menu structure. + +For more information, visit the official website: +http://launchpad.net/lo-menubar + +Known Issues +------------ +- The menubar is shown briefly before it is hidden. +- The LibreOffice Start Center does not hide/export its menu structure. diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index e61ae11c6bd6..c269338b2237 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3443,11 +3443,11 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) sal_uInt64 nFreeSpace = SAL_MAX_UINT64; ::rtl::OUString sBackupPath(SvtPathOptions().GetBackupPath()); - ::osl::VolumeInfo aInfo (VolumeInfoMask_FreeSpace); + ::osl::VolumeInfo aInfo (osl_VolumeInfo_Mask_FreeSpace); ::osl::FileBase::RC aRC = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo); if ( - (aInfo.isValid(VolumeInfoMask_FreeSpace)) && + (aInfo.isValid(osl_VolumeInfo_Mask_FreeSpace)) && (aRC == ::osl::FileBase::E_None ) ) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 60ebf97da0e8..28b56ad32a26 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -91,9 +91,7 @@ #include <rtl/logfile.hxx> #include <vcl/svapp.hxx> -#ifndef __RSC #include <tools/errinf.hxx> -#endif #include <comphelper/extract.hxx> #include <fwkdllapi.h> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index e4d5655ca5f0..6c5a72fd4341 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1859,6 +1859,9 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) // We will die, die and die ... implts_stopWindowListening(); + if (m_xLayoutManager.is()) + lcl_disableLayoutManager(m_xLayoutManager, this); + delete m_pWindowCommandDispatch; // Send message to all listener and forget her references. diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index cdcb26e67f2d..3144df16befa 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -96,7 +96,7 @@ static const char *szLicensePath = "/share/readme"; #ifdef UNX static const char *szUNXLicenseName = "/LICENSE"; static const char *szUNXLicenseExt = ""; -#elif defined(WNT) || defined(OS2) +#elif defined(WNT) static const char *szWNTLicenseName = "/license"; static const char *szWNTLicenseExt = ".txt"; #endif @@ -279,7 +279,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aLangString += aLocale.Variant; } } -#if defined(WNT) || defined(OS2) +#if defined(WNT) ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) + ::rtl::OUString::createFromAscii(szWNTLicenseName) @@ -320,7 +320,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na DirectoryItem aDirItem; if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None) return makeAny(sal_False); - FileStatus aStatus(FileStatusMask_All); + FileStatus aStatus(osl_FileStatus_Mask_All); if (aDirItem.getFileStatus(aStatus) != FileBase::E_None) return makeAny(sal_False); TimeValue aTimeVal = aStatus.getModifyTime(); @@ -442,7 +442,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM { DirectoryItem d; DirectoryItem::get(aLicensePath, d); - FileStatus fs(FileStatusMask_FileSize); + FileStatus fs(osl_FileStatus_Mask_FileSize); d.getFileStatus(fs); sal_uInt64 nBytesRead = 0; sal_uInt64 nPosition = 0; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 6a1c2627bf4d..06848cf28a41 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -62,7 +62,8 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> #include <rtl/logfile.hxx> -#include "svtools/miscopt.hxx" +#include <rtl/instance.hxx> +#include <svtools/miscopt.hxx> using ::rtl::OUString; using ::com::sun::star::uno::Sequence; @@ -91,6 +92,8 @@ static const char IMAGE_FOLDER[] = "images"; static const char BITMAPS_FOLDER[] = "Bitmaps"; static const char IMAGE_EXTENSION[] = ".png"; +static const char ModuleImageList[] = "private:resource/images/moduleimages"; + static const char* IMAGELIST_XML_FILE[] = { "sc_imagelist.xml", @@ -105,27 +108,24 @@ static const char* BITMAP_FILE_NAMES[] = namespace framework { - static char ModuleImageList[] = "private:resource/images/moduleimages"; - static osl::Mutex* pImageListWrapperMutex = 0; static GlobalImageList* pGlobalImageList = 0; static const char* ImageType_Prefixes[ImageType_COUNT] = { - "res/commandimagelist/sc_", - "res/commandimagelist/lc_" + "cmd/sc_", + "cmd/lc_" }; typedef GraphicNameAccess CmdToXGraphicNameAccess; -static osl::Mutex& getGlobalImageListMutex() +namespace { - if ( pImageListWrapperMutex == 0 ) - { - osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; - if ( pImageListWrapperMutex == 0 ) - pImageListWrapperMutex = new osl::Mutex; - } + class theGlobalImageListMutex + : public rtl::Static<osl::Mutex, theGlobalImageListMutex> {}; +} - return *pImageListWrapperMutex; +static osl::Mutex& getGlobalImageListMutex() +{ + return theGlobalImageListMutex::get(); } static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager ) diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 16d4317c2932..a176b3989c63 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -205,8 +205,8 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con // Use graphic class to also support more graphic formats (bmp,png,...) Graphic aGraphic; - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - pGF->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); + rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ); BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f6f59c4e51d6..fceaf63305fb 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -314,6 +314,7 @@ ToolBarManager::~ToolBarManager() void ToolBarManager::Destroy() { + OSL_ASSERT( m_pToolBar != 0 ); ResetableGuard aGuard( m_aLock ); if ( m_bAddedToTaskPaneList ) { @@ -349,6 +350,7 @@ void ToolBarManager::Destroy() m_pToolBar->SetDoubleClickHdl( aEmpty ); m_pToolBar->SetStateChangedHdl( aEmpty ); m_pToolBar->SetDataChangedHdl( aEmpty ); + m_pToolBar->SetCommandHdl( aEmpty ); m_pToolBar = 0; } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 2de8f244f778..682fe67d8aaa 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -515,6 +515,8 @@ throw( SAXException, RuntimeException ) if ( m_pExternalImages ) m_pExternalImages->Insert( pItem, m_pExternalImages->Count() ); + else + delete pItem; } break; diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 253083d7e9e8..3aa22139a4dd 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -29,10 +29,11 @@ #ifndef _LEX_HXX #define _LEX_HXX +#include <boost/ptr_container/ptr_vector.hpp> + #include <hash.hxx> #include <tools/gen.hxx> #include <tools/stream.hxx> -#include <tools/list.hxx> enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT, SVTOKEN_INTEGER, SVTOKEN_STRING, @@ -127,8 +128,6 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ) inline SvToken::SvToken( SVTOKEN_ENUM nTypeP ) : nType( nTypeP ) {} -DECLARE_LIST( SvTokenList, SvToken * ) - class SvTokenStream { sal_uLong nLine, nColumn; @@ -144,8 +143,8 @@ class SvTokenStream SvFileStream * pInStream; SvStream & rInStream; String aFileName; - SvTokenList aTokList; - SvToken * pCurToken; + boost::ptr_vector<SvToken> aTokList; + boost::ptr_vector<SvToken>::iterator pCurToken; void InitCtor(); @@ -192,30 +191,37 @@ public: { nTabSize = nTabSizeP; } sal_uInt16 GetTabSize() const { return nTabSize; } - SvToken * GetToken_PrevAll() - { - SvToken * pRetToken = pCurToken; - if( NULL == (pCurToken = aTokList.Prev()) ) - // current pointer never null - pCurToken = pRetToken; + SvToken* GetToken_PrevAll() + { + boost::ptr_vector<SvToken>::iterator pRetToken = pCurToken; + + // current iterator always valid + if(pCurToken != aTokList.begin()) + --pCurToken; + + return &(*pRetToken); + } + + SvToken* GetToken_NextAll() + { + boost::ptr_vector<SvToken>::iterator pRetToken = pCurToken++; + + if (pCurToken == aTokList.end()) + pCurToken = pRetToken; + + SetMax(); + + return &(*pRetToken); + } + + SvToken* GetToken_Next() + { + // comments get removed initially + return GetToken_NextAll(); + } + + SvToken* GetToken() const { return &(*pCurToken); } - return pRetToken; - } - SvToken * GetToken_NextAll() - { - SvToken * pRetToken = pCurToken; - if( NULL == (pCurToken = aTokList.Next()) ) - // current pointer never null - pCurToken = pRetToken; - SetMax(); - return pRetToken; - } - SvToken * GetToken_Next() - { - // comments get removed initially - return GetToken_NextAll(); - } - SvToken * GetToken() const { return pCurToken; } sal_Bool Read( char cChar ) { if( pCurToken->IsChar() @@ -227,6 +233,7 @@ public: else return sal_False; } + void ReadDelemiter() { if( pCurToken->IsChar() @@ -237,22 +244,29 @@ public: } } - sal_uInt32 Tell() const - { return aTokList.GetCurPos(); } - void Seek( sal_uInt32 nPos ) - { - pCurToken = aTokList.Seek( nPos ); - SetMax(); - } - void SeekRel( sal_Int32 nRelPos ) - { - pCurToken = aTokList.Seek( Tell() + nRelPos ); - SetMax(); - } - void SeekEnd() - { - pCurToken = aTokList.Seek( nMaxPos ); - } + sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); } + + void Seek( sal_uInt32 nPos ) + { + pCurToken = aTokList.begin() + nPos; + SetMax(); + } + + void SeekRel( sal_uInt32 nRelPos ) + { + sal_uInt32 relIdx = Tell() + nRelPos; + + if ( relIdx < aTokList.size()) + { + pCurToken = aTokList.begin()+ (Tell() + nRelPos ); + SetMax(); + } + } + + void SeekEnd() + { + pCurToken = aTokList.begin()+nMaxPos; + } }; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index d4483da3f6c9..a39c7e917d60 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -33,7 +33,6 @@ #include <types.hxx> #include <slot.hxx> #include <vector> -#include <tools/list.hxx> struct SvSlotElement { @@ -44,7 +43,7 @@ struct SvSlotElement , aPrefix( rPrefix ) {} }; -DECLARE_LIST( SvSlotElementList, SvSlotElement* ) +typedef std::vector< SvSlotElement* > SvSlotElementList; class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 8363b19db5cd..b4036ea2ff2d 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -82,6 +82,7 @@ class SvMetaSlot : public SvMetaAttribute void WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList &rList, + size_t nStart, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, @@ -255,6 +256,7 @@ public: sal_uInt16 WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList&, + size_t nStart, const ByteString &, SvIdlDataBase & rBase, SvStream & rOutStm ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 4913c21c4870..e4f405d9e693 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -32,8 +32,8 @@ #include <tools/ref.hxx> #include <basobj.hxx> -class SvSlotElementList; struct SvSlotElement; +typedef std::vector< SvSlotElement* > SvSlotElementList; SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index f02361d57200..04281e3fcff7 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -105,7 +105,6 @@ void SvTokenStream::InitCtor() nLine = nColumn = 0; nBufPos = 0; nTabSize = 4; - pCurToken = NULL; nMaxPos = 0; c = GetNextChar(); FillTokenList(); @@ -115,7 +114,6 @@ SvTokenStream::SvTokenStream( const String & rFileName ) : pInStream( new SvFileStream( rFileName, STREAM_STD_READ | STREAM_NOCREATE ) ) , rInStream( *pInStream ) , aFileName( rFileName ) - , aTokList( 0x8000, 0x8000 ) { InitCtor(); } @@ -124,7 +122,6 @@ SvTokenStream::SvTokenStream( SvStream & rStream, const String & rFileName ) : pInStream( NULL ) , rInStream( rStream ) , aFileName( rFileName ) - , aTokList( 0x8000, 0x8000 ) { InitCtor(); } @@ -132,28 +129,23 @@ SvTokenStream::SvTokenStream( SvStream & rStream, const String & rFileName ) SvTokenStream::~SvTokenStream() { delete pInStream; - SvToken * pTok = aTokList.Last(); - while( pTok ) - { - delete pTok; - pTok = aTokList.Prev(); - } } void SvTokenStream::FillTokenList() { SvToken * pToken = new SvToken(); - aTokList.Insert( pToken, LIST_APPEND ); + aTokList.push_back(pToken); do { if( !MakeToken( *pToken ) ) { - SvToken * p = aTokList.Prev(); - *pToken = SvToken(); - if( p ) + if (!aTokList.empty()) { - pToken->SetLine( p->GetLine() ); - pToken->SetColumn( p->GetColumn() ); + *pToken = SvToken(); + boost::ptr_vector<SvToken>::const_iterator it = aTokList.begin(); + + pToken->SetLine(it->GetLine()); + pToken->SetColumn(it->GetColumn()); } break; } @@ -164,11 +156,11 @@ void SvTokenStream::FillTokenList() else { pToken = new SvToken(); - aTokList.Insert( pToken, LIST_APPEND ); + aTokList.push_back(pToken); } } while( !pToken->IsEof() ); - pCurToken = aTokList.First(); + pCurToken = aTokList.begin(); } void SvTokenStream::SetCharSet( CharSet nSet ) diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index a08e3e430d91..7344eba7fd64 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -443,9 +443,9 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm ) { sal_uInt16 nCount = 0; - for( sal_uLong n = 0; n < rSlotList.Count(); n++ ) + for ( size_t i = 0, n = rSlotList.size(); i < n; ++i ) { - SvSlotElement *pEle = rSlotList.GetObject( n ); + SvSlotElement *pEle = rSlotList[ i ]; SvMetaSlot *pAttr = pEle->xSlot; nCount = nCount + pAttr->WriteSlotParamArray( rBase, rOutStm ); } @@ -459,13 +459,12 @@ sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName, SvStream & rOutStm ) { sal_uInt16 nSCount = 0; - for( sal_uLong n = 0; n < rSlotList.Count(); n++ ) + for ( size_t i = 0, n = rSlotList.size(); i < n; ++i ) { - rSlotList.Seek(n); - SvSlotElement * pEle = rSlotList.GetCurObject(); + SvSlotElement * pEle = rSlotList[ i ]; SvMetaSlot * pAttr = pEle->xSlot; nSCount = nSCount + pAttr->WriteSlotMap( rShellName, nCount + nSCount, - rSlotList, pEle->aPrefix, rBase, + rSlotList, i, pEle->aPrefix, rBase, rOutStm ); } @@ -561,9 +560,9 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName, SvStream & rOutStm ) { // write all attributes - for( sal_uLong n = 0; n < rSlotList.Count(); n++ ) + for ( size_t i = 0, n = rSlotList.size(); i < n; ++i ) { - SvSlotElement *pEle = rSlotList.GetObject( n ); + SvSlotElement *pEle = rSlotList[ i ]; SvMetaSlot *pAttr = pEle->xSlot; pAttr->WriteSlotStubs( rShellName, rList, rOutStm ); } @@ -592,14 +591,14 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SvMetaClassList classList; SvSlotElementList aSlotList; InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase); - for (sal_uInt32 n=0; n<aSlotList.Count(); n++ ) + for ( size_t i = 0, n = aSlotList.size(); i < n; ++i ) { - SvSlotElement *pEle = aSlotList.GetObject( n ); + SvSlotElement *pEle = aSlotList[ i ]; SvMetaSlot *pSlot = pEle->xSlot; - pSlot->SetListPos(n); + pSlot->SetListPos( i ); } - sal_uLong nSlotCount = aSlotList.Count(); + size_t nSlotCount = aSlotList.size(); // write all attributes sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm ); @@ -641,16 +640,16 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) } rOutStm << endl << "};" << endl << "#endif" << endl << endl; - for( sal_uLong n=0; n<aSlotList.Count(); n++ ) + for( size_t i = 0, n = aSlotList.size(); i < n; ++i ) { - aSlotList.Seek(n); - SvSlotElement* pEle = aSlotList.GetCurObject(); + SvSlotElement* pEle = aSlotList[ i ]; SvMetaSlot* pAttr = pEle->xSlot; pAttr->ResetSlotPointer(); } - for ( sal_uLong n=0; n<aSlotList.Count(); n++ ) - delete aSlotList.GetObject(n); + for( size_t i = 0, n = aSlotList.size(); i < n; ++i ) + delete aSlotList[ i ]; + aSlotList.clear(); } void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 8281bce12e61..746fa741af25 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -936,14 +936,14 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, { // get insert position through binary search in slotlist sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue(); - sal_uInt16 nListCount = (sal_uInt16) rList.Count(); + sal_uInt16 nListCount = (sal_uInt16) rList.size(); sal_uInt16 nPos; sal_uLong m; // for inner "for" loop if ( !nListCount ) nPos = 0; else if ( nListCount == 1 ) - nPos = rList.GetObject(0)->xSlot->GetSlotId().GetValue() >= nId ? 0 : 1; + nPos = rList[ 0 ]->xSlot->GetSlotId().GetValue() >= nId ? 0 : 1; else { sal_uInt16 nMid = 0, nLow = 0; @@ -953,7 +953,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, { nMid = (nLow + nHigh) >> 1; DBG_ASSERT( nMid < nListCount, "bsearch ist buggy" ); - int nDiff = (int) nId - (int) rList.GetObject(nMid)->xSlot->GetSlotId().GetValue(); + int nDiff = (int) nId - (int) rList[ nMid ]->xSlot->GetSlotId().GetValue(); if ( nDiff < 0) { if ( nMid == 0 ) @@ -977,16 +977,25 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, DBG_ASSERT( nPos <= nListCount, "nPos too large" ); DBG_ASSERT( nPos == nListCount || nId <= - (sal_uInt16) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(), + (sal_uInt16) rList[ nPos ]->xSlot->GetSlotId().GetValue(), "Successor has lower SlotId" ); DBG_ASSERT( nPos == 0 || nId > - (sal_uInt16) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(), + (sal_uInt16) rList[ nPos-1 ]->xSlot->GetSlotId().GetValue(), "Predecessor has higher SlotId" ); DBG_ASSERT( nPos+1 >= nListCount || nId < - (sal_uInt16) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(), + (sal_uInt16) rList[ nPos+1 ]->xSlot->GetSlotId().GetValue(), "Successor has lower SlotId" ); - rList.Insert( new SvSlotElement( this, rPrefix ), nPos ); + if ( nPos < rList.size() ) + { + SvSlotElementList::iterator it = rList.begin(); + std::advance( it, nPos ); + rList.insert( it, new SvSlotElement( this, rPrefix ) ); + } + else + { + rList.push_back( new SvSlotElement( this, rPrefix ) ); + } // iron out EnumSlots SvMetaTypeEnum * pEnum = NULL; @@ -1052,12 +1061,12 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, pLinkedSlot = pFirstEnumSlot; // concatenate slaves among themselves - rList.Seek((sal_uLong)0); xEnumSlot = pFirstEnumSlot; + size_t i = 0; SvSlotElement *pEle; do { - pEle = rList.Next(); + pEle = ( ++i < rList.size() ) ? rList[ i ] : NULL; if ( pEle && pEle->xSlot->pLinkedSlot == this ) { xEnumSlot->pNextSlot = pEle->xSlot; @@ -1136,6 +1145,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName, void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList& rSlotList, + size_t nStart, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ) { @@ -1192,14 +1202,17 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, { // look for the next slot with the same StateMethod like me // the slotlist is set to the current slot - SvSlotElement * pEle = rSlotList.Next(); + size_t i = nStart; + SvSlotElement* pEle = ( ++i < rSlotList.size() ) ? rSlotList[ i ] : NULL; pNextSlot = pEle ? &pEle->xSlot : NULL; while ( pNextSlot ) { if ( !pNextSlot->pNextSlot && - pNextSlot->GetStateMethod() == GetStateMethod() ) + pNextSlot->GetStateMethod() == GetStateMethod() + ) { break; - pEle = rSlotList.Next(); + } + pEle = ( ++i < rSlotList.size() ) ? rSlotList[ i ] : NULL; pNextSlot = pEle ? &pEle->xSlot : NULL; } @@ -1207,14 +1220,15 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, { // There is no slot behind me that has the same ExecMethod. // So I search for the first slot with it (could be myself). - pEle = rSlotList.First(); + i = 0; + pEle = rSlotList.empty() ? NULL : rSlotList[ i ]; pNextSlot = pEle ? &pEle->xSlot : NULL; while ( pNextSlot != this ) { if ( !pNextSlot->pEnumValue && pNextSlot->GetStateMethod() == GetStateMethod() ) break; - pEle = rSlotList.Next(); + pEle = ( ++i < rSlotList.size() ) ? rSlotList[ i ] : NULL; pNextSlot = pEle ? &pEle->xSlot : NULL; } } @@ -1436,6 +1450,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList& rSlotList, + size_t nStart, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ) @@ -1456,7 +1471,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 n nSCount = (sal_uInt16)pType->GetAttrCount(); } - WriteSlot( rShellName, nCount, slotId, rSlotList, rPrefix, rBase, rOutStm ); + WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rPrefix, rBase, rOutStm ); return nSCount; } diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index a1e2fd37d773..0c7a66e7aa70 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -90,7 +90,7 @@ sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool b return 0 == aF2.Kill(); } -#if defined( UNX ) || defined( PM2 ) || defined (__MINGW32__) || defined( OS2 ) +#if defined( UNX ) || defined (__MINGW32__) int main ( int argc, char ** argv) { #else diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 06241d4cd2d6..be48fac9bd46 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -49,7 +49,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class Flushable { @@ -57,7 +56,6 @@ public: virtual void Flush() = 0; }; -/////////////////////////////////////////////////////////////////////////// class FlushListener : public cppu::WeakImplHelper2 @@ -95,7 +93,6 @@ public: virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// class SpellCache : public Flushable @@ -124,7 +121,6 @@ public: bool CheckWord( const ::rtl::OUString& rWord, LanguageType nLang ); }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index e88a0c6615a5..e8c4c41b4d2e 100644 --- a/linguistic/inc/linguistic/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx @@ -42,8 +42,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// - class HyphenatedWord : public cppu::WeakImplHelper1 < @@ -95,8 +93,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PossibleHyphens : public cppu::WeakImplHelper1 < @@ -137,10 +133,6 @@ public: void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; } void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; } }; - - -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx index 543429758b82..c32c70437de2 100644 --- a/linguistic/inc/linguistic/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx @@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { namespace linguistic { -/////////////////////////////////////////////////////////////////////////// // PropertyChgHelper // Base class for all XPropertyChangeListener members of the // various lingu services. @@ -60,7 +59,6 @@ namespace linguistic // Flags for type of events allowed to be launched #define AE_SPELLCHECKER 1 #define AE_HYPHENATOR 2 -//#define AE_THESAURUS 4 typedef cppu::WeakImplHelper2 < @@ -161,8 +159,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PropertyHelper_Thes : public PropertyChgHelper { @@ -184,8 +180,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - class PropertyHelper_Spell : public PropertyChgHelper { @@ -235,7 +229,6 @@ public: sal_Bool IsSpellCapitalization() const { return bResIsSpellCapitalization; } }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Hyphen : public PropertyChgHelper @@ -281,8 +274,6 @@ public: sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; } }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 3b6f1fa653c7..055016e60f75 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace frame { class LocaleDataWrapper; -/////////////////////////////////////////////////////////////////////////// + #define SN_GRAMMARCHECKER "com.sun.star.linguistic2.Proofreader" #define SN_GRAMMARCHECKINGITERATOR "com.sun.star.linguistic2.ProofreadingIterator" #define SN_SPELLCHECKER "com.sun.star.linguistic2.SpellChecker" @@ -94,14 +94,11 @@ namespace linguistic #define DIC_ERR_UNKNOWN 3 #define DIC_ERR_NOT_EXISTS 4 -/////////////////////////////////////////////////////////////////////////// ::osl::Mutex & GetLinguMutex(); LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ); -/////////////////////////////////////////////////////////////////////////// - rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ); inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc) @@ -116,12 +113,8 @@ inline ByteString OU2BS(const ::rtl::OUString &rText, rtl_TextEncoding nEnc) rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ); -/////////////////////////////////////////////////////////////////////////// - sal_Int32 LevDistance( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ); -/////////////////////////////////////////////////////////////////////////// - ::com::sun::star::lang::Locale CreateLocale( LanguageType eLang ); @@ -138,8 +131,6 @@ LanguageType LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > &rLocaleSeq ); -/////////////////////////////////////////////////////////////////////////// - // checks if file pointed to by rURL is readonly // and may also check return if such a file exists or not sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 ); @@ -147,7 +138,6 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 ); // checks if a file with the given URL exists sal_Bool FileExists( const String &rURL ); -/////////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDictionaryWriteablePath(); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL ); @@ -162,8 +152,6 @@ String GetWritableDictionaryURL( const String &rDicName ); String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rPaths ); -/////////////////////////////////////////////////////////////////////////// - sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ); ::com::sun::star::uno::Reference< @@ -172,7 +160,6 @@ sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ) ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); @@ -188,7 +175,6 @@ sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage ); sal_Bool HasDigits( const ::rtl::OUString &rText ); sal_Bool IsNumeric( const String &rText ); -/////////////////////////////////////////////////////////////////////////// ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties(); @@ -196,7 +182,6 @@ sal_Bool IsNumeric( const String &rText ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, const ::com::sun::star::uno::Reference< @@ -221,12 +206,9 @@ sal_uInt8 AddEntryToDic( sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList ); -/////////////////////////////////////////////////////////////////////////// -// // AppExitLstnr: // virtual base class that calls it AtExit function when the application // (ie the Desktop) is about to terminate -// class AppExitListener : public cppu::WeakImplHelper1 @@ -254,8 +236,6 @@ public: virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 8cfe95ac4789..f6922dacc4fa 100644 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.hxx @@ -39,7 +39,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class ThesaurusMeaning : @@ -77,7 +76,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 1093b363314d..c1b59ed974be 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -85,7 +85,6 @@ using ::rtl::OUString; #define SN_HCD_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" -/////////////////////////////////////////////////////////////////////////// void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { if (rMainURL.Len() == 0) @@ -130,8 +129,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) if (!xParser.is()) return; - // get filter - //ConvDicXMLImport *pImport = new ConvDicXMLImport( this, rMainURL ); //!! keep a reference until everything is done to //!! ensure the proper lifetime of the object uno::Reference < xml::sax::XDocumentHandler > xFilter( @@ -195,7 +192,6 @@ sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvTy } -/////////////////////////////////////////////////////////////////////////// ConvDic::ConvDic( const String &rName, @@ -733,7 +729,6 @@ uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static() return aSNS; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index ad7bb42be498..f33ad751f91b 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -51,12 +51,8 @@ class SvStream; -/////////////////////////////////////////////////////////////////////////// - sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType ); -/////////////////////////////////////////////////////////////////////////// - struct StrLT { bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const @@ -81,7 +77,6 @@ typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; typedef boost::unordered_multimap< const rtl::OUString, sal_Int16, rtl::OUStringHash, StrEQ > PropTypeMap; -/////////////////////////////////////////////////////////////////////////// class ConvDic : public ::cppu::WeakImplHelper4 @@ -174,7 +169,6 @@ inline ::rtl::OUString ConvDic::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.ConvDic" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index d4878227824d..b240d13e03a6 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -68,7 +68,6 @@ using ::rtl::OUString; #define SN_CONV_DICTIONARY_LIST "com.sun.star.linguistic2.ConversionDictionaryList" -/////////////////////////////////////////////////////////////////////////// bool operator == ( const Locale &r1, const Locale &r2 ) { @@ -77,7 +76,6 @@ bool operator == ( const Locale &r1, const Locale &r2 ) r1.Variant == r2.Variant; } -/////////////////////////////////////////////////////////////////////////// String GetConvDicMainURL( const String &rDicName, const String &rDirectoryURL ) { @@ -97,7 +95,6 @@ String GetConvDicMainURL( const String &rDicName, const String &rDirectoryURL ) return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } -/////////////////////////////////////////////////////////////////////////// class ConvDicNameContainer : public cppu::WeakImplHelper1 @@ -393,7 +390,6 @@ void ConvDicNameContainer::AddConvDics( } } -/////////////////////////////////////////////////////////////////////////// namespace { @@ -426,9 +422,6 @@ ConvDicList::ConvDicList() : ConvDicList::~ConvDicList() { - // NameContainer will deleted when the reference xNameContainer - // is destroyed. - // delete pNameContainer; if (!bDisposing && pNameContainer) pNameContainer->FlushDics(); @@ -680,7 +673,6 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() } -/////////////////////////////////////////////////////////////////////////// uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) @@ -709,6 +701,5 @@ void * SAL_CALL ConvDicList_getFactory( return pRet; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index cd6f1b75b834..f5f4c74360d8 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -43,7 +43,6 @@ class ConvDicNameContainer; -/////////////////////////////////////////////////////////////////////////// class ConvDicList : public cppu::WeakImplHelper3 @@ -117,7 +116,6 @@ inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.ConvDicList" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 017f930a39cb..56ddd94f4487 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -75,7 +75,6 @@ using ::rtl::OUString; #define CONV_TYPE_HANGUL_HANJA "Hangul / Hanja" #define CONV_TYPE_SCHINESE_TCHINESE "Chinese simplified / Chinese traditional" -/////////////////////////////////////////////////////////////////////////// static const OUString ConversionTypeToText( sal_Int16 nConversionType ) { @@ -97,7 +96,6 @@ static sal_Int16 GetConversionTypeFromText( const String &rText ) return nRes; } -/////////////////////////////////////////////////////////////////////////// class ConvDicXMLImportContext : public SvXMLImportContext @@ -204,7 +202,6 @@ public: ConvDic * GetDic() { return GetConvDicImport().GetDic(); } }; -/////////////////////////////////////////////////////////////////////////// void ConvDicXMLImportContext::Characters(const OUString & /*rChars*/) { @@ -216,8 +213,6 @@ void ConvDicXMLImportContext::Characters(const OUString & /*rChars*/) */ //collapsing not done yet! - // warning-free code: since the result is not used there is no need for trimming... - //const OUString &rChars2 = rChars.trim(); } SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( @@ -232,7 +227,6 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( return pContext; } -//////////////////////////////////////// void ConvDicXMLDictionaryContext_Impl::StartElement( const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) @@ -254,10 +248,6 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( GetConvDicImport().SetLanguage( nLanguage ); GetConvDicImport().SetConversionType( nConversionType ); - //!! hack to stop the parser from reading the rest of the file !! - //!! when only the header (language, conversion type) is needed !! -// if (GetConvDicImport().GetDic() == 0) -// throw uno::RuntimeException(); } SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( @@ -272,7 +262,6 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( return pContext; } -//////////////////////////////////////// SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -305,7 +294,6 @@ void ConvDicXMLEntryTextContext_Impl::StartElement( } } -//////////////////////////////////////// SvXMLImportContext * ConvDicXMLRightTextContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -329,7 +317,6 @@ void ConvDicXMLRightTextContext_Impl::EndElement() } -/////////////////////////////////////////////////////////////////////////// sal_Bool ConvDicXMLExport::Export() { @@ -421,7 +408,6 @@ void ConvDicXMLExport::_ExportContent() return A2OU( "com.sun.star.lingu2.ConvDicXMLExport" ); } -/////////////////////////////////////////////////////////////////////////// void SAL_CALL ConvDicXMLImport::startDocument(void) throw( xml::sax::SAXException, uno::RuntimeException ) @@ -458,6 +444,5 @@ OUString SAL_CALL ConvDicXMLImport::getImplementationName() return A2OU( "com.sun.star.lingu2.ConvDicXMLImport" ); } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index b9b280ccaf0f..c93965d65dcf 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -45,16 +45,12 @@ class ConvDic; -/////////////////////////////////////////////////////////////////////////// class ConvDicXMLExport : public SvXMLExport { ConvDic &rDic; sal_Bool bSuccess; -protected: - //void ExportNodes(const SmNode *pIn, int nLevel); - public: ConvDicXMLExport( ConvDic &rConvDic, const rtl::OUString &rFileName, @@ -129,7 +125,6 @@ public: void SetConversionType( sal_Int16 nType ) { nConversionType = nType; } }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index a7af9e7ba6a1..14c0ce2f2853 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -39,13 +39,11 @@ class SvStream; -/////////////////////////////////////////////////////////////////////////// typedef boost::shared_ptr< SvStream > SvStreamPtr; namespace css = ::com::sun::star; -/////////////////////////////////////////////////////////////////////////// struct LangSvcEntries { @@ -116,7 +114,6 @@ struct LangSvcEntries_Thes : public LangSvcEntries LangSvcEntries_Thes( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; -/////////////////////////////////////////////////////////////////////////// // virtual base class for the different dispatchers class LinguDispatcher @@ -129,7 +126,6 @@ public: virtual DspType GetDspType() const = 0; }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index a00e52113b47..9339136b9faa 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -63,7 +63,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// #define BUFSIZE 4096 #define VERS2_NOLANGUAGE 1024 @@ -203,7 +202,6 @@ const String GetDicExtension() return String::CreateFromAscii( pDicExt ); } -/////////////////////////////////////////////////////////////////////////// DictionaryNeo::DictionaryNeo() : aDicEvtListeners( GetLinguMutex() ), @@ -1078,7 +1076,6 @@ void SAL_CALL DictionaryNeo::storeToURL( } } -/////////////////////////////////////////////////////////////////////////// DicEntry::DicEntry() { @@ -1152,6 +1149,5 @@ OUString SAL_CALL DicEntry::getReplacementText( ) } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 288682e481ec..8f5e232b724d 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -43,16 +43,11 @@ #include "defs.hxx" #include "linguistic/misc.hxx" - -/////////////////////////////////////////////////////////////////////////// - #define DIC_MAX_ENTRIES 30000 sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg ); const String GetDicExtension(); -/////////////////////////////////////////////////////////////////////////// - class DictionaryNeo : public ::cppu::WeakImplHelper2 < @@ -196,7 +191,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// class DicEntry : public cppu::WeakImplHelper1 @@ -233,7 +227,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 14255d99d349..319cd9d56be8 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -69,7 +69,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg ); @@ -77,7 +76,6 @@ static void AddInternal( const uno::Reference< XDictionary > &rDic, const rtl::OUString& rNew ); static void AddUserData( const uno::Reference< XDictionary > &rDic ); -/////////////////////////////////////////////////////////////////////////// class DicEvtListenerHelper : public cppu::WeakImplHelper1 @@ -184,9 +182,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( || xDicEntry.is(), "lng : missing dictionary entry" ); - // // evaluate DictionaryEvents and update data for next DictionaryListEvent - // DictionaryType eDicType = xDic->getDictionaryType(); DBG_ASSERT(eDicType != DictionaryType_MIXED, "lng : unexpected dictionary type"); @@ -296,7 +292,6 @@ sal_Int16 DicEvtListenerHelper::FlushEvents() } -/////////////////////////////////////////////////////////////////////////// void DicList::MyAppExitListener::AtExit() @@ -643,6 +638,7 @@ void SAL_CALL xDic->removeDictionaryEventListener( xDicEvtLstnrHelper ); } } + xDicEvtLstnrHelper.clear(); } } @@ -695,12 +691,10 @@ void DicList::_CreateDicList() // evaluate list of dictionaries to be activated from configuration - // //! to suppress overwriting the list of active dictionaries in the //! configuration with incorrect arguments during the following //! activation of the dictionaries pDicEvtLstnrHelper->BeginCollectEvents(); - // const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() ); const rtl::OUString *pActiveDic = aActiveDics.getConstArray(); sal_Int32 nLen = aActiveDics.getLength(); @@ -753,9 +747,7 @@ void DicList::SaveDics() } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// rtl::OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) { @@ -814,7 +806,6 @@ void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, return pRet; } -/////////////////////////////////////////////////////////////////////////// xub_StrLen lcl_GetToken( String &rToken, const String &rText, xub_StrLen nPos, const String &rDelim ) @@ -890,7 +881,6 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic ) } } -/////////////////////////////////////////////////////////////////////////// #if defined _MSC_VER #pragma optimize("g",off) @@ -939,6 +929,5 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo return sal_False; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index d81a2cbffc7f..ca8df5a3b2c4 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -47,7 +47,6 @@ class DicEvtListenerHelper; -/////////////////////////////////////////////////////////////////////////// class DicList : public cppu::WeakImplHelper3 @@ -146,7 +145,6 @@ inline ::rtl::OUString DicList::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.DicList" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index a5ca694c678e..26cbb9f1a521 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -84,7 +84,6 @@ static ::rtl::OUString GrammarCheckingIterator_getImplementationName() throw(); static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw(); -////////////////////////////////////////////////////////////////////// // white space list: obtained from the fonts.config.txt of a Linux system. static sal_Unicode aWhiteSpaces[] = @@ -229,7 +228,6 @@ static sal_Int32 lcl_BacktraceWhiteSpaces( const OUString &rText, sal_Int32 nSta return nRes; } -////////////////////////////////////////////////////////////////////// extern "C" void workerfunc (void * gci) { @@ -244,37 +242,6 @@ static lang::Locale lcl_GetPrimaryLanguageOfSentence( return xFlatPara->getLanguageOfText( nStartIndex, 1 ); } -////////////////////////////////////////////////////////////////////// -/* -class MyThread : punlic osl::Thread -{ - void run () - { - DequeueAndCheck(); - } - - void own_terminate () - { - m_bEnd = true; - wait (3000); - terminate (); - } -} - -MyThread m_aQueue; - -vois startGrammarChecking() -{ - if (!m_aQueue.isRunning ()) - m_aQueue.create (); -} - -void stopGrammarChecking () -{ - if (m_aQueue.isRunning ()) - m_aQueue.own_terminate (); -} -*/ GrammarCheckingIterator::GrammarCheckingIterator( const uno::Reference< lang::XMultiServiceFactory > & rxMgr ) : m_xMSF( rxMgr ), @@ -373,9 +340,7 @@ void GrammarCheckingIterator::ProcessResult( } else // paragraph is still unchanged... { - // // mark found errors... - // sal_Int32 nTextLen = rRes.aText.getLength(); bool bBoundariesOk = 0 <= rRes.nStartOfSentencePosition && rRes.nStartOfSentencePosition <= nTextLen && @@ -470,9 +435,7 @@ uno::Reference< linguistic2::XProofreader > GrammarCheckingIterator::GetGrammarC // check supported locales for each grammarchecker if not already done if (!m_bGCServicesChecked) { - //GetAvailableGCSvcs_Impl(); GetConfiguredGCSvcs_Impl(); - //GetMatchingGCSvcs_Impl(); m_bGCServicesChecked = sal_True; } @@ -912,7 +875,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aNotifyListeners.addInterface( xListener ); } return sal_True; @@ -925,7 +887,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aNotifyListeners.removeInterface( xListener ); } return sal_True; @@ -938,9 +899,7 @@ throw (uno::RuntimeException) lang::EventObject aEvt( (linguistic2::XProofreadingIterator *) this ); m_aEventListeners.disposeAndClear( aEvt ); - // // now end the thread... - // m_aRequestEndThread.reset(); // ---- THREAD SAFE START ---- { @@ -981,7 +940,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aEventListeners.addInterface( xListener ); } } @@ -993,7 +951,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aEventListeners.removeInterface( xListener ); } } @@ -1104,116 +1061,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() } } -/* -void GrammarCheckingIterator::GetMatchingGCSvcs_Impl() -{ - GCImplNames_t aTmpGCImplNamesByLang; - try - { - // get node names (locale iso strings) for configured grammar checkers - uno::Reference< container::XNameAccess > xNA( GetUpdateAccess(), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName( A2OU("GrammarCheckers") ), uno::UNO_QUERY_THROW ); - const uno::Sequence< OUString > aGCImplNames( xNA->getElementNames() ); - const OUString *pGCImplNames = aGCImplNames.getConstArray(); - - sal_Int32 nLen = aGCImplNames.getLength(); - for (sal_Int32 i = 0; i < nLen; ++i) - { - uno::Reference< container::XNameAccess > xTmpNA( xNA->getByName( pGCImplNames[i] ), uno::UNO_QUERY_THROW ); - uno::Any aTmp( xTmpNA->getByName( A2OU("Locales") ) ); - uno::Sequence< OUString > aIsoLocaleNames; - if (aTmp >>= aIsoLocaleNames) - { - const OUString *pIsoLocaleNames = aIsoLocaleNames.getConstArray(); - for (sal_Int32 k = 0; k < aIsoLocaleNames.getLength(); ++k) - { - // if there are more grammar checkers for one language, for the time being, - // the last one found here will win... - const LanguageType nLang = MsLangId::convertIsoStringToLanguage( pIsoLocaleNames[k] ); - aTmpGCImplNamesByLang[ nLang ] = pGCImplNames[i]; - } - } - else - { - DBG_ASSERT( 0, "failed to get aImplNames. Wrong type?" ); - } - } - } - catch (uno::Exception &) - { - DBG_ASSERT( 0, "exception caught. Failed to get matching grammar checker services" ); - } - - { - // ---- THREAD SAFE START ---- - ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); - m_aGCImplNamesByLang = aTmpGCImplNamesByLang; - // ---- THREAD SAFE END ---- - } -} -*/ - -/* -void GrammarCheckingIterator::GetAvailableGCSvcs_Impl() -{ - // internal method; will always be called with locked mutex - if (m_xMSF.is()) - { - uno::Reference< container::XContentEnumerationAccess > xEnumAccess( m_xMSF, uno::UNO_QUERY ); - uno::Reference< container::XEnumeration > xEnum; - if (xEnumAccess.is()) - xEnum = xEnumAccess->createContentEnumeration( A2OU( SN_GRAMMARCHECKER ) ); - - if (xEnum.is()) - { - while (xEnum->hasMoreElements()) - { - uno::Any aCurrent = xEnum->nextElement(); - uno::Reference< lang::XSingleComponentFactory > xCompFactory; - uno::Reference< lang::XSingleServiceFactory > xFactory; - - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( m_xMSF, uno::UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - - if ( xContext.is() && - (cppu::extractInterface( xCompFactory, aCurrent ) || - cppu::extractInterface( xFactory, aCurrent )) ) - { - try - { - uno::Reference< linguistic2::XProofreader > xSvc( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); - if (xSvc.is()) - { - OUString aImplName; - uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY ); - if (xInfo.is()) - aImplName = xInfo->getImplementationName(); - DBG_ASSERT( aImplName.getLength(), "empty implementation name" ); - uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, uno::UNO_QUERY ); - DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" ); - if (xSuppLoc.is() && aImplName.getLength() > 0) - { - uno::Sequence< lang::Locale > aLocaleSequence( xSuppLoc->getLocales() ); - // ---- THREAD SAFE START ---- - ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); - m_aGCLocalesByService[ aImplName ] = aLocaleSequence; - m_aGCReferencesByService[ aImplName ] = xSvc; - // ---- THREAD SAFE END ---- - } - } - } - catch (uno::Exception &) - { - DBG_ASSERT( 0, "instantiating grammar checker failed" ); - } - } - } - } - } -} -*/ sal_Bool SAL_CALL GrammarCheckingIterator::supportsService( @@ -1290,7 +1138,6 @@ LinguDispatcher::DspType GrammarCheckingIterator::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// static OUString GrammarCheckingIterator_getImplementationName() throw() @@ -1336,4 +1183,4 @@ void * SAL_CALL GrammarCheckingIterator_getFactory( return pRet; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 4707088a7cfb..aab04dd6f0ae 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -50,7 +50,6 @@ #include "defs.hxx" -////////////////////////////////////////////////////////////////////// struct FPEntry @@ -79,7 +78,6 @@ struct FPEntry }; -/////////////////////////////////////////////////////////////////////////// class GrammarCheckingIterator: @@ -110,10 +108,6 @@ class GrammarCheckingIterator: typedef std::map< XComponent *, ::rtl::OUString > DocMap_t; DocMap_t m_aDocIdMap; - // parameter ::rtl::OUString --> implementation name - // parameter ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > --> list of locales supported by service -// typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > > GCLocales_t; -// GCLocales_t m_aGCLocalesByService; // language -> implname mapping typedef std::map< LanguageType, ::rtl::OUString > GCImplNames_t; @@ -132,7 +126,6 @@ class GrammarCheckingIterator: //! beware of initilization order ! struct MyMutex : public rtl::Static< osl::Mutex, MyMutex > {}; - // cppu::OInterfaceContainerHelper m_aEventListeners; cppu::OInterfaceContainerHelper m_aNotifyListeners; @@ -154,8 +147,6 @@ class GrammarCheckingIterator: sal_Int32 GetSuggestedEndOfSentence( const ::rtl::OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale ); void GetConfiguredGCSvcs_Impl(); -// void GetMatchingGCSvcs_Impl(); -// void GetAvailableGCSvcs_Impl(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > GetGrammarChecker( const ::com::sun::star::lang::Locale & rLocale ); ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > GetUpdateAccess() const; @@ -204,7 +195,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 961df73e5a89..a5c1fa11b564 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -59,7 +59,6 @@ using namespace ::utl; using namespace ::rtl; using namespace ::com::sun::star; -//////////////////////////////////////////////////////////// GrammarChecker::GrammarChecker( /*uno::Reference< uno::XComponentContext > const & context*/ ) /*m_xContext(context)*/ @@ -258,7 +257,6 @@ sal_Bool SAL_CALL GrammarChecker::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > GrammarChecker::getSupportedServiceNames_Static( ) throw() { - //osl::Guard< osl::Mutex > aGuard(GetMutex()); uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( "com.sun.star.linguistic2.GrammarChecker" );//SN_LINGU_SERVCICE_MANAGER diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx index e3f8ae352554..d7443530ab0d 100644 --- a/linguistic/source/grammarchecker.hxx +++ b/linguistic/source/grammarchecker.hxx @@ -50,7 +50,6 @@ class GrammarChecker: ::com::sun::star::lang::XServiceInfo > { -// com::sun::star::uno::Reference< uno::XComponentContext > m_xContext; // disallow use of copy c-tor and assignment operator GrammarChecker( const GrammarChecker & ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index bebe9b8259e7..706005a68c62 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -62,7 +62,6 @@ using ::rtl::OUString; #define SN_HH_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" -/////////////////////////////////////////////////////////////////////////// #include <i18nutil/unicode.hxx> #include <com/sun/star/i18n/UnicodeScript.hpp> @@ -100,7 +99,6 @@ sal_Bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) } -/////////////////////////////////////////////////////////////////////////// HHConvDic::HHConvDic( const String &rName, const String &rMainURL ) : ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, sal_True, rMainURL ) @@ -165,6 +163,5 @@ uno::Sequence< OUString > HHConvDic::getSupportedServiceNames_Static() return aSNS; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 5ed6d554fdad..1419e0d78608 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -40,7 +40,6 @@ #include "defs.hxx" #include "convdic.hxx" -/////////////////////////////////////////////////////////////////////////// class HHConvDic : public ConvDic @@ -73,7 +72,6 @@ inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.HHConvDic" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 65bdadfc5f59..d745b10f4d4e 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -60,7 +60,6 @@ using namespace linguistic; using ::rtl::OUString; using ::rtl::OUStringBuffer; -/////////////////////////////////////////////////////////////////////////// HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) @@ -341,7 +340,6 @@ Reference< XHyphenatedWord > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -350,9 +348,6 @@ Reference< XHyphenatedWord > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -480,7 +475,6 @@ Reference< XHyphenatedWord > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -489,9 +483,6 @@ Reference< XHyphenatedWord > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -614,7 +605,6 @@ Reference< XPossibleHyphens > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -623,9 +613,6 @@ Reference< XPossibleHyphens > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -687,8 +674,6 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale, { // modify/add entry LangSvcEntries_Hyph *pEntry = aSvcMap[ nLanguage ].get(); - // only one hypenator can be in use for a language... - //const OUString &rSvcImplName = rSvcImplNames.getConstArray()[0]; if (pEntry) { pEntry->Clear(); @@ -735,6 +720,5 @@ LinguDispatcher::DspType HyphenatorDispatcher::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 75c1976a26eb..520365d0edcf 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -51,7 +51,6 @@ class LngSvcMgr; -/////////////////////////////////////////////////////////////////////////// class HyphenatorDispatcher : public cppu::WeakImplHelper1 @@ -166,7 +165,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index ed6b4e169b7b..d03636db7dad 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -50,7 +50,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHPos, @@ -133,7 +132,6 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling() } -/////////////////////////////////////////////////////////////////////////// PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang, @@ -183,7 +181,6 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() return aOrigHyphenPos; } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 6b4e28c96607..60fead4a3374 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -53,7 +53,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// #define NUM_FLUSH_PROPS 6 @@ -214,7 +213,6 @@ void SAL_CALL FlushListener::propertyChange( } -/////////////////////////////////////////////////////////////////////////// SpellCache::SpellCache() { @@ -259,7 +257,6 @@ void SpellCache::AddWord( const OUString& rWord, LanguageType nLang ) rList.clear(); rList.insert( rWord ); } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 8fa1ff68a42a..b7b2f1546015 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -62,7 +62,6 @@ using namespace com::sun::star::registry; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// // static member intialization @@ -193,8 +192,6 @@ sal_Bool LinguOptions::SetValue( Any &rOld, const Any &rVal, sal_Int32 nWID ) } } -// if (bRes) -// pData->SetModified(); return bRes; } @@ -310,7 +307,6 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) } -/////////////////////////////////////////////////////////////////////////// //! map must be sorted by first entry in alphabetical increasing order. const SfxItemPropertyMapEntry* lcl_GetLinguProps() @@ -498,7 +494,6 @@ void SAL_CALL LinguProps::addVetoableChangeListener( const Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { -// MutexGuard aGuard( GetLinguMutex() ); } void SAL_CALL LinguProps::removeVetoableChangeListener( @@ -506,7 +501,6 @@ void SAL_CALL LinguProps::removeVetoableChangeListener( const Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { -// MutexGuard aGuard( GetLinguMutex() ); } @@ -617,9 +611,7 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// // XServiceInfo OUString SAL_CALL LinguProps::getImplementationName() @@ -681,6 +673,5 @@ void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, return pRet; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 295483a8914d..d0e8ae556496 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -60,10 +60,8 @@ namespace com { namespace sun { namespace star { -/////////////////////////////////////////////////////////////////////////// // LinguOptions // This class represents all Linguistik relevant options. -// class LinguOptions { @@ -95,7 +93,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// // uses templates from <cppuhelper/interfacecontainer.h> @@ -113,7 +110,6 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar std::equal_to< sal_Int32 > > OPropertyListenerContainerHelper; -/////////////////////////////////////////////////////////////////////////// class LinguProps : @@ -180,7 +176,6 @@ inline ::rtl::OUString LinguProps::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.LinguProps" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index e9a27ac81bac..8a5c17c27827 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -56,7 +56,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// static const char *aCH[] = { @@ -170,7 +169,7 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals ) // temporary value bResIsIgnoreControlCharacters = bIsIgnoreControlCharacters; bResIsUseDictionaryList = bIsUseDictionaryList; - // + sal_Int32 nLen = rPropVals.getLength(); if (nLen) { @@ -186,7 +185,6 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals ) pbResVal = &bResIsUseDictionaryList; break; default: ; - //DBG_ASSERT( 0, "unknown property" ); } if (pbResVal) pVal[i].Value >>= *pbResVal; @@ -224,7 +222,6 @@ sal_Bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt default: { bRes = sal_False; - //DBG_ASSERT( 0, "unknown property" ); } } if (pbVal) @@ -346,7 +343,6 @@ sal_Bool SAL_CALL return bRes; } -/////////////////////////////////////////////////////////////////////////// PropertyHelper_Thes::PropertyHelper_Thes( @@ -373,7 +369,6 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // list of properties from the property set to be used // and listened to @@ -563,7 +558,6 @@ sal_Int16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const return 16; } -/////////////////////////////////////////////////////////////////////////// static const char *aHP[] = { @@ -713,7 +707,6 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals ) } } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 24c60b87cc7f..3ddf8f1ee046 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -74,27 +74,19 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory void * ); -//extern void * SAL_CALL GrammarChecker_getFactory -//( -// const sal_Char * pImplName, -// XMultiServiceFactory * pServiceManager, -// void * -//); - -//////////////////////////////////////// + // definition of the two functions that are used to provide the services -// extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = @@ -126,17 +118,9 @@ void * SAL_CALL component_getFactory( pImplName, reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), pRegistryKey ); -/* - if(!pRet) - pRet = GrammarChecker_getFactory( - pImplName, - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); -*/ return pRet; } } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 00c0d96eba86..14216f8f8174 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -63,7 +63,6 @@ using ::rtl::OUString; uno::Sequence< OUString > static GetLangSvcList( const uno::Any &rVal ); uno::Sequence< OUString > static GetLangSvc( const uno::Any &rVal ); -/////////////////////////////////////////////////////////////////////////// static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText ) { @@ -82,7 +81,6 @@ static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const O return bRes; } -/////////////////////////////////////////////////////////////////////////// static uno::Sequence< lang::Locale > GetAvailLocales( const uno::Sequence< OUString > &rSvcImplNames ) @@ -153,7 +151,6 @@ static uno::Sequence< lang::Locale > GetAvailLocales( return aRes; } -/////////////////////////////////////////////////////////////////////////// struct SvcInfo { @@ -186,7 +183,6 @@ sal_Bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const } -/////////////////////////////////////////////////////////////////////////// void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, @@ -275,7 +271,6 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, } -/////////////////////////////////////////////////////////////////////////// class LngSvcMgrListenerHelper : @@ -286,13 +281,10 @@ class LngSvcMgrListenerHelper : > { LngSvcMgr &rMyManager; -// Timer aLaunchTimer; - //cppu::OMultiTypeInterfaceContainerHelper aListeners; ::cppu::OInterfaceContainerHelper aLngSvcMgrListeners; ::cppu::OInterfaceContainerHelper aLngSvcEvtBroadcasters; uno::Reference< linguistic2::XDictionaryList > xDicList; - uno::Reference< uno::XInterface > xMyEvtObj; sal_Int16 nCombinedLngSvcEvt; @@ -302,13 +294,11 @@ class LngSvcMgrListenerHelper : void LaunchEvent( sal_Int16 nLngSvcEvtFlags ); -// DECL_LINK( TimeOut, Timer* ); long Timeout(); public: LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, - const uno::Reference< uno::XInterface > &rxSource, - const uno::Reference< linguistic2::XDictionaryList > &rxDicList ); + const uno::Reference< linguistic2::XDictionaryList > &rxDicList ); // lang::XEventListener virtual void SAL_CALL @@ -342,13 +332,11 @@ public: LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, - const uno::Reference< uno::XInterface > &rxSource, const uno::Reference< linguistic2::XDictionaryList > &rxDicList ) : rMyManager ( rLngSvcMgr ), aLngSvcMgrListeners ( GetLinguMutex() ), aLngSvcEvtBroadcasters ( GetLinguMutex() ), - xDicList ( rxDicList ), - xMyEvtObj ( rxSource ) + xDicList ( rxDicList ) { if (xDicList.is()) { @@ -356,14 +344,6 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( (linguistic2::XDictionaryListEventListener *) this, sal_False ); } - //! The timer is used to 'sum up' different events in order to reduce the - //! number of events forwarded. - //! (This may happen already if a property was changed that has several - //! listeners, and each of them is launching an event of it's own!) - //! Thus this behaviour is necessary to avoid unecessary actions of - //! this objects listeners! -// aLaunchTimer.SetTimeout( 2000 ); -// aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); nCombinedLngSvcEvt = 0; } @@ -389,12 +369,12 @@ long LngSvcMgrListenerHelper::Timeout() { osl::MutexGuard aGuard( GetLinguMutex() ); -// if (&aLaunchTimer == pTimer) { // change event source to LinguServiceManager since the listeners // probably do not know (and need not to know) about the specific // SpellChecker's or Hyphenator's. - linguistic2::LinguServiceEvent aEvtObj( xMyEvtObj, nCombinedLngSvcEvt ); + linguistic2::LinguServiceEvent aEvtObj( + static_cast<com::sun::star::linguistic2::XLinguServiceManager*>(&rMyManager), nCombinedLngSvcEvt ); nCombinedLngSvcEvt = 0; if (rMyManager.pSpellDsp) @@ -416,7 +396,6 @@ long LngSvcMgrListenerHelper::Timeout() void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt ) { nCombinedLngSvcEvt |= nLngSvcEvt; -// aLaunchTimer.Start(); Timeout(); } @@ -453,11 +432,8 @@ void SAL_CALL xRef->processDictionaryListEvent( rDicListEvent ); } - // // "translate" DictionaryList event into linguistic2::LinguServiceEvent - // sal_Int16 nLngSvcEvt = 0; - // sal_Int16 nSpellCorrectFlags = linguistic2::DictionaryListEventFlags::ADD_NEG_ENTRY | linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY | @@ -465,7 +441,7 @@ void SAL_CALL linguistic2::DictionaryListEventFlags::DEACTIVATE_POS_DIC; if (0 != (nDlEvt & nSpellCorrectFlags)) nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN; - // + sal_Int16 nSpellWrongFlags = linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY | linguistic2::DictionaryListEventFlags::DEL_NEG_ENTRY | @@ -473,7 +449,7 @@ void SAL_CALL linguistic2::DictionaryListEventFlags::DEACTIVATE_NEG_DIC; if (0 != (nDlEvt & nSpellWrongFlags)) nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN; - // + sal_Int16 nHyphenateFlags = linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY | linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY | @@ -491,7 +467,8 @@ void SAL_CALL void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16 nLngSvcEvtFlags ) { - linguistic2::LinguServiceEvent aEvt( xMyEvtObj, nLngSvcEvtFlags ); + linguistic2::LinguServiceEvent aEvt( + static_cast<com::sun::star::linguistic2::XLinguServiceManager*>(&rMyManager), nLngSvcEvtFlags ); // pass event on to linguistic2::XLinguServiceEventListener's cppu::OInterfaceIteratorHelper aIt( aLngSvcMgrListeners ); @@ -572,12 +549,11 @@ sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( } -/////////////////////////////////////////////////////////////////////////// -LngSvcMgr::LngSvcMgr() : - utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ), - aEvtListeners ( GetLinguMutex() ) +LngSvcMgr::LngSvcMgr() + : utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Linguistic"))) + , aEvtListeners(GetLinguMutex()) { bDisposing = sal_False; @@ -769,8 +745,7 @@ void LngSvcMgr::GetListenerHelper_Impl() { if (!pListenerHelper) { - pListenerHelper = new LngSvcMgrListenerHelper( *this, - (XLinguServiceManager *) this, linguistic::GetDictionaryList() ); + pListenerHelper = new LngSvcMgrListenerHelper( *this, linguistic::GetDictionaryList() ); xListenerHelper = (linguistic2::XLinguServiceEventListener *) pListenerHelper; } } @@ -1135,10 +1110,6 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp ) uno::Sequence< OUString > aSvcImplNames; if (pValues[i] >>= aSvcImplNames) { -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1182,10 +1153,6 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp ) if (aSvcImplNames.getLength() > 1) aSvcImplNames.realloc(1); -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1229,10 +1196,6 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp ) if (aSvcImplNames.getLength() > 1) aSvcImplNames.realloc(1); -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1272,10 +1235,6 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) uno::Sequence< OUString > aSvcImplNames; if (pValues[i] >>= aSvcImplNames) { -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1521,7 +1480,6 @@ void SAL_CALL osl::MutexGuard aGuard( GetLinguMutex() ); #if OSL_DEBUG_LEVEL > 1 -// const OUString *pImplNames = rServiceImplNames.getConstArray(); #endif LanguageType nLanguage = LocaleToLanguage( rLocale ); @@ -1753,7 +1711,6 @@ static uno::Sequence< OUString > GetLangSvc( const uno::Any &rVal ) } -/////////////////////////////////////////////////////////////////////////// uno::Sequence< OUString > SAL_CALL LngSvcMgr::getConfiguredServices( @@ -1851,7 +1808,7 @@ void SAL_CALL bDisposing = sal_True; // require listeners to release this object - lang::EventObject aEvtObj( (XLinguServiceManager *) this ); + lang::EventObject aEvtObj( static_cast<XLinguServiceManager*>(this) ); aEvtListeners.disposeAndClear( aEvtObj ); if (pListenerHelper) @@ -1992,6 +1949,5 @@ void * SAL_CALL LngSvcMgr_getFactory( } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 2ca73df51749..7054cf1b4455 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -62,7 +62,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class XThesaurus; } } } } -/////////////////////////////////////////////////////////////////////////// class LngSvcMgr : @@ -190,7 +189,6 @@ inline ::rtl::OUString LngSvcMgr::getImplementationName_Static() } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 73a19fe6d466..2f2df5e2f4a4 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -75,7 +75,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// //!! multi-thread safe mutex for all platforms !! struct LinguMutex : public rtl::Static< osl::Mutex, LinguMutex > @@ -87,7 +86,6 @@ osl::Mutex & GetLinguMutex() return LinguMutex::get(); } -/////////////////////////////////////////////////////////////////////////// LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) { @@ -104,7 +102,6 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) return aLclDtaWrp; } -/////////////////////////////////////////////////////////////////////////// /** returns text-encoding used for ByteString unicode String conversion @@ -176,7 +173,6 @@ rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ) return nEncoding; } -/////////////////////////////////////////////////////////////////////////// static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) { @@ -184,7 +180,6 @@ static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) return nMin < n3 ? nMin : n3; } -/////////////////////////////////////////////////////////////////////////// class IntArray2D { @@ -266,7 +261,6 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ) return nDist; } -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUseDicList( const PropertyValues &rProperties, const uno::Reference< XPropertySet > &rxProp ) @@ -459,7 +453,6 @@ sal_uInt8 AddEntryToDic( } -/////////////////////////////////////////////////////////////////////////// LanguageType LocaleToLanguage( const Locale& rLocale ) { @@ -519,7 +512,6 @@ uno::Sequence< sal_Int16 > return aLangs; } -/////////////////////////////////////////////////////////////////////////// sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) { @@ -551,7 +543,6 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) return bRes; } -/////////////////////////////////////////////////////////////////////////// static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUString &rRplc, @@ -707,7 +698,6 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars( } -/////////////////////////////////////////////////////////////////////////// static CharClass & lcl_GetCharClass() @@ -880,7 +870,6 @@ sal_Bool IsNumeric( const String &rText ) } -/////////////////////////////////////////////////////////////////////////// uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName ) { @@ -932,7 +921,6 @@ uno::Reference< XDictionary > GetIgnoreAllList() return xRes; } -/////////////////////////////////////////////////////////////////////////// AppExitListener::AppExitListener() { @@ -990,7 +978,6 @@ void SAL_CALL AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ ) throw(frame::TerminationVetoException, RuntimeException) { - //MutexGuard aGuard( GetLinguMutex() ); } @@ -1006,7 +993,6 @@ void SAL_CALL } } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index b8c0e1727b09..6895eae9bff8 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// sal_Bool FileExists( const String &rMainURL ) { @@ -72,7 +71,6 @@ sal_Bool FileExists( const String &rMainURL ) return bExists; } -/////////////////////////////////////////////////////////////////////////// rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) { @@ -87,7 +85,6 @@ rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) return aRes; } -/////////////////////////////////////////////////////////////////////////// static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( const rtl::OUString &rPathPrefix, diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 3ab2eeb3a0bd..97f96ce227b4 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -60,7 +60,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// // ProposalList: list of proposals for misspelled words // The order of strings in the array should be left unchanged because the // spellchecker should have put the more likely suggestions at the top. @@ -68,7 +67,6 @@ using ::rtl::OUString; // Removing entries is done by assigning the empty string. // The sequence is constructed from all non empty strings in the original // while maintaining the order. -// class ProposalList { std::vector< OUString > aVec; @@ -82,7 +80,6 @@ class ProposalList public: ProposalList() {} - //size_t Size() const { return aVec.size(); } size_t Count() const; void Prepend( const OUString &rText ); void Append( const OUString &rNew ); @@ -185,9 +182,6 @@ void ProposalList::Remove( const OUString &rText ) } } - -/////////////////////////////////////////////////////////////////////////// - sal_Bool SvcListHasLanguage( const LangSvcEntries_Spell &rEntry, LanguageType nLanguage ) @@ -210,9 +204,6 @@ sal_Bool SvcListHasLanguage( return bHasLanguage; } -/////////////////////////////////////////////////////////////////////////// - - SpellCheckerDispatcher::SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) { @@ -408,9 +399,6 @@ sal_Bool SpellCheckerDispatcher::isValid_Impl( // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); while (i < nLen && (!bTmpResValid || sal_False == bTmpRes)) { @@ -594,9 +582,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); sal_Int32 nNumSugestions = -1; while (i < nLen && (!bTmpResValid || xTmpRes.is())) @@ -681,12 +666,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( // list of proposals found (to be checked against entries of // neagtive dictionaries) ProposalList aProposalList; -// Sequence< OUString > aProposals; sal_Int16 eFailureType = -1; // no failure if (xRes.is()) { aProposalList.Append( xRes->getAlternatives() ); -// aProposals = xRes->getAlternatives(); eFailureType = xRes->getFailureType(); } Reference< XDictionaryList > xDList; @@ -869,6 +852,4 @@ void SpellCheckerDispatcher::FlushSpellCache() pCache->Flush(); } -/////////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 5b50b5d621d7..9ae9cd45456b 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -53,7 +53,6 @@ class LngSvcMgr; -/////////////////////////////////////////////////////////////////////////// class SpellCheckerDispatcher : public cppu::WeakImplHelper2 @@ -158,7 +157,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index fce7a4fea03f..3bc4ce100451 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -55,7 +55,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// #define MAX_PROPOSALS 40 @@ -236,14 +235,12 @@ Sequence< OUString > MergeProposalSeqs( pMerged[ nIndex++ ] = pAlt[ i ]; } } - //DBG_ASSERT(nIndex == nCountNew, "wrong number of proposals"); aMerged.realloc( nIndex ); } return aMerged; } -/////////////////////////////////////////////////////////////////////////// SpellAlternatives::SpellAlternatives() @@ -362,7 +359,6 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt ) } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 9cd6f0854cc9..7e4f72308597 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -52,7 +52,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// static sal_Bool SvcListHasLanguage( const Sequence< Reference< XThesaurus > > &rRefs, @@ -71,7 +70,6 @@ static sal_Bool SvcListHasLanguage( return bHasLanguage; } -/////////////////////////////////////////////////////////////////////////// ThesaurusDispatcher::ThesaurusDispatcher() @@ -280,6 +278,5 @@ LinguDispatcher::DspType ThesaurusDispatcher::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 48a8e0e65c60..dabd278a8926 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -54,7 +54,6 @@ #include "lngopt.hxx" -/////////////////////////////////////////////////////////////////////////// class ThesaurusDispatcher : public cppu::WeakImplHelper1 @@ -124,7 +123,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index bed6421fb0a7..218e5ce2af89 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -48,7 +48,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// ThesaurusMeaning::ThesaurusMeaning(const OUString &rText, @@ -77,7 +76,6 @@ uno::Sequence< OUString > SAL_CALL ThesaurusMeaning::querySynonyms() } */ -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index f9b3441889d2..62f4b215ecba 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -54,7 +54,6 @@ using ::rtl::OUString; #define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) -/////////////////////////////////////////////////////////////////////////// PropertyChgHelper::PropertyChgHelper( @@ -177,7 +176,6 @@ sal_Bool SAL_CALL return bRes; } -/////////////////////////////////////////////////////////////////////////// static const char *aSP[] = { @@ -369,6 +367,5 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) } } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index fc8798bff215..b5cf94f84a48 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.hxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; -/////////////////////////////////////////////////////////////////////////// // PropertyChgHelper // virtual base class for all XPropertyChangeListener members of the // various lingu services. @@ -117,7 +116,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Spell : @@ -167,7 +165,6 @@ public: BOOL IsSpellCapitalization() const { return bResIsSpellCapitalization; } }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index 1fb80047fa11..85e218da1ef5 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.cxx @@ -38,9 +38,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//////////////////////////////////////// // declaration of external RegEntry-functions defined by the service objects -// extern sal_Bool SAL_CALL SpellChecker_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); @@ -50,9 +48,7 @@ extern void * SAL_CALL SpellChecker_getFactory( XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ); -//////////////////////////////////////// // definition of the two functions that are used to provide the services -// extern "C" { @@ -63,13 +59,13 @@ sal_Bool SAL_CALL component_writeInfo( return SpellChecker_writeInfo( pServiceManager, pRegistryKey ); } -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = SpellChecker_getFactory( @@ -82,6 +78,5 @@ void * SAL_CALL component_getFactory( } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 992e545b12a0..bed18d9df855 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -54,7 +54,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// BOOL operator == ( const Locale &rL1, const Locale &rL2 ) { @@ -63,7 +62,6 @@ BOOL operator == ( const Locale &rL1, const Locale &rL2 ) rL1.Variant == rL2.Variant; } -/////////////////////////////////////////////////////////////////////////// SpellChecker::SpellChecker() : @@ -365,7 +363,6 @@ void SAL_CALL { Reference< XPropertySet > xPropSet; rArguments.getConstArray()[0] >>= xPropSet; - //rArguments.getConstArray()[1] >>= xDicList; //! Pointer allows for access of the non-UNO functions. //! And the reference to the UNO-functions while increasing @@ -418,9 +415,7 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// OUString SAL_CALL SpellChecker::getImplementationName() throw(RuntimeException) @@ -507,6 +502,5 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index d15a57d34c08..bc85186a07d0 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; -/////////////////////////////////////////////////////////////////////////// class SpellChecker : @@ -141,9 +140,7 @@ public: removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); - //////////////////////////////////////////////////////////// // Service specific part - // // XServiceInfo virtual OUString SAL_CALL @@ -169,7 +166,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw() } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index 37eebe5c2a22..b3a61b8293f2 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -142,7 +142,7 @@ <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/wordbook/$(vlang)" oor:op="fuse"/> + <node oor:name="$(insturl)/share/wordbook" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/wordbook</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 7138636549d6..dc84fb038500 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -342,7 +342,7 @@ <node oor:name=".uno:HelplinesVisible" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Display Guides</value> + <value xml:lang="en-US">~Display Snap Lines</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> @@ -351,7 +351,7 @@ <node oor:name=".uno:HelplinesFront" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Guides to ~Front</value> + <value xml:lang="en-US">Snap Lines to ~Front</value> </prop> </node> <node oor:name=".uno:BeforeObject" oor:op="replace"> @@ -1441,7 +1441,7 @@ <node oor:name=".uno:HelplinesUse" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Snap to Guides</value> + <value xml:lang="en-US">~Snap to Snap Lines</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> @@ -1776,7 +1776,7 @@ <node oor:name=".uno:SnapLinesMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Guides</value> + <value xml:lang="en-US">~Snap Lines</value> </prop> </node> <node oor:name=".uno:MasterPageMenu" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2172bb681a78..7ff694cf93a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2934,7 +2934,7 @@ </node> <node oor:name=".uno:HelplinesMove" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Guides When Moving</value> + <value xml:lang="en-US">Helplines While Moving</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>9</value> diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index e93450a7d0ea..4593983790e0 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,17 +30,17 @@ <node oor:name="ModuleDependendFilterOrder"> <node oor:name="com.sun.star.sheet.SpreadsheetDocument" oor:op="replace" install:module="calc"> <prop oor:name="SortedFilterList"> - <value oor:separator=";">calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;DIF;dBase;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;Rich Text Format (StarCalc);StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;SYLK;Text - txt - csv (StarCalc);HTML (StarCalc)</value> + <value oor:separator=";">calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery</value> </prop> </node> <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace" install:module="draw" > <prop oor:name="SortedFilterList"> - <value oor:separator=";">draw8;draw8_template;StarOffice XML (Draw);draw_html_Export;draw_StarOffice_XML_Draw_Template;draw_pdf_Export;DXF - AutoCAD Interchange;draw_flash_Export;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SGF - StarOffice Writer SGF;SGV - StarDraw 2.0;StarDraw 5.0;StarDraw 5.0 Vorlage;StarDraw 3.0;StarDraw 3.0 Vorlage;SVM - StarView Metafile;WMF - MS Windows Metafile</value> + <value oor:separator=";">draw8;draw8_template;StarOffice XML (Draw);draw_StarOffice_XML_Draw_Template;OpenDocument Drawing Flat XML;draw_html_Export;draw_pdf_Export;draw_flash_Export;WordPerfect Graphics;DXF - AutoCAD Interchange;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SGF - StarOffice Writer SGF;SGV - StarDraw 2.0;StarDraw 5.0;StarDraw 5.0 Vorlage;StarDraw 3.0;StarDraw 3.0 Vorlage;SVM - StarView Metafile;WMF - MS Windows Metafile</value> </prop> </node> <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace" install:module="impress"> <prop oor:name="SortedFilterList"> - <value oor:separator=";">impress8;impress8_template;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;MS PowerPoint 97;MS PowerPoint 97 Vorlage;impress_StarOffice_XML_Draw;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage</value> + <value oor:separator=";">impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile</value> </prop> </node> <node oor:name="com.sun.star.formula.FormulaProperties" oor:op="replace" install:module="math"> @@ -55,12 +55,12 @@ </node> <node oor:name="com.sun.star.text.TextDocument" oor:op="replace" install:module="writer"> <prop oor:name="SortedFilterList"> - <value oor:separator=";">writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;Text;Text (encoded);HTML (StarWriter)</value> + <value oor:separator=";">writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;T602Document;Text;Text (encoded);WordPerfect</value> </prop> </node> <node oor:name="com.sun.star.text.WebDocument" oor:op="replace" install:module="writer"> <prop oor:name="SortedFilterList"> - <value oor:separator=";">HTML;writer_web_StarOffice_XML_Writer_Web_Template;writer_web_StarOffice_XML_Writer;StarWriter/Web 5.0 Vorlage/Template;StarWriter/Web 4.0 Vorlage/Template;StarWriter 5.0 (StarWriter/Web);StarWriter 4.0 (StarWriter/Web);StarWriter 3.0 (StarWriter/Web);Text (StarWriter/Web);Text (encoded) (StarWriter/Web)</value> + <value oor:separator=";">HTML;writerweb8_writer;writerweb8_writer_template;writer_web_StarOffice_XML_Writer_Web_Template;writer_web_StarOffice_XML_Writer;StarWriter/Web 5.0 Vorlage/Template;StarWriter/Web 4.0 Vorlage/Template;StarWriter 5.0 (StarWriter/Web);StarWriter 4.0 (StarWriter/Web);StarWriter 3.0 (StarWriter/Web);Text (StarWriter/Web);Text (encoded) (StarWriter/Web)</value> </prop> </node> </node> diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index baf777b00465..8e50f95afaa0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -326,8 +326,8 @@ <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines --> <info> <author>NN</author> - <desc>Specifies whether guides are displayed when moving objects.</desc> - <label>Guides</label> + <desc>Specifies whether helplines are displayed when moving objects.</desc> + <label>Helplines</label> </info> <value>false</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c5616abd4f28..8fa0e7e9f249 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1625,7 +1625,7 @@ <author>TL</author> <desc>Contains the provided dictionaries.</desc> </info> - <value>$(insturl)/share/wordbook/$(vlang)</value> + <value>$(insturl)/share/wordbook</value> </prop> <prop oor:name="Favorite" oor:type="xs:string"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index e3c6c5cd5865..8a77738ac960 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -69,7 +69,7 @@ <info> <author>AF</author> <desc>Indicates whether to show help lines when moving an object.</desc> - <label>Guides when moving</label> + <label>Helplines While Moving</label> </info> <value>false</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index a2590a2d1ce7..123dffc84b87 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -126,7 +126,7 @@ <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display --> <info> <desc>Indicates whether to show help-lines when moving an object.</desc> - <label>Guides when moving</label> + <label>Helplines While Moving</label> </info> <value>false</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs index 42d0f5428d64..c1db417208ae 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs @@ -221,7 +221,7 @@ <desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc> <label>Custom dictionaries</label> </info> - <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;technical.dic</value> + <value oor:separator=";">IgnoreAllList;en-US.dic;en-GB.dic;sl.dic;technical.dic</value> </prop> <prop oor:name="IsUseDictionaryList" oor:type="xs:boolean"> <!-- OldLocation: NEW --> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index cb951f98787a..c125a920bdc7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1301,8 +1301,8 @@ <!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines --> <info> <author>OS</author> - <desc>Displays guides around the frames when frames are moved.</desc> - <label>Guides</label> + <desc>Displays helplines around the frames when frames are moved.</desc> + <label>Helplines</label> </info> <value>false</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index b92e4684c842..b42c61c1c613 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -205,8 +205,8 @@ <!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines --> <info> <author>OS</author> - <desc>Displays guides around the frames when frames are moved.</desc> - <label>Guides</label> + <desc>Displays helplines around the frames when frames are moved.</desc> + <label>Helplines</label> </info> <value>false</value> </prop> diff --git a/oovbaapi/ooo/vba/XDialogsBase.idl b/oovbaapi/ooo/vba/XDialogsBase.idl index fede0e45bc84..77f6bc6dc576 100644 --- a/oovbaapi/ooo/vba/XDialogsBase.idl +++ b/oovbaapi/ooo/vba/XDialogsBase.idl @@ -29,7 +29,6 @@ #include <com/sun/star/uno/XInterface.idl> #include <ooo/vba/XCollection.idl> - #include <ooo/vba/XHelperInterface.idl> //============================================================================= diff --git a/oovbaapi/ooo/vba/XDocumentProperty.idl b/oovbaapi/ooo/vba/XDocumentProperty.idl index d570d3f15fca..fa406f26d831 100644 --- a/oovbaapi/ooo/vba/XDocumentProperty.idl +++ b/oovbaapi/ooo/vba/XDocumentProperty.idl @@ -28,15 +28,9 @@ #ifndef __ooo_vba_XDocumentProperty_idl__ #define __ooo_vba_XDocumentProperty_idl__ -#ifndef __com_sun_star_script_BasicErrorException_idl__ #include <com/sun/star/script/BasicErrorException.idl> -#endif -#ifndef __com_sun_star_script_XDefaultProperty_idl__ #include <com/sun/star/script/XDefaultProperty.idl> -#endif -#ifndef __ooo_vba_XHelperInterface_idl__ #include <ooo/vba/XHelperInterface.idl> -#endif module ooo { module vba { diff --git a/oovbaapi/ooo/vba/XFileDialog.idl b/oovbaapi/ooo/vba/XFileDialog.idl index 1f1012af8d32..6471ae491694 100644 --- a/oovbaapi/ooo/vba/XFileDialog.idl +++ b/oovbaapi/ooo/vba/XFileDialog.idl @@ -30,7 +30,6 @@ #define __ooo_vba_excel_XFileDialog_idl__ #include <com/sun/star/uno/XInterface.idl> - #include <ooo/vba/XFileDialogSelectedItems.idl> //============================================================================= diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html index 9e141afb579b..c32b3a356ca8 100755..100644 --- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html +++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html @@ -1,5611 +1,1707 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
- <title>THIRDPARTYLICENSEREADME</title>
-</head>
-DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT
-</html>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:Bitstram Vera Fonts; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Bitstream, Inc. - <br> -</h2> -<h3>Bitstream Vera Fonts<br> -</h3> - - <em>Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. -Bitstream Vera is a trademark of Bitstream, Inc. <br> - <br> -Permission is hereby granted, free of charge, to any person obtaining a -copy of the fonts accompanying this license (“Fontsâ€) and associated -documentation files (the “Font Softwareâ€), to reproduce and distribute -the Font Software, including without limitation the rights to use, copy, -merge, publish, distribute, and/or sell copies of the Font Software, and -to permit persons to whom the Font Software is furnished to do so, -subject to the following conditions: <br> - <br> -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces.<br> - <br> -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the Fonts, -only if the fonts are renamed to names not containing either the words -“Bitstream†or the word “Veraâ€.<br> - <br> -This License becomes null and void to the extent applicable to Fonts or -Font Software that has been modified and is distributed under the -“Bitstream Vera†names. <br> - <br> -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. <br> - <br> -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. <br> - <br> -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: fonts -at gnome dot org. </em> <br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:BerkeleyDB; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Sleepycat Software - <br> -</h2> -<h3>BerkeleyDB<br> -</h3>> -<pre> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -/* - * Copyright (c) 1990-2004 - * Sleepycat Software. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for the DB software and any - * accompanying software that uses the DB software. The source code - * must either be included in the distribution or be available for no - * more than the cost of distribution plus a nominal fee, and must be - * freely redistributable under reasonable conditions. For an - * executable file, complete source code means the source code for all - * modules it contains. It does not include source code for modules or - * files that typically accompany the major components of the operating - * system on which the executable file runs. - * - * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR - * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ -/* - * Copyright (c) 1990, 1993, 1994, 1995 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * Copyright (c) 1995, 1996 - * The President and Fellows of Harvard University. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - - </pre> - - -</body></html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:Czech thesaurus database; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, - NLPlab, Faculty of Informatics, Masaryk University - <br> -</h2> -<h3>Czech Thesaurus Database<br> -</h3> -Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, - NLPlab, Faculty of Informatics, Masaryk University - <br> - Permission is hereby granted, free of charge, to any person - obtaining - a copy of this data (the "Data"), to deal in the Data without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of - the Data, and to permit persons to whom the Data is furnished to do - so, subject to the following conditions: - <br> - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Data. - <br> - THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION - WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. - - <br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:Generic Polygon Clipper (GPC); Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Alan Murta - <br> -</h2> -<h3>GPC<br> -</h3> -Copyright: (C) 1997-1999, Advanced Interfaces Group, - University of Manchester. -<br> - This software is free for non-commercial use. It may be copied, - modified, and redistributed provided that this copyright notice - is preserved on all copies. The intellectual property rights of - the algorithms used reside with the University of Manchester - Advanced Interfaces Group. -<br> - You may not use this software, in whole or in part, in support - of any commercial product without the express consent of the - author. -<br> - There is no warranty or other guarantee of fitness of this - software for any purpose. It is provided solely "as is". -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: LaTeX dictinary data; Use of any of this software -is governed by the terms of the license below:<br> -<h2>LaTeX3 Project - <br> -</h2> -<h3>LPPL version 1.3b<br> -</h3> - -The LaTeX Project Public License -<br> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -<br> - -<br> -LPPL Version 1.3b 2006-01-07 -<br> - -<br> -Copyright 1999 2002-2006 LaTeX3 Project -<br> - Everyone is allowed to distribute verbatim copies of this - license document, but modification of it is not allowed. - - <br> - -PREAMBLE -<br> -======== -<br> - -The LaTeX Project Public License (LPPL) is the primary license under -which the the LaTeX kernel and the base LaTeX packages are distributed. - -<br> -You may use this license for any work of which you hold the copyright -and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -you may use it with small modifications even if your work is unrelated -to TeX. -<br> - -The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', -below, gives instructions, examples, and recommendations for authors -who are considering distributing their works under this license. -<br> - -This license gives conditions under which a work may be distributed -and modified, as well as conditions under which modified versions of -that work may be distributed. -<br> - -We, the LaTeX3 Project, believe that the conditions below give you -the freedom to make and distribute modified versions of your work -that conform with whatever technical specifications you wish while -maintaining the availability, integrity, and reliability of -that work. If you do not see how to achieve your goal while -meeting these conditions, then read the document `cfgguide.tex' -and `modguide.tex' in the base LaTeX distribution for suggestions. -<br> - - -<br> -DEFINITIONS -<br> -=========== -<br> - -<br> -In this license document the following terms are used: -<br> - - `Work' - Any work being distributed under this License. - - <br> - `Derived Work' - Any work that under any applicable law is derived from the Work. - - <br> - `Modification' - Any procedure that produces a Derived Work under any applicable - law -- for example, the production of a file containing an - original file associated with the Work or a significant portion of - such a file, either verbatim or with modifications and/or - translated into another language. - - <br> - `Modify' - To apply any procedure that produces a Derived Work under any - applicable law. - - <br> - `Distribution' - Making copies of the Work available from one person to another, in - whole or in part. Distribution includes (but is not limited to) - making any electronic components of the Work accessible by - file transfer protocols such as FTP or HTTP or by shared file - systems such as Sun's Network File System (NFS). - - <br> - `Compiled Work' - A version of the Work that has been processed into a form where it - is directly usable on a computer system. This processing may - include using installation facilities provided by the Work, - transformations of the Work, copying of components of the Work, or - other activities. Note that modification of any installation - facilities provided by the Work constitutes modification of the Work. - - <br> - `Current Maintainer' - A person or persons nominated as such within the Work. If there is - no such explicit nomination then it is the `Copyright Holder' under - any applicable law. - - <br> - `Base Interpreter' - A program or process that is normally needed for running or - interpreting a part or the whole of the Work. - - <br> - A Base Interpreter may depend on external components but these - are not considered part of the Base Interpreter provided that each - external component clearly identifies itself whenever it is used - interactively. Unless explicitly specified when applying the - license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the - `LaTeX-format' a program implementing the `TeX language'. - - <br> - - - <br> -CONDITIONS ON DISTRIBUTION AND MODIFICATION -<br> -=========================================== -<br> - -<br> -1. Activities other than distribution and/or modification of the Work -are not covered by this license; they are outside its scope. In -particular, the act of running the Work is not restricted and no -requirements are made concerning any offers of support for the Work. - -<br> -2. You may distribute a complete, unmodified copy of the Work as you -received it. Distribution of only part of the Work is considered -modification of the Work, and no right to distribute such a Derived -Work may be assumed under the terms of this clause. - -<br> -3. You may distribute a Compiled Work that has been generated from a -complete, unmodified copy of the Work as distributed under Clause 2 -above, as long as that Compiled Work is distributed in such a way that -the recipients may install the Compiled Work on their system exactly -as it would have been installed if they generated a Compiled Work -directly from the Work. - -<br> -4. If you are the Current Maintainer of the Work, you may, without -restriction, modify the Work, thus creating a Derived Work. You may -also distribute the Derived Work without restriction, including -Compiled Works generated from the Derived Work. Derived Works -distributed in this manner by the Current Maintainer are considered to -be updated versions of the Work. - -<br> -5. If you are not the Current Maintainer of the Work, you may modify -your copy of the Work, thus creating a Derived Work based on the Work, -and compile this Derived Work, thus creating a Compiled Work based on -the Derived Work. - -<br> -6. If you are not the Current Maintainer of the Work, you may -distribute a Derived Work provided the following conditions are met -for every component of the Work unless that component clearly states -in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. - -<br> - a. If a component of this Derived Work can be a direct replacement - for a component of the Work when that component is used with the - Base Interpreter, then, wherever this component of the Work - identifies itself to the user when used interactively with that - Base Interpreter, the replacement component of this Derived Work - clearly and unambiguously identifies itself as a modified version - of this component to the user when used interactively with that - Base Interpreter. - - <br> - b. Every component of the Derived Work contains prominent notices - detailing the nature of the changes to that component, or a - prominent reference to another file that is distributed as part - of the Derived Work and that contains a complete and accurate log - of the changes. - - <br> - c. No information in the Derived Work implies that any persons, - including (but not limited to) the authors of the original version - of the Work, provide any support, including (but not limited to) - the reporting and handling of errors, to recipients of the - Derived Work unless those persons have stated explicitly that - they do provide such support for the Derived Work. - - <br> - d. You distribute at least one of the following with the Derived Work: - - <br> - 1. A complete, unmodified copy of the Work; - if your distribution of a modified component is made by - offering access to copy the modified component from a - designated place, then offering equivalent access to copy - the Work from the same or some similar place meets this - condition, even though third parties are not compelled to - copy the Work along with the modified component; - - <br> - 2. Information that is sufficient to obtain a complete, - unmodified copy of the Work. - - <br> -7. If you are not the Current Maintainer of the Work, you may -distribute a Compiled Work generated from a Derived Work, as long as -the Derived Work is distributed to all recipients of the Compiled -Work, and as long as the conditions of Clause 6, above, are met with -regard to the Derived Work. - -<br> -8. The conditions above are not intended to prohibit, and hence do not -apply to, the modification, by any method, of any component so that it -becomes identical to an updated version of that component of the Work as -it is distributed by the Current Maintainer under Clause 4, above. - -<br> -9. Distribution of the Work or any Derived Work in an alternative -format, where the Work or that Derived Work (in whole or in part) is -then produced by applying some process to that format, does not relax or -nullify any sections of this license as they pertain to the results of -applying that process. - -<br> -10. a. A Derived Work may be distributed under a different license - provided that license itself honors the conditions listed in - Clause 6 above, in regard to the Work, though it does not have - to honor the rest of the conditions in this license. - - <br> - b. If a Derived Work is distributed under a different license, that - Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the - restrictions in Clause 6 above, concerning changes from the Work. - - <br> -11. This license places no restrictions on works that are unrelated to -the Work, nor does this license place any restrictions on aggregating -such works with the Work by any means. - -<br> -12. Nothing in this license is intended to, or may be used to, prevent -complete compliance by all parties with all applicable laws. - - -<br> -NO WARRANTY -<br> -=========== -<br> - -<br> -There is no warranty for the Work. Except when otherwise stated in -writing, the Copyright Holder provides the Work `as is', without -warranty of any kind, either expressed or implied, including, but not -limited to, the implied warranties of merchantability and fitness for a -particular purpose. The entire risk as to the quality and performance -of the Work is with you. Should the Work prove defective, you assume -the cost of all necessary servicing, repair, or correction. - -<br> -In no event unless required by applicable law or agreed to in writing -will The Copyright Holder, or any author named in the components of the -Work, or any other party who may distribute and/or modify the Work as -permitted above, be liable to you for damages, including any general, -special, incidental or consequential damages arising out of any use of -the Work or out of inability to use the Work (including, but not limited -to, loss of data, data being rendered inaccurate, or losses sustained by -anyone as a result of any failure of the Work to operate with any other -programs), even if the Copyright Holder or said author or said other -party has been advised of the possibility of such damages. - -<br> - -<br> -MAINTENANCE OF THE WORK -<br> -======================= -<br> - -<br> -The Work has the status `author-maintained' if the Copyright Holder -explicitly and prominently states near the primary copyright notice in -the Work that the Work can only be maintained by the Copyright Holder -or simply that it is `author-maintained'. - -<br> -The Work has the status `maintained' if there is a Current Maintainer -who has indicated in the Work that they are willing to receive error -reports for the Work (for example, by supplying a valid e-mail -address). It is not required for the Current Maintainer to acknowledge -or act upon these error reports. - -<br> -The Work changes from status `maintained' to `unmaintained' if there -is no Current Maintainer, or the person stated to be Current -Maintainer of the work cannot be reached through the indicated means -of communication for a period of six months, and there are no other -significant signs of active maintenance. - -<br> -You can become the Current Maintainer of the Work by agreement with -any existing Current Maintainer to take over this role. - -<br> -If the Work is unmaintained, you can become the Current Maintainer of -the Work through the following steps: - -<br> - 1. Make a reasonable attempt to trace the Current Maintainer (and - the Copyright Holder, if the two differ) through the means of - an Internet or similar search. - - <br> - 2. If this search is successful, then enquire whether the Work - is still maintained. - - <br> - a. If it is being maintained, then ask the Current Maintainer - to update their communication data within one month. - - <br> - b. If the search is unsuccessful or no action to resume active - maintenance is taken by the Current Maintainer, then announce - within the pertinent community your intention to take over - maintenance. (If the Work is a LaTeX work, this could be - done, for example, by posting to comp.text.tex.) - - <br> - 3a. If the Current Maintainer is reachable and agrees to pass - maintenance of the Work to you, then this takes effect - immediately upon announcement. - - <br> - b. If the Current Maintainer is not reachable and the Copyright - Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. - - <br> - 4. If you make an `intention announcement' as described in 2b. above - and after three months your intention is challenged neither by - the Current Maintainer nor by the Copyright Holder nor by other - people, then you may arrange for the Work to be changed so as - to name you as the (new) Current Maintainer. - - <br> - 5. If the previously unreachable Current Maintainer becomes - reachable once more within three months of a change completed - under the terms of 3b) or 4), then that Current Maintainer must - become or remain the Current Maintainer upon request provided - they then update their communication data within one month. - - <br> -A change in the Current Maintainer does not, of itself, alter the fact -that the Work is distributed under the LPPL license. - -<br> -If you become the Current Maintainer of the Work, you should -immediately provide, within the Work, a prominent and unambiguous -statement of your status as Current Maintainer. You should also -announce your new status to the same pertinent community as -in 2b) above. - -<br> - -<br> -WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE -<br> -====================================================== -<br> - -<br> -This section contains important instructions, examples, and -recommendations for authors who are considering distributing their -works under this license. These authors are addressed as `you' in -this section. - -<br> -Choosing This License or Another License -<br> ----------------------------------------- -<br> - -<br> -If for any part of your work you want or need to use *distribution* -conditions that differ significantly from those in this license, then -do not refer to this license anywhere in your work but, instead, -distribute your work under a different license. You may use the text -of this license as a model for your own license, but your license -should not refer to the LPPL or otherwise give the impression that -your work is distributed under the LPPL. - -<br> -The document `modguide.tex' in the base LaTeX distribution explains -the motivation behind the conditions of this license. It explains, -for example, why distributing LaTeX under the GNU General Public -License (GPL) was considered inappropriate. Even if your work is -unrelated to LaTeX, the discussion in `modguide.tex' may still be -relevant, and authors intending to distribute their works under any -license are encouraged to read it. -<br> - -<br> -A Recommendation on Modification Without Distribution -<br> ------------------------------------------------------ -<br> - -<br> -It is wise never to modify a component of the Work, even for your own -personal use, without also meeting the above conditions for -distributing the modified component. While you might intend that such -modifications will never be distributed, often this will happen by -accident -- you may forget that you have modified that component; or -it may not occur to you when allowing others to access the modified -version that you are thus distributing it and violating the conditions -of this license in ways that could have legal implications and, worse, -cause problems for the community. It is therefore usually in your -best interest to keep your copy of the Work identical with the public -one. Many works provide ways to control the behavior of that work -without altering any of its licensed components. -<br> - -<br> -How to Use This License -<br> ------------------------ -<br> - -<br> -To use this license, place in each of the components of your work both -an explicit copyright notice including your name and the year the work -was authored and/or last substantially modified. Include also a -statement that the distribution and/or modification of that -component is constrained by the conditions in this license. -<br> - -Here is an example of such a notice and statement: -<br> - - %% pig.dtx - %% Copyright 2005 M. Y. Name - % - % This work may be distributed and/or modified under the - % conditions of the LaTeX Project Public License, either version 1.3 - % of this license or (at your option) any later version. - % The latest version of this license is in - % http://www.latex-project.org/lppl.txt - % and version 1.3 or later is part of all distributions of LaTeX - % version 2005/12/01 or later. - % - % This work has the LPPL maintenance status `maintained'. - % - % The Current Maintainer of this work is M. Y. Name. - % - % This work consists of the files pig.dtx and pig.ins - % and the derived file pig.sty. - - <br> -Given such a notice and statement in a file, the conditions -given in this license document would apply, with the `Work' referring -to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being -generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' -referring to any `LaTeX-Format', and both `Copyright Holder' and -`Current Maintainer' referring to the person `M. Y. Name'. -<br> - -If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. -However, we recommend that you use `maintained', as the Maintenance -section was added in order to ensure that your Work remains useful to -the community even when you can no longer maintain and support it -yourself. -<br> - -<br> -Derived Works That Are Not Replacements -<br> ---------------------------------------- -<br> - -<br> -Several clauses of the LPPL specify means to provide reliability and -stability for the user community. They therefore concern themselves -with the case that a Derived Work is intended to be used as a -(compatible or incompatible) replacement of the original Work. If -this is not the case (e.g., if a few lines of code are reused for a -completely different task), then clauses 6b and 6d shall not apply. -<br> - - -<br> -Important Recommendations -<br> -------------------------- -<br> - -<br> - Defining What Constitutes the Work - - <br> - The LPPL requires that distributions of the Work contain all the - files of the Work. It is therefore important that you provide a - way for the licensee to determine which files constitute the Work. - This could, for example, be achieved by explicitly listing all the - files of the Work near the copyright notice of each file or by - using a line such as: - - <br> - % This work consists of all files listed in manifest.txt. - - <br> - in that place. In the absence of an unequivocal list it might be - impossible for the licensee to determine what is considered by you - to comprise the Work and, in such a case, the licensee would be - entitled to make reasonable conjectures as to which files comprise - the Work. - - <br> - - - - - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-</head>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product:MS Runtime Libraries; Use of any of this software
-is governed
-by the terms of the license below:<br>
-<h2>Microsoft Corporation
- <br>
-</h2>
-<h3>Runtime Libraries<br>
-</h3>
-Microsoft .NET Framework Redistributable EULA
-<br>
-SUPPLEMENTAL END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE
-<br>
-IMPORTANT:
-<br>
-READ CAREFULLY—
-<br>
-These Microsoft Corporation ("Microsoft")<br>
-operating system components, including any "online" or electronic<br>
-documentation ("OS Components") are subject to the terms and <br>
-conditions of the agreement under which you have licensed the <br>
-applicable Microsoft operating system product ("OS Product") <br>
-described below (each an "End User License Agreement" or "EULA") <br>
-and the terms and conditions of this Supplemental EULA. BY INSTALLING, <br>
-COPYING OR OTHERWISE USING THE OS COMPONENTS, YOU AGREE TO BE BOUND <br>
-BY THE TERMS AND CONDITIONS OF THE APPLICABLE OS PRODUCT EULA AND <br>
-THIS SUPPLEMENTAL EULA. IF YOU DO NOT AGREE TO THESE TERMS AND <br>
-CONDITIONS, DO NOT INSTALL, COPY OR USE THE OS COMPONENTS. <br>
-NOTE: IF YOU DO NOT HAVE A VALID EULA FOR ANY "OS PRODUCT" <br>
-(MICROSOFT WINDOWS 98, WINDOWS ME, WINDOWS NT 4.0 (DESKTOP <br>
-EDITION), WINDOWS 2000 OPERATING SYSTEM, WINDOWS XP PROFESSIONAL <br>
-AND/OR WINDOWS XP HOME EDITION), YOU ARE NOT AUTHORIZED TO INSTALL, <br>
-COPY OR OTHERWISE USE THE OS COMPONENTS AND YOU HAVE NO RIGHTS UNDER <br>
-THIS SUPPLEMENTAL EULA. <br>
-Capitalized terms used in this Supplemental EULA and not otherwise <br>
-defined herein shall have the meanings assigned to them in the <br>
-applicable OS Product EULA. <br>
-General. The OS Components are provided to you by Microsoft to update, <br>
-supplement, or replace existing functionality of the applicable OS <br>
-Product Microsoft grants you a license to use the OS Components <br>
-under the terms and conditions of the OS Product EULA for the
-applicable <br>
-OS Product (which are hereby incorporated by reference) and the terms <br>
-and conditions set forth in this Supplemental EULA, provided that you <br>
-comply with all such terms and conditions. To the extent that any terms <br>
-in this Supplemental EULA conflict with terms in the applicable OS <br>
-Product EULA, the terms of this Supplemental EULA control solely with <br>
-respect to the OS Components. <br>
-Additional Rights and Limitations. <br>
-*If you have multiple validly licensed copies of the applicable OS <br>
-Product(s), you may reproduce, install and use one copy of the OS <br>
-Components as part of such applicable OS Product(s) on all of your <br>
-computers running validly licensed copies of the OS Product(s) <br>
-provided that you use such additional copies of the OS Components <br>
-in accordance with the terms and conditions above. You may not <br>
-disclose the results of any benchmark test of the .NET Framework <br>
-component of the OS Components to any third party without Microsoft's <br>
-prior written approval. Microsoft retains all right, title and<br>
-interest in and to the OS Components. All rights not expressly granted <br>
-are reserved by Microsoft. <br>
-IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY MICROSOFT OR ANY <br>
-OF ITS WHOLLY OWNED SUBSIDIARIES, THE LIMITED WARRANTY (IF ANY) <br>
-INCLUDED IN THE APPLICABLE OS PRODUCT EULA APPLIES TO THE OS COMPONENTS <br>
-PROVIDED THE OS COMPONENTS HAVE BEEN LICENSED BY YOU WITHIN THE TERM OF <br>
-THE LIMITED WARRANTY IN THE APPLICABLE OS PRODUCT EULA. HOWEVER, THIS <br>
-SUPPLEMENTAL EULA DOES NOT EXTEND THE TIME PERIOD FOR WHICH THE LIMITED <br>
-WARRANTY IS PROVIDED. <br>
-IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY AN ENTITY OTHER
-THAN <br>
-MICROSOFT OR ANY OF ITS WHOLLY OWNED SUBSIDIARIES, MICROSOFT DISCLAIMS <br>
-ALL WARRANTIES WITH RESPECT TO THE OS COMPONENTS AS FOLLOWS: <br>
-DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE <br>
-LAW, MICROSOFT AND ITS SUPPLIERS PROVIDE TO YOU THE OS COMPONENTS, AND <br>
-ANY (IF ANY) SUPPORT SERVICES RELATED TO THE OS COMPONENTS ("SUPPORT <br>
-SERVICES") <i>AS IS AND WITH ALL FAULTS;</i> and Microsoft and its
-suppliers <br>
-hereby disclaim with respect to THE os COMPONENTS AND SUPPORT SERVICES <br>
-all warranties and conditions, whether express, implied or statutory, <br>
-including, but not limited to, any (if any) warranties or conditions <br>
-of OR RELATED TO: TITLE, NON-INFRINGEMENT, merchantability, fitness <br>
-for a particular purpose, lack of viruses, accuracy or completeness <br>
-of responses, results, lack of negligence or lack of workmanlike
-effort, <br>
-QUIET ENJOYMENT, QUIET POSSESSION, AND CORRESPONDENCE TO DESCRIPTION. <br>
-The entire risk arising out of use or performance of the OS Components <br>
-AND ANY SUPPORT SERVICES remains with you. <br>
-EXCLUSION OF INCIDENTAL, CONSEQUENTIAL AND CERTAIN OTHER DAMAGES. To <br>
-the maximum extent permitted by applicable law, in no event shall <br>
-Microsoft or its suppliers be liable for any special, incidental, <br>
-indirect, or consequential damages whatsoever (including, but not <br>
-limited to, damages for: loss of profits, LOSS OF confidential or <br>
-other information, business interruption, personal injury, loss of <br>
-privacy, failure to meet any duty (including of good faith or of <br>
-reasonable care), negligence, and any other pecuniary or other loss <br>
-whatsoever) arising out of or in any way related to the use of or <br>
-inability to use the OS Components OR THE SUPPORT SERVICES, OR the <br>
-provision of or failure to provide Support Services, or otherwise <br>
-under or in connection with any provision of this Supplemental EULA, <br>
-even if Microsoft or any supplier has been advised of the possibility <br>
-of such damages. <br>
-LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT <br>
-YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT <br>
-LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL <br>
-DAMAGES), THE ENTIRE LIABILITY OF MICROSOFT AND ANY OF ITS SUPPLIERS <br>
-UNDER ANY PROVISION OF THIS SUPPLEMENTAL EULA AND YOUR EXCLUSIVE <br>
-REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF <br>
-THE AMOUNT ACTUALLY PAID BY YOU FOR THE OS COMPONENTS OR U.S.$5.00. <br>
-THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY <br>
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY <br>
-FAILS ITS ESSENTIAL PURPOSE. <br>
-<br>
-Si vous avez acquis votre produit Microsoft au CANADA, le texte suivant <br>
-vous concerne : <br>
-SI LE PRODUIT OS APPLICABLE VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR <br>
-MICROSOFT OU PAR L'UNE QUELCONQUE DE SES FILIALES À 100%, LA GARANTIE <br>
-LIMITÉE (SI ELLE EXISTE) APPLICABLE EN VERTU DU CONTRAT DE LICENCE <br>
-UTILISATEUR FINAL (« CLUF ») RELATIF À CE PRODUIT OS S'APPLIQUE AUX <br>
-COMPOSANTS SYSTÈME D'EXPLOITATION DE MICROSOFT Y COMPRIS TOUTE <br>
-DOCUMENTATION « EN LIGNE » OU SOUS FORME ÉLECTRONIQUE (LES « <br>
-COMPOSANTS OS »), À CONDITION QUE CEUX-CI VOUS AIENT ÉTÉ CONCÉDÉS <br>
-SOUS LICENCE PENDANT LA DURÉE DE LA GARANTIE LIMITÉE DU CLUF RELATIF <br>
-AU PRODUIT OS APPLICABLE. LE PRÉSENT CLUF SUPPLÉMENTAIRE N'A PAS POUR <br>
-EFFET DE PROROGER LA DURÉE DE CETTE GARANTIE LIMITÉE. <br>
-SI LE PRODUIT OS VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR UNE ENTITÉ AUTRE <br>
-QUE MICROSOFT OU QUE L'UNE QUELCONQUE DE SES FILIALES À 100%, <br>
-MICROSOFT EXCLUT TOUTE GARANTIE RELATIVE AUX COMPOSANTS OS COMME <br>
-CELA EST STIPULÉ CI-APRÈS : <br>
-EXCLUSION DE GARANTIE. DANS TOUTE LA MESURE PERMISE PAR LE DROIT <br>
-APPLICABLE, MICROSOFT ET SES FOURNISSEURS VOUS FOURNISSENT LES <br>
-COMPOSANTS OS, AINSI QUE, LE CAS ÉCHÉANT, TOUT SERVICE D'ASSISTANCE <br>
-RELATIF À CES COMPOSANTS OS (LES "SERVICES D'ASSISTANCE"), « COMME <br>
-TELS ET AVEC TOUS LEURS DEFAUTS ». EN OUTRE, MICROSOFT ET SES <br>
-FOURNISSEURS EXCLUENT PAR LES PRÉSENTES TOUTE AUTRE GARANTIE LÉGALE, <br>
-EXPRESSE OU IMPLICITE, RELATIVE AUX COMPOSANTS OS ET AUX SERVICES <br>
-D'ASSISTANCE, NOTAMMENT (LE CAS ÉCHÉANT), TOUTE GARANTIE : DE
-PROPRIÉTÉ, <br>
-D'ABSENCE DE CONTREFAÇON, DE QUALITÉ, D'ADAPTATION À UN USAGE <br>
-PARTICULIER, D'ABSENCE DE VIRUS, DE PRÉCISION, D'EXHAUSTIVITÉ DES <br>
-RÉPONSES, DES RÉSULTATS OBTENUS, D'ABSENCE DE NÉGLIGENCE, OU DE <br>
-DÉFAUT DE FABRICATION, DE JOUISSANCE PAISIBLE, D'ABSENCE DE TROUBLE <br>
-DE POSSESSION ET DE CONFORMITÉ À LA DESCRIPTION. VOUS ASSUMEZ <br>
-L'ENSEMBLE DES RISQUES DÉCOULANT DE L'UTILISATION OU DU FONCTIONNEMENT <br>
-DES COMPOSANTS OS ET DES SERVICES D'ASSISTANCE. <br>
-EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES ACCESSOIRES, INDIRECTS <br>
-ET CERTAINS AUTRES TYPES DE DOMMAGES. DANS TOUTE LA MESURE PERMISE <br>
-PAR LE DROIT APPLICABLE, MICROSOFT OU SES FOURNISSEURS NE POURRONT EN <br>
-AUCUN CAS ÊTRE TENUS RESPONSABLES DE TOUT DOMMAGE SPÉCIAL, ACCESSOIRE, <br>
-INCIDENT OU INDIRECT DE QUELQUE NATURE QUE CE SOIT (Y COMPRIS, MAIS <br>
-NON DE FACON LIMITATIVE, LES PERTES DE BÉNÉFICES, PERTES D'INFORMATIONS <br>
-CONFIDENTIELLES OU AUTRES INFORMATIONS, INTERRUPTIONS D'ACTIVITÉ, <br>
-PRÉJUDICES CORPORELS, ATTEINTES À LA VIE PRIVÉE, MANQUEMENT À TOUTE <br>
-OBLIGATION (NOTAMMENT L'OBLIGATION DE BONNE FOI ET DE DILIGENCE), <br>
-NÉGLIGENCE, ET POUR TOUTE PERTE PÉCUNIAIRE OU AUTRE DE QUELQUE NATURE <br>
-QUE CE SOIT), RÉSULTANT DE, OU RELATIFS A, L'UTILISATION OU <br>
-L'IMPOSSIBILITÉ D'UTILISER LES COMPOSANTS OS OU LES SERVICES
-D'ASSISTANCE, <br>
-OU LA FOURNITURE OU LE DÉFAUT DE FOURNITURE DES SERVICES D'ASSISTANCE,
-OU <br>
-AUTREMENT EN VERTU DE, OU RELATIVEMENT A, TOUTE DISPOSITION DE CE CLUF <br>
-SUPPLÉMENTAIRE, MÊME SI LA SOCIÉTÉ MICROSOFT OU UN QUELCONQUE
-FOURNISSEUR <br>
-A ÉTÉ PRÉVENU DE L'ÉVENTUALITÉ DE TELS DOMMAGES. <br>
-LIMITATION DE RESPONSABILITÉ ET RECOURS. NONOBSTANT TOUT DOMMAGE QUE
-VOUS <br>
-POURRIEZ SUBIR POUR QUELQUE MOTIF QUE CE SOIT (NOTAMMENT TOUS LES
-DOMMAGES <br>
-ÉNUMÉRÉS CI-DESSUS ET TOUS LES DOMMAGES DIRECTS OU GÉNÉRAUX), L'ENTIÈRE <br>
-RESPONSABILITÉ DE MICROSOFT ET DE L'UN QUELCONQUE DE SES FOURNISSEURS
-AU <br>
-TITRE DE TOUTE STIPULATION DE CE CLUF SUPPLÉMENTAIRE ET VOTRE SEUL
-RECOURS <br>
-EN CE QUI CONCERNE TOUS LES DOMMAGES PRÉCITÉS NE SAURAIENT EXCÉDER LE <br>
-MONTANT QUE VOUS AVEZ EFFECTIVEMENT PAYÉ POUR LES COMPOSANTS OS OU 5
-DOLLARS <br>
-US (US$ 5,00), SELON LE PLUS ÉLEVÉ DES DEUX MONTANTS. LES PRÉSENTES <br>
-LIMITATIONS ET EXCLUSIONS DEMEURERONT APPLICABLES DANS TOUTE LA MESURE <br>
-PERMISE PAR LE DROIT APPLICABLE QUAND BIEN MÊME UN QUELCONQUE REMÈDE À
-UN <br>
-QUELCONQUE MANQUEMENT NE PRODUIRAIT PAS D'EFFET. <br>
-La présente Convention est régie par les lois de la province d'Ontario, <br>
-Canada. Chacune des parties à la présente reconnaît irrévocablement la <br>
-compétence des tribunaux de la province d'Ontario et consent à
-instituer <br>
-tout litige qui pourrait découler de la présente auprès des tribunaux <br>
-situés dans le district judiciaire de York, province d'Ontario. <br>
-Au cas où vous auriez des questions concernant cette licence ou que
-vous <br>
-désiriez vous mettre en rapport avec Microsoft pour quelque raison que <br>
-ce soit, veuillez contacter la succursale Microsoft desservant votre <br>
-pays, ou écrire à : Microsoft Sales Information Center, One Microsoft <br>
-Way, Redmond, Washington 98052-6399.
-
-</body>
-</html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Ispell W?rterbuch igerman98; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Bjoern Jacke - <br> -</h2> -<h3>German Dictionaries igerman98<br> -</h3> - -OASIS distribution license agreement 0.1 from 2005-11-10 -<br> -Without any modifications this dictionary may be distributed with programs -that -support the OASIS Open Document Format for Office Applications and whose -PRIMARY format for saving documents is the Open Document Format. -<br> -This requires that all licenses and copyright files are also distributed -together -with the package the dictionary is shipped with. -<br> -Any modifications of the dictionary files are not allowed for this -agreement, modifications require the use of the GNU GENERAL PUBLIC LICENSE. -<br> -If you have questions or don't get along with this, send me your -comments/questions/ideas to Bjoern Jacke <bjoern@j3e.de> -<br> - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: WordNet Release 2.1; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Princeton University - <br> -</h2> -<h3>WordNet 2.1<br> -</h3> -WordNet 2.1 Copyright 2005 by Princeton University. -<br> - This software and database is being provided to you, the LICENSEE, by - Princeton University under the following license. By obtaining, using - and/or copying this software and database, you agree that you have - read, understood, and will comply with these terms and conditions.: -<br> - Permission to use, copy, modify and distribute this software and - database and its documentation for any purpose and without fee or - royalty is hereby granted, provided that you agree to comply with - the following copyright notice and statements, including the disclaimer, - and that the same appear on ALL copies of the software, database and - documentation, including modifications that you make for internal - use or for distribution. -<br> - WordNet 2.1 Copyright 2005 by Princeton University. All rights reserved. -<br> - THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON - UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR - IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON - UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- - ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE - OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT - INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR - OTHER RIGHTS. -<br> - The name of Princeton University or Princeton may not be used in - advertising or publicity pertaining to distribution of the software - and/or database. Title to copyright in this software, database and - any associated documentation shall at all times remain with - Princeton University and LICENSEE agrees to preserve same. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:Bitstram Vera Fonts; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Bitstream, Inc. - <br> -</h2> -<h3>Bitstream Vera Fonts<br> -</h3> - - <em>Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. -Bitstream Vera is a trademark of Bitstream, Inc. <br> - <br> -Permission is hereby granted, free of charge, to any person obtaining a -copy of the fonts accompanying this license (“Fontsâ€) and associated -documentation files (the “Font Softwareâ€), to reproduce and distribute -the Font Software, including without limitation the rights to use, copy, -merge, publish, distribute, and/or sell copies of the Font Software, and -to permit persons to whom the Font Software is furnished to do so, -subject to the following conditions: <br> - <br> -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces.<br> - <br> -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the Fonts, -only if the fonts are renamed to names not containing either the words -“Bitstream†or the word “Veraâ€.<br> - <br> -This License becomes null and void to the extent applicable to Fonts or -Font Software that has been modified and is distributed under the -“Bitstream Vera†names. <br> - <br> -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. <br> - <br> -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. <br> - <br> -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: fonts -at gnome dot org. </em> <br> -Arev Fonts Copyright -<br> -Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. -<br> -Permission is hereby granted, free of charge, to any person obtaining a copy of -the fonts accompanying this license ("Fonts") and associated documentation files -(the "Font Software"), to reproduce and distribute the modifications to the -Bitstream Vera Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font Software, and -to permit persons to whom the Font Software is furnished to do so, subject to -the following conditions: -<br> -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software typefaces. -<br> -The Font Software may be modified, altered, or added to, and in particular the -designs of glyphs or characters in the Fonts may be modified and additional -glyphs or characters may be added to the Fonts, only if the fonts are renamed to -names not containing either the words "Tavmjong Bah" or the word "Arev". -<br> -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Tavmjong Bah Arev" -names. -<br> -The Font Software may be sold as part of a larger software package but no copy -of one or more of the Font Software typefaces may be sold by itself. -<br> -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR -OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR -CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. -<br> -Except as contained in this notice, the name of Tavmjong Bah shall not be used -in advertising or otherwise to promote the sale, use or other dealings in this -Font Software without prior written authorization from Tavmjong Bah. For further -information, contact: tavmjong @ free . fr. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Liberation Fonts; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>RedHat, Inc.<br> -</h2> -<h3>Liberation Fonts<br> -</h3> - -<a href="#gpl">refer to GNU General Public License</a> and the following terms: - -<br> - -LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE -<br> -This agreement governs the use of the Software and any updates to the -Software, regardless of the delivery mechanism. Subject to the following -terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to -this collective work pursuant to the GNU General Public License v.2 with the -exceptions set forth below and such other terms as our set forth in this End -User License Agreement. -<br> -1. The Software and License Exception. LIBERATION font software (the -"Software") consists of TrueType-OpenType formatted font software for -rendering LIBERATION typefaces in sans serif, serif, and monospaced character -styles. You are licensed to use, modify, copy, and distribute the Software -pursuant to the GNU General Public License v.2 with the following exceptions: -<br> -1) As a special exception, if you create a document which uses this font, and -embed this font or unaltered portions of this font into the document, this -font does not by itself cause the resulting document to be covered by the GNU -General Public License. This exception does not however invalidate any other -reasons why the document might be covered by the GNU General Public License. -If you modify this font, you may extend this exception to your version of the -font, but you are not obligated to do so. If you do not wish to do so, delete -this exception statement from your version. - -<br> -2) As a further exception, any distribution of the object code of the Software -in a physical product must provide you the right to access and modify the -source code for the Software and to reinstall that modified version of the -Software in object code form on the same physical product on which you -received it. -<br> -2. Intellectual Property Rights. The Software and each of its components, -including the source code, documentation, appearance, structure and -organization are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software and any component, or to any copy, -modification, or merged portion shall remain with the aforementioned, subject -to the applicable license. The "LIBERATION" trademark is a trademark of Red -Hat, Inc. in the U.S. and other countries. This agreement does not permit -Client to distribute modified versions of the Software using Red Hat's -trademarks. If Client makes a redistribution of a modified version of the -Software, then Client must modify the files names to remove any reference to -the Red Hat trademarks and must not use the Red Hat trademarks in any way to -reference or promote the modified Software. -<br> -3. Limited Warranty. To the maximum extent permitted under applicable law, the -Software is provided and licensed "as is" without warranty of any kind, -expressed or implied, including the implied warranties of merchantability, -non-infringement or fitness for a particular purpose. Red Hat does not warrant -that the functions contained in the Software will meet Client's requirements -or that the operation of the Software will be entirely error free or appear -precisely as described in the accompanying documentation. -<br> -4. Limitation of Remedies and Liability. To the maximum extent permitted by -applicable law, Red Hat or any Red Hat authorized dealer will not be liable to -Client for any incidental or consequential damages, including lost profits or -lost savings arising out of the use or inability to use the Software, even if -Red Hat or such dealer has been advised of the possibility of such damages. -<br> -5. Export Control. As required by U.S. law, Client represents and warrants -that it: (a) understands that the Software is subject to export controls under -the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) -is not located in a prohibited destination country under the EAR or U.S. -sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan -and Syria); (c) will not export, re-export, or transfer the Software to any -prohibited destination, entity, or individual without the necessary export -license(s) or authorizations(s) from the U.S. Government; (d) will not use or -transfer the Software for use in any sensitive nuclear, chemical or biological -weapons, or missile technology end-uses unless authorized by the U.S. -Government by regulation or specific license; (e) understands and agrees that -if it is in the United States and exports or transfers the Software to -eligible end users, it will, as required by EAR Section 740.17(e), submit -semi-annual reports to the Commerce Department's Bureau of Industry & Security -(BIS), which include the name and address (including country) of each -transferee; and (f) understands that countries other than the United States -may restrict the import, use, or export of encryption products and that it -shall be solely responsible for compliance with any such import, use, or -export restrictions. -<br> -6. General. If any provision of this agreement is held to be unenforceable, -that shall not affect the enforceability of the remaining provisions. This -agreement shall be governed by the laws of the State of North Carolina and of -the United States, without regard to any conflict of laws provisions, except -that the United Nations Convention on the International Sale of Goods shall -not apply. -<br> -Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark -of Red Hat, Inc. -<br> -</tt> -<br> -</body> -</html> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<!-- W3C IPR SOFTWARE NOTICE --><!-- downloaded from: --><!-- http://www.w3.org/Consortium/Legal/copyright-software-19980720 --><!-- --><!-- Changed: 24. July 2001 --><!-- 1) removed link to stylesheet --><!-- 2) removed "webmaster" link --><!-- 3) changed site-relative URLs to absolute URLs --><!-- 4) added this comment block --><!-- Changes are intended to allow proper --><!-- off-line viewing of the license. --> - <meta content="HTML Tidy, see www.w3.org" name="generator"> - <meta content="text/html; charset=iso-8859-1" - http-equiv="Content-Type"> - <title>W3C IPR SOFTWARE NOTICE</title> -</head> -<body bgcolor="#ffffff" text="#000000"> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: MathML DTD; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>World Wide Web Consortium (W3C)<br> -</h2> -<h3>MathML DTD<br> -</h3> -<h1>W3C<sup>®</sup> SOFTWARE NOTICE AND LICENSE</h1> -<h4>Copyright © 1994-2001 <a href="http://www.w3.org/">World -Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts -Institute of -Technology</a>, <a href="http://www.inria.fr/">Institut National de -Recherche en Informatique et en Automatique</a>, <a - href="http://www.keio.ac.jp/">Keio University</a>). All Rights -Reserved. -http://www.w3.org/Consortium/Legal/</h4> -<p>This W3C work (including software, documents, or other related -items) is being provided by the copyright holders under the -following license. By obtaining, using and/or copying this work, -you (the licensee) agree that you have read, understood, and will -comply with the following terms and conditions:</p> -<p>Permission to use, copy, modify, and distribute this software -and its documentation, with or without modification, for any -purpose and without fee or royalty is hereby granted, provided that -you include the following on ALL copies of the software and -documentation or portions thereof, including modifications, that -you make:</p> -<ol> - <li>The full text of this NOTICE in a location viewable to users of -the redistributed or derivative work.</li> - <li>Any pre-existing intellectual property disclaimers, notices, or -terms and conditions. If none exist, a short notice of the -following form (hypertext is preferred, text is permitted) should -be used within the body of any redistributed or derivative code: -"Copyright © [$date-of-software] <a href="http://www.w3.org/"> -World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts -Institute of -Technology</a>, <a href="http://www.inria.fr/">Institut National de -Recherche en Informatique et en Automatique</a>, <a - href="http://www.keio.ac.jp/">Keio University</a>). All Rights -Reserved. -http://www.w3.org/Consortium/Legal/"</li> - <li>Notice of any changes or modifications to the W3C files, -including the date changes were made. (We recommend you provide -URIs to the location from which the code is derived.)</li> -</ol> -<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND -COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF -MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE -USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD -PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p> -<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, -SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE -SOFTWARE OR DOCUMENTATION.</p> -<p>The name and trademarks of copyright holders may NOT be used in -advertising or publicity pertaining to the software without -specific, written prior permission. Title to copyright in this -software and any associated documentation will at all times remain -with copyright holders.</p> -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: NSIS; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Nullsoft, Inc.<br> -</h2> -<h3>NSIS<br> -</h3> -Copyright (C) 1999-2003 Nullsoft, Inc. -<br> -This license applies to everything in the NSIS package, except where otherwise -noted. -<br> -This software is provided 'as-is', without any express or implied warranty. In -no event will the authors be held liable for any damages arising from the use of -this software. -<br> -Permission is granted to anyone to use this software for any purpose, including -commercial applications, and to alter it and redistribute it freely, subject to -the following restrictions: -<br> - 1. The origin of this software must not be misrepresented; you must not claim -that you wrote the original software. If you use this software in a product, an -acknowledgment in the product documentation would be appreciated but is not -required. -<br> - 2. Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. -<br> - 3. This notice may not be removed or altered from any source distribution. - -<br> -</body> -</html> -<html> -<body> - <hr style="width: 100%; height: 2px;">The following software may be -included in this product: PostScript(R) AFM Files; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Adobe<br> -</h2> -<h3>PostScript(R) AFM files<br> -</h3> -<br> - Adobe Core 35 AFM Files with 314 Glyph Entries - -<br> - This file and the 35 PostScript(R) AFM files it - accompanies may be used, copied, and distributed for any purpose and - without charge, with or without modification, provided that all - copyright notices are retained; that the AFM files are not - distributed without this file; that all modifications to this file - or any of the AFM files are prominently noted in the modified - file(s); and that this paragraph is not modified. Adobe Systems has - no responsibility or obligation to support the use of the AFM - files. - -<br> - </body> - -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Antigrain; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Axim Shemanarev<br> -</h2> -<h3>Antigrain<br> -</h3> - -<br> -Anti-Grain Geometry - Version 2.0 -<br> -Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) -<br> - -Permission to copy, use, modify, sell and distribute this software -is granted provided this copyright notice appears in all copies. -This software is provided "as is" without express or implied -warranty, and with no claim as to its suitability for any purpose. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: beanshell; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Pat Niemeyer<br> -</h2> -<h3>beanshell<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> - -<pre> - -/***************************************************************************** - * * - * This file is part of the BeanShell Java Scripting distribution. * - * Documentation and updates may be found at http://www.beanshell.org/ * - * * - * Sun Public License Notice: * - * * - * The contents of this file are subject to the Sun Public License Version * - * 1.0 (the "License"); you may not use this file except in compliance with * - * the License. A copy of the License is available at http://www.sun.com * - * * - * The Original Code is BeanShell. The Initial Developer of the Original * - * Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright * - * (C) 2000. All Rights Reserved. * - * * - * GNU Public License Notice: * - * * - * Alternatively, the contents of this file may be used under the terms of * - * the GNU Lesser General Public License (the "LGPL"), in which case the * - * provisions of LGPL are applicable instead of those above. If you wish to * - * allow use of your version of this file only under the terms of the LGPL * - * and not to allow others to use your version of this file under the SPL, * - * indicate your decision by deleting the provisions above and replace * - * them with the notice and other provisions required by the LGPL. If you * - * do not delete the provisions above, a recipient may use your version of * - * this file under either the SPL or the LGPL. * - * * - * Patrick Niemeyer (pat@pat.net) * - * Author of Learning Java, O'Reilly & Associates * - * http://www.pat.net/~pat/ * - * * - *****************************************************************************/ -</pre> - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-</head>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: C++ Boost Library; Use of any of this
-software
-is governed
-by the terms of the license below:<br>
-<h2>Boost.org<br>
-</h2>
-<h3>C++ Boost Library<br>
-</h3>
-Boost Software License - Version 1.0 - August 17th, 2003
-<br>
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-<br>
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-<br>
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-<br>
-</body>
-</html>
-<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Cairo; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Cairographics.org<br> -</h2> -<h3>Cairo (B)<br> -</h3> - - -<a href="#mpllic">jump to MPL 1.1</a><br> - - - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-</head>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product:Charis SIL v4; Use of any of this software
-is governed
-by the terms of the license below:<br>
-<h2>SIL International<br>
-</h2>
-<h3>Charis SIL v.4<br>
-</h3>
-<br>This Font Software is Copyright (c) 1997-2006, SIL International
-(http://scripts.sil.org/).
-<br>
-All Rights Reserved.
-<br>
-
-"Charis SIL" is a Reserved Font Name for this Font Software.
-<br>
-"SIL" is a Reserved Font Name for this Font Software.
-<br>
-
-This Font Software is licensed under the SIL Open Font License, Version 1.0.
-<br>
-No modification of the license is permitted, only verbatim copy is allowed.
-<br>
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-<br>
-
------------------------------------------------------------
-<br>
-SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005
-<br>
------------------------------------------------------------
-<br>
-PREAMBLE
-<br>
-The goals of the Open Font License (OFL) are to stimulate worldwide
-
-development of cooperative font projects, to support the font creation
-
-efforts of academic and linguistic communities, and to provide an open
-
-framework in which fonts may be shared and improved in partnership with
-
-others.
-
-<br>
-
-The OFL allows the licensed fonts to be used, studied, modified and
-
-redistributed freely as long as they are not sold by themselves. The
-
-fonts, including any derivative works, can be bundled, embedded,
-
-redistributed and sold with any software provided that the font
-
-names of derivative works are changed. The fonts and derivatives,
-
-however, cannot be released under any other type of license.
-
-<br>
-
-DEFINITIONS
-<br>
-"Font Software" refers to any and all of the following:
-<br>
- - font files
- <br>
- - data files
- <br>
- - source code
- <br>
- - build scripts
- <br>
- - documentation
- <br>
-
-
-"Reserved Font Name" refers to the Font Software name as seen by
-
-users and any other names as specified after the copyright statement.
-
-<br>
-
-"Standard Version" refers to the collection of Font Software
-
-components as distributed by the Copyright Holder.
-<br>
-
-
-"Modified Version" refers to any derivative font software made by
-
-adding to, deleting, or substituting -- in part or in whole --
-
-any of the components of the Standard Version, by changing formats
-
-or by porting the Font Software to a new environment.
-
-<br>
-
-"Author" refers to any designer, engineer, programmer, technical
-
-writer or other person who contributed to the Font Software.
-
-<br>
-
-PERMISSION & CONDITIONS
-<br>
-Permission is hereby granted, free of charge, to any person obtaining
-
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-
-redistribute, and sell modified and unmodified copies of the Font
-
-Software, subject to the following conditions:
-
-<br>
-
-1) Neither the Font Software nor any of its individual components,
-
-in Standard or Modified Versions, may be sold by itself.
-<br>
-
-
-2) Standard or Modified Versions of the Font Software may be bundled,
-
-redistributed and sold with any software, provided that each copy
-
-contains the above copyright notice and this license. These can be
-
-included either as stand-alone text files, human-readable headers or
-
-in the appropriate machine-readable metadata fields within text or
-
-binary files as long as those fields can be easily viewed by the user.
-
-<br>
-
-3) No Modified Version of the Font Software may use the Reserved Font
-
-Name(s), in part or in whole, unless explicit written permission is
-
-granted by the Copyright Holder. This restriction applies to all
-
-references stored in the Font Software, such as the font menu name and
-
-other font description fields, which are used to differentiate the
-
-font from others.
-
-<br>
-
-4) The name(s) of the Copyright Holder or the Author(s) of the Font
-
-Software shall not be used to promote, endorse or advertise any
-
-Modified Version, except to acknowledge the contribution(s) of the
-
-Copyright Holder and the Author(s) or with their explicit written
-
-permission.
-
-<br>
-
-5) The Font Software, modified or unmodified, in part or in whole,
-
-must be distributed using this license, and may not be distributed
-
-under any other license.
-
-<br>
-
-TERMINATION
-<br>
-This license becomes null and void if any of the above conditions are
-
-not met.
-
-<br>
-
-DISCLAIMER
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-
-OTHER DEALINGS IN THE FONT SOFTWARE.
- <br>
-
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:KDE Crystal theme icons; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>KDE Artists: <br> -</h2> -<h3>KDE Crystal theme icons<br> -</h3> -KDE Crystal theme icons. -<br> -Copyright (C) 2002 and following years KDE Artists -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation, -version 2.1 of the License. -<br> -<pre> -License - -The Crystal Project are released under LGPL. - -GNU General Public License. - - 0. - - This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other authorized party -saying it may be distributed under the terms of this Lesser General Public -License (also called "this License"). Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data prepared -so as to be conveniently linked with application programs (which use some of -those functions and data) to form executables. - - The "Library", below, refers to any such software library or work which -has been distributed under these terms. A "work based on the Library" means -either the Library or any derivative work under copyright law: that is to say, a -work containing the Library or a portion of it, either verbatim or with -modifications and/or translated straightforwardly into another language. -(Hereinafter, translation is included without limitation in the term -"modification".) - - "Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the source -code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of running a -program using the Library is not restricted, and output from such a program is -covered only if its contents constitute a work based on the Library (independent -of the use of the Library in a tool for writing it). Whether that is true -depends on what the Library does and what the program that uses the Library does. - 1. - - You may copy and distribute verbatim copies of the Library's complete -source code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and distribute a copy of this License along -with the Library. - - You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. - 2. - - You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - 1. The modified work must itself be a software library. - 2. You must cause the files modified to carry prominent notices stating -that you changed the files and the date of any change. - 3. You must cause the whole of the work to be licensed at no charge to -all third parties under the terms of this License. - 4. If a facility in the modified Library refers to a function or a -table of data to be supplied by an application program that uses the facility, -other than as an argument passed when the facility is invoked, then you must -make a good faith effort to ensure that, in the event an application does not -supply such function or table, the facility still operates, and performs -whatever part of its purpose remains meaningful. - - (For example, a function in a library to compute square roots has a -purpose that is entirely well-defined independent of the application. Therefore, -Subsection 2d requires that any application-supplied function or table used by -this function must be optional: if the application does not supply it, the -square root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Library. - - In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of a storage -or distribution medium does not bring the other work under the scope of this -License. - 3. - - You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. (If -a newer version than version 2 of the ordinary GNU General Public License has -appeared, then you can specify that version instead if you wish.) Do not make -any other change in these notices. - - Once this change is made in a given copy, it is irreversible for that -copy, so the ordinary GNU General Public License applies to all subsequent -copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of the -Library into a program that is not a library. - 4. - - You may copy and distribute the Library (or a portion or derivative of it, -under Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source code from -the same place satisfies the requirement to distribute the source code, even -though third parties are not compelled to copy the source along with the object -code. - 5. - - A program that contains no derivative of any portion of the Library, but -is designed to work with the Library by being compiled or linked with it, is -called a "work that uses the Library". Such a work, in isolation, is not a -derivative work of the Library, and therefore falls outside the scope of this -License. - However, linking a "work that uses the Library" with the Library creates -an executable that is a derivative of the Library (because it contains portions -of the Library), rather than a "work that uses the library". The executable is -therefore covered by this License. Section 6 states terms for distribution of -such executables. - - When a "work that uses the Library" uses material from a header file that -is part of the Library, the object code for the work may be a derivative work of -the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if the -work is itself a library. The threshold for this to be true is not precisely -defined by law. - - If such an object file uses only numerical parameters, data structure -layouts and accessors, and small macros and small inline functions (ten lines or -less in length), then the use of the object file is unrestricted, regardless of -whether it is legally a derivative work. (Executables containing this object -code plus portions of the Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may distribute -the object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - 6. - - As an exception to the Sections above, you may also combine or link a -"work that uses the Library" with the Library to produce a work containing -portions of the Library, and distribute that work under terms of your choice, -provided that the terms permit modification of the work for the customer's own -use and reverse engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the Library -is used in it and that the Library and its use are covered by this License. You -must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - 1. Accompany the work with the complete corresponding machine-readable -source code for the Library including whatever changes were used in the work -(which must be distributed under Sections 1 and 2 above); and, if the work is an -executable linked with the Library, with the complete machine-readable "work -that uses the Library", as object code and/or source code, so that the user can -modify the Library and then relink to produce a modified executable containing -the modified Library. (It is understood that the user who changes the contents -of definitions files in the Library will not necessarily be able to recompile -the application to use the modified definitions.) . - 2. Use a suitable shared library mechanism for linking with the -Library. A suitable mechanism is one that (1) uses at run time a copy of the -library already present on the user's computer system, rather than copying -library functions into the executable, and (2) will operate properly with a -modified version of the library, if the user installs one, as long as the -modified version is interface-compatible with the version that the work was made -with. - 3. Accompany the work with a written offer, valid for at least three -years, to give the same user the materials specified in Subsection 6a, above, -for a charge no more than the cost of performing this distribution. - 4. If distribution of the work is made by offering access to copy from -a designated place, offer equivalent access to copy the above specified -materials from the same place. - 5. Verify that the user has already received a copy of these materials -or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the Library" -must include any data and utility programs needed for reproducing the executable -from it. However, as a special exception, the materials to be distributed need -not include anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the operating -system on which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license restrictions -of other proprietary libraries that do not normally accompany the operating -system. Such a contradiction means you cannot use both them and the Library -together in an executable that you distribute. - 7. - - You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities not -covered by this License, and distribute such a combined library, provided that -the separate distribution of the work based on the Library and of the other -library facilities is otherwise permitted, and provided that you do these two -things: - 1. - - Accompany the combined library with a copy of the same work based on -the Library, uncombined with any other library facilities. This must be -distributed under the terms of the Sections above. - 2. - - Give prominent notice with the combined library of the fact that -part of it is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - 8. - - You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense, link with, or distribute the Library is void, and will -automatically terminate your rights under this License. However, parties who -have received copies, or rights, from you under this License will not have their -licenses terminated so long as such parties remain in full compliance. - 9. - - You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Library -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Library (or any -work based on the Library), you indicate your acceptance of this License to do -so, and all its terms and conditions for copying, distributing or modifying the -Library or works based on it. - 10. - - Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor to -copy, distribute, link with or modify the Library subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties with this License. - 11. - - If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Library at all. -For example, if a patent license would not permit royalty-free redistribution of -the Library by all those who receive copies directly or indirectly through you, -then the only way you could satisfy both it and this License would be to refrain -entirely from distribution of the Library. - - If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, and -the section as a whole is intended to apply in other circumstances. - - It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any such -claims; this section has the sole purpose of protecting the integrity of the -free software distribution system which is implemented by public license -practices. Many people have made generous contributions to the wide range of -software distributed through that system in reliance on consistent application -of that system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot impose -that choice. - - This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - 12. - - If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Library under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - 13. - - The Free Software Foundation may publish revised and/or new versions of -the Lesser General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - - Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Library does not specify a license version number, you may choose any -version ever published by the Free Software Foundation. - 14. - - If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make exceptions -for this. Our decision will be guided by the two goals of preserving the free -status of all derivatives of our free software and of promoting the sharing and -reuse of software generally. - -No Warranty - - 15. - - Because the library is licensed free of charge, there is no warranty for -the library, to the extent permitted by applicable law. Except when otherwise -stated in writing the copyright holders and/or other parties provide the library -"as is" without warranty of any kind, either expressed or implied, including, -but not limited to, the implied warranties of merchantability and fitness for a -particular purpose. The entire risk as to the quality and performance of the -library is with you. Should the library prove defective, you assume the cost of -all necessary servicing, repair or correction. - 16. - - In no event unless required by applicable law or agreed to in writing will -any copyright holder, or any other party who may modify and/or redistribute the -library as permitted above, be liable to you for damages, including any general, -special, incidental or consequential damages arising out of the use or inability -to use the library (including but not limited to loss of data or data being -rendered inaccurate or losses sustained by you or third parties or a failure of -the library to operate with any other software), even if such holder or other -party has been advised of the possibility of such damages. - -</pre> - - <br> - - </body> - </html> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libcurl; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Daniel Stenberg<br> -</h2> -<h3>libcurl<br> -</h3> - -Copyright (C) 1998-2001, Daniel Stenberg, <daniel@haxx.se>, et al. -<br> - - Everyone is permitted to copy and distribute verbatim copies of this license - document, but changing it is not allowed. - <br> - - In order to be useful for every potential user, the curl and libcurl are - dual-licensed under the MPL and the MIT/X-derivate licenses. - <br> - - You may opt to use, copy, modify, merge, publish, distribute and/or sell - copies of the Software, and permit persons to whom the Software is furnished - to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may - pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the - license texts. - <br> - - As a courtesy to the open-source and free software community, we ask you to - dual-license any modifications that you make as well, under the terms of this - document. - <br> - - Please remember to always keep the licensing information included in - individual source files up-to-date, so as to avoid misleading anyone as to - the status of these files. - <br> - - I will use a submission policy according to which I will only enter - contributions into the CVS tree if the contributor agrees to both licenses - and this dual-license approach. - <br> - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Afrikaans dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Friedel Wolff<br>
-</h2>
-<h3>Afrikaans dictionary<br>
-</h3>
-<br>
-<a href="#lgpl">Jump to LGPL</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Stavekontrolden (Danish Spellchecker); Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Finn Gruwier Larsen<br>
-</h2>
-<h3>Stavekontrolden (Danish Spellchecker) (LGPL v2.1)<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Slovenian spellcheck dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Jaak Pruulmann<br>
-</h2>
-<h3>Estonian dictionaries<br>
-</h3>
-<br>
-<a href="#lgpl">Gnu Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: French dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>dico.savant@free.fr<br>
-</h2>
-<h3>French dictionary<br>
-</h3>
-<br>
-<a href="#mpllic">jump to Mozilla Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Italian dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Davide Prina<br>
-</h2>
-<h3>Italian dictionary<br>
-</h3>
-<br>
-<a href="#gpl">Jump to GPL</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: MySpell-ku (Kurdish Spellchecker); Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Erdal Ronahi<br>
-</h2>
-<h3>MySpell-ku (Kurdish Spellchecker) (LGPL v2.1)<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Lithuanian spelling dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Albertas Agejevas<br>
-</h2>
-<h3>Lithuaninian spelling dictionary<br>
-</h3>
-<br>
-Copyright (c) Albertas Agejevas , 2000, 2001
-<br>
-All rights reserved.
-<br>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-<br>
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-<br>
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-<br>
-3. Neither the name of the Albertas Agejevas nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-<br>
-
-THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-<br>
-
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: 'Nepali dictionares; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Madan Puraskar Pustkalaya<br>
-</h2>
-<h3>Nepali dictionaries<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Polish spelling dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Marek Futrega<br>
-</h2>
-<h3>Polish spelling dictionary<br>
-</h3>
-<br>
-<a href="#mpllic">jump to Mozilla Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Slovak dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Zdenko Podobny<br>
-</h2>
-<h3>Slovak dictionary<br>
-</h3>
-<br>
-<a href="#mpllic">jump to Mozilla Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Slovenian spellcheck dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Ales Kosir<br>
-</h2>
-<h3>Slovenian spellcheck dictionary<br>
-</h3>
-<br>
-<a href="#lgpl">Gnu Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: dictionaries for South African English; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>David Bartlett and Andrew Brown<br>
-</h2>
-<h3>dictionaries for South African English<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Swedish dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Göran Anderson<br>
-</h2>
-<h3>Swedish dictionary<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: expat XML Parser Toolkit; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>James Clark<br> -</h2> -<h3>expat XML Parser Toolkit<br> -</h3> -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and -Clark Cooper <br> -Copyright (c) 2001, 2002, 2003 Expat maintainers. -<br> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<HTML> +<HEAD> + <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> + <TITLE></TITLE> + <META NAME="GENERATOR" CONTENT="LibreOffice 3.3 (Win32)"> + <META NAME="CREATED" CONTENT="20110511;11391779"> + <META NAME="CHANGED" CONTENT="20110524;11461990"> + <STYLE TYPE="text/css"> + <!-- + @page { margin: 2cm } + P { margin-bottom: 0.21cm } + P.western { so-language: en-US } + P.cjk { font-size: 10pt } + H1 { margin-bottom: 0.21cm } + H1.western { font-family: "DejaVu Sans"; font-size: 16pt; so-language: en-US } + H1.cjk { font-family: "SimSun"; font-size: 16pt } + H1.ctl { font-family: "Mangal"; font-size: 16pt } + H4 { margin-bottom: 0.21cm } + H4.western { font-family: "DejaVu Sans Condensed", sans-serif; so-language: en-US } + H4.cjk { font-family: "SimSun" } + H4.ctl { font-family: "Mangal" } + H2 { margin-bottom: 0.21cm } + H2.western { font-family: "DejaVu Sans"; font-size: 14pt; so-language: en-US; font-style: italic } + H2.cjk { font-family: "SimSun"; font-size: 14pt; font-style: italic } + H2.ctl { font-family: "Mangal"; font-size: 14pt; font-style: italic } + H3 { margin-bottom: 0.21cm } + H3.western { font-family: "DejaVu Sans"; font-size: 12pt; so-language: en-US } + H3.cjk { font-family: "SimSun" } + H3.ctl { font-family: "Mangal" } + PRE { page-break-before: auto } + PRE.western { font-family: "DejaVu Sans Mono", monospace; font-size: 10pt; so-language: en-US } + PRE.cjk { font-family: "NSimSun", monospace } + DT { margin-top: 0.3cm; margin-bottom: 0.3cm } + DT.western { so-language: en-US } + DT.cjk { font-size: 10pt } + DD { margin-top: 0.3cm; margin-bottom: 0.3cm } + DD.western { so-language: en-US } + DD.cjk { font-size: 10pt } + BLOCKQUOTE.western { so-language: en-US } + BLOCKQUOTE.cjk { font-size: 10pt } + A:link { so-language: zxx } + SAMP.cjk { font-family: "NSimSun", monospace } + --> + </STYLE> +</HEAD> +<BODY LANG="hu-HU" DIR="LTR"> +<P LANG="en-US" ALIGN=CENTER STYLE="margin-top: 0.42cm; page-break-after: avoid"> +<FONT FACE="DejaVu Sans"><FONT SIZE=5><B>Licensing and Legal +information</B></FONT></FONT></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This product is made available subject to the terms of GNU Lesser +General Public License Version 3. A copy of the LGPL license can be +found below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#1.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Third Party Code Additional copyright notices and license terms +applicable to portions of the Software can be found <A HREF="#thirdparty">below</A> +in this document.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All trademarks and registered trademarks mentioned herein are the +property of their respective owners.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights +reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">This product has been created by The Document +Foundation, incorporating many modifications from different +contributors, see </SPAN><A HREF="http://www.libreoffice.org/">http://www.libreoffice.org/</A><SPAN LANG="en-US"> +for more details.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG><SPAN LANG="en-US">Note:</SPAN></STRONG><SPAN LANG="en-US"> +Do not translate or localize this document. Only English version is +legally binding.</SPAN></P> +<P LANG="en-US" ALIGN=CENTER STYLE="margin-top: 0.42cm; page-break-before: always; page-break-after: avoid"><A NAME="thirdparty"></A> +<FONT FACE="DejaVu Sans"><FONT SIZE=5><B>Third Party Code Additional +Copyright Notices and License Terms</B></FONT></FONT></P> +<H1 LANG="en-US" CLASS="western">Libraries</H1> +<H2 LANG="en-US" CLASS="western">Apache Commons</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Apache +Commons (codec, httpclient, lang, logging). Use of any of this +software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">Apache Jakarta Tomcat</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Apache +Jakarta Tomcat. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">beanshell</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: beanshell. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This file is part of the BeanShell Java Scripting distribution. +Documentation and updates may be found at <A HREF="http://www.beanshell.org/">http://www.beanshell.org/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Sun Public License Notice:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The contents of this file are subject to the Sun Public License +Version 1.0 (the "License"); you may not use this file +except in compliance with the License. A copy of the License is +available at <A HREF="http://www.sun.com/">http://www.sun.com</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Original Code is BeanShell. The Initial Developer of the Original +Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright +(C) 2000. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GNU Public License Notice:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Alternatively, the contents of this file may be used under the terms +of the GNU Lesser General Public License (the "LGPL"), in +which case the provisions of LGPL are applicable instead of those +above. If you wish to allow use of your version of this file only +under the terms of the LGPL and not to allow others to use your +version of this file under the SPL, indicate your decision by +deleting the provisions above and replace them with the notice and +other provisions required by the LGPL. If you do not delete the +provisions above, a recipient may use your version of this file under +either the SPL or the LGPL.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Patrick Niemeyer (pat@pat.net) Author of Learning Java, O'Reilly & +Associates <A HREF="http://www.pat.net/~pat/">http://www.pat.net/~pat/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#1.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">BerkeleyDB</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product:BerkeleyDB. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1990-2004 Sleepycat Software. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions in any form must be accompanied by information on + how to obtain complete source code for the DB software and any + accompanying software that uses the DB software. The source code + must either be included in the distribution or be available for no + more than the cost of distribution plus a nominal fee, and must be + freely redistributable under reasonable conditions. For an + executable file, complete source code means the source code for all + modules it contains. It does not include source code for modules or + files that typically accompany the major components of the operating + system on which the executable file runs.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL +SLEEPYCAT SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of +California. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1995, 1996 The President and Fellows of Harvard +University. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<H2 LANG="en-US" CLASS="western">C++ Boost Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: C++ Boost +Library. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Boost Software License - Version 1.0 - August 17th, 2003</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person or +organization obtaining a copy of the software and accompanying +documentation covered by this license (the "Software") to +use, reproduce, display, distribute, execute, and transmit the +Software, and to prepare derivative works of the Software, and to +permit third-parties to whom the Software is furnished to do so, all +subject to the following:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The copyright notices in the Software and this entire statement, +including the above license grant, this restriction and the following +disclaimer, must be included in all copies of the Software, in whole +or in part, and all derivative works of the Software, unless such +copies or derivative works are solely in the form of +machine-executable object code generated by a source language +processor.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND +NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE +DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER +LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT +OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Cairo</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Cairo. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Cairo is free software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Every source file in the implementation[*] of cairo is available to +be redistributed and/or modified under the terms of either the GNU +Lesser General Public License (LGPL) version 2.1 or the Mozilla +Public License (MPL) version 1.1. Some files are available under +more liberal terms, but we believe that in all cases, each file may +be used under either the LGPL or the MPL.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +See the following files in this directory for the precise terms and +conditions of either license:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Please see each file in the implementation for copyright and +licensing information, (in the opening comment of each file).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +[*] The implementation of cairo is contained entirely within the +"src" and "pixman" directories of the cairo +source distribution. There are other components of the cairo source +distribution (such as the "test" and "perf") that +are auxiliary to the library itself. None of the source code in these +directories contributes to a build of the cairo library itself, +(libcairo.so or cairo.dll or similar).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These auxilary components are also free software, but may be under +different license terms than cairo itself. For example, most of the +test cases in the perf and test directories are made available under +a MIT license to simplify any use of this code for reference purposes +in using cairo itself. Other files might be available under the GNU +General Public License (GPL), for example. Again, please see the +opening comment of each file for copyright and licensing information.</P> +<H2 LANG="en-US" CLASS="western">expat XML Parser Toolkit</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: expat XML +Parser Toolkit. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd +and Clark Cooper</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2001, 2002, 2003 Expat maintainers.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: -<br> -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. -<br> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Freetype; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Freetype Project<br> -</h2> -<h3>Freetype Library<br> -</h3> -<br> -Legal Terms -<br> -=========== -<br> -<br> -0. Definitions -<br> --------------- -<br> +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Flute</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Flute. Use of +any of this software is governed by the terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">W3C IPR SOFTWARE NOTICE</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2002 World Wide Web Consortium, (Massachusetts +Institute of Technology, Institut National de Recherche en +Informatique et en Automatique, Keio University). All Rights +Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<B>Note:</B> The original version of the W3C Software Copyright +Notice and License could be found at +<A HREF="http://www.w3.org/Consortium/Legal/copyright-software-19980720">http://www.w3.org/Consortium/Legal/copyright-software-19980720</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 1994-2000 <A HREF="http://www.w3.org/">World Wide +Web Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts +Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut +National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio +University</A>). All Rights Reserved. +<A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This W3C work (including software, documents, or other related items) +is being provided by the copyright holders under the following +license. By obtaining, using and/or copying this work, you (the +licensee) agree that you have read, understood, and will comply with +the following terms and conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, and modify this software and its +documentation, with or without modification, for any purpose and +without fee or royalty is hereby granted, provided that you include +the following on ALL copies of the software and documentation or +portions thereof, including modifications, that you make:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the following + form (hypertext is preferred, text is permitted) should be used + within the body of any redistributed or derivative code: "Copyright + © 2002 <A HREF="http://www.w3.org/">World Wide Web Consortium</A>, + (<A HREF="http://www.lcs.mit.edu/">Massachusetts Institute of + Technology</A>, <A HREF="http://www.inria.fr/">Institut National de + Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio + University</A>). All Rights Reserved. + <A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A>"</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.)</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND +COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY +OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE +OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, +COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE +SOFTWARE OR DOCUMENTATION.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to the software without specific, +written prior permission. Title to copyright in this software and any +associated documentation will at all times remain with copyright +holders.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Freetype Library</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Freetype. Use +of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">0. Definitions</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Throughout this license, the terms `package', `FreeType Project', and -`FreeType archive' refer to the set of files originally distributed by -the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the -`FreeType Project', be they named as alpha, beta or final release. <br> +`FreeType archive' refer to the set of files originally distributed +by the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as +the `FreeType Project', be they named as alpha, beta or final +release.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> `You' refers to the licensee, or person using the project, where -`using' is a generic term including compiling the project's source code -as well as linking it to form a `program' or `executable'. This program -is referred to as `a program using the FreeType engine'. <br> -This license applies to all files distributed in the original FreeType -Project, including all source code, binaries and documentation, unless -otherwise stated in the file in its original, unmodified form as -distributed in the original archive. If you are unsure whether or not a -particular file is covered by this license, you must contact us to -verify this. <br> -The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert -Wilhelm, and Werner Lemberg. All rights reserved except as specified -below. <br> -<br> -1. No Warranty -<br> --------------- -<br> -THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL -ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES -CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. <br> -<br> -2. Redistribution -<br> ------------------ -<br> +`using' is a generic term including compiling the project's source +code as well as linking it to form a `program' or `executable'. This +program is referred to as `a program using the FreeType engine'.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This license applies to all files distributed in the original +FreeType Project, including all source code, binaries and +documentation, unless otherwise stated in the file in its original, +unmodified form as distributed in the original archive. If you are +unsure whether or not a particular file is covered by this license, +you must contact us to verify this.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The FreeType Project is copyright (C) 1996-2000 by David Turner, +Robert Wilhelm, and Werner Lemberg. All rights reserved except as +specified below.</P> +<H3 LANG="en-US" CLASS="western">1. No Warranty</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO USE, OF THE +FREETYPE PROJECT.</P> +<H3 LANG="en-US" CLASS="western">2. Redistribution</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> This license grants a worldwide, royalty-free, perpetual and irrevocable right and license to use, execute, perform, compile, display, copy, create derivative works of, distribute and sublicense the FreeType Project (in both source and object code forms) and derivative works thereof for any purpose; and to authorize others to exercise some or all of the rights granted herein, subject to the -following conditions: <br> -o Redistribution of source code must retain this license file -(`FTL.TXT') unaltered; any additions, deletions or changes to the -original files must be clearly indicated in accompanying documentation. -The copyright notices of the unaltered, original files must be -preserved in all copies of source files. <br> -o Redistribution in binary form must provide a disclaimer that states -that the software is based in part of the work of the FreeType Team, in -the distribution documentation. We also encourage you to put an URL to -the FreeType web page in your documentation, though this isn't -mandatory. <br> -<br> +following conditions:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain this license file + ('FTL.TXT') unaltered; any additions, deletions or changes to the + original files must be clearly indicated in accompanying + documentation. The copyright notices of the unaltered, original + files must be preserved in all copies of source files.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution in binary form must provide a disclaimer that states + that the software is based in part of the work of the FreeType Team, + in the distribution documentation. We also encourage you to put an + URL to the FreeType web page in your documentation, though this + isn't mandatory.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> These conditions apply to any software derived from or based on the FreeType Project, not just the unmodified files. If you use our work, -you must acknowledge us. However, no fee need be paid to us. <br> -<br> -3. Advertising -<br> --------------- -<br> +you must acknowledge us. However, no fee need be paid to us.</P> +<H3 LANG="en-US" CLASS="western">3. Advertising</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Neither the FreeType authors and contributors nor you shall use the -name of the other for commercial, advertising, or promotional purposes -without specific prior written permission. <br> +name of the other for commercial, advertising, or promotional +purposes without specific prior written permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or -advertising materials: `FreeType Project', `FreeType Engine', `FreeType -library', or `FreeType Distribution'. <br> -As you have not signed this license, you are not required to accept it. -However, as the FreeType Project is copyrighted material, only this -license, or another one contracted with the authors, grants you the -right to use, distribute, and modify it. Therefore, by using, -distributing, or modifying the FreeType Project, you indicate that you -understand and accept all the terms of this license. <br> -<br> -4. Contacts -<br> ------------ -<br> -There are two mailing lists related to FreeType: <br> -o freetype@freetype.org <br> +advertising materials: `FreeType Project', `FreeType Engine', +`FreeType library', or `FreeType Distribution'.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +As you have not signed this license, you are not required to accept +it. However, as the FreeType Project is copyrighted material, only +this license, or another one contracted with the authors, grants you +the right to use, distribute, and modify it. Therefore, by using, +distributing, or modifying the FreeType Project, you indicate that +you understand and accept all the terms of this license.</P> +<H3 LANG="en-US" CLASS="western">4. Contacts</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +There are two mailing lists related to FreeType:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + freetype@freetype.org</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Discusses general use and applications of FreeType, as well as future and wanted additions to the library and distribution. If you are looking for support, start in this list if you haven't found anything -to help you in the documentation. <br> -o devel@freetype.org <br> +to help you in the documentation.</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + devel@freetype.org</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Discusses bugs, as well as engine internals, design issues, specific -licenses, porting, etc. <br> -o http://www.freetype.org <br> +licenses, porting, etc.</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="http://www.freetype.org/">http://www.freetype.org</A></P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Holds the current FreeType web page, which will allow you to download -our latest development version and read online documentation. <br> -<br> -You can also contact us individually at: <br> -<br> -David Turner <david .turner@freetype.org=""> <br> -Robert Wilhelm <robert .wilhelm@freetype.org=""> <br> -Werner Lemberg <werner .lemberg@freetype.org=""> <br> -</werner></robert></david> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: GTK+ (The Gimp Toolkit); Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>gimp.org<br> -</h2> -<h3>The Gimp Toolkit (GTK+)<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:HSQL Database Engine; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Thomas Mueller and the Hypersonic SQL Group: <br> -</h2> -<h3>HSQLDB<br> -</h3> - - <p align="left"> <br> - <b>ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")</b></p> - <p align="left"><b>For content, code, and products originally developed by Thomas - Mueller and the Hypersonic SQL Group:</b><br> - <br> - Copyright (c) 1995-2000 by the Hypersonic SQL Group.<br> - All rights reserved. <br> - </p> - <p>Redistribution and use in source and binary forms, with or without<br> - modification, are permitted provided that the following conditions are met:<br> - <br> - Redistributions of source code must retain the above copyright notice, this<br> - list of conditions and the following disclaimer.<br> - <br> - Redistributions in binary form must reproduce the above copyright notice,<br> - this list of conditions and the following disclaimer in the documentation<br> - and/or other materials provided with the distribution.<br> - <br> - Neither the name of the Hypersonic SQL Group nor the names of its<br> - contributors may be used to endorse or promote products derived from this<br> - software without specific prior written permission.<br> - <br> - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS"<br> - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br> - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br> - ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, <br> - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, <br> - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, <br> - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<br> - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND<br> - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br> - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS<br> - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p> - <p align="left">This software consists of voluntary contributions made by many - individuals on behalf of the<br> - Hypersonic SQL Group.<br> - <br> - </p> - <h4 align="left">For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):</h4> - <p>Copyright (c) 2001-2004, The HSQL Development Group<br> - All rights reserved.<br> - <br> - Redistribution and use in source and binary forms, with or without<br> - modification, are permitted provided that the following conditions are met:<br> - <br> - Redistributions of source code must retain the above copyright notice, this<br> - list of conditions and the following disclaimer.<br> - <br> - Redistributions in binary form must reproduce the above copyright notice,<br> - this list of conditions and the following disclaimer in the documentation<br> - and/or other materials provided with the distribution.<br> - <br> - Neither the name of the HSQL Development Group nor the names of its<br> - contributors may be used to endorse or promote products derived from this<br> - software without specific prior written permission.<br> - <br> - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS"<br> - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br> - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br> - ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, <br> - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, <br> - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, <br> - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<br> - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND<br> - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br> - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS<br> - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p> - <br> - - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Polish hyphenation dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Bence Nagy<br>
-</h2>
-<h3>Hungarian hyphenation dictionary<br>
-</h3>
-<br>
-<a href="#gpl">Lesser Gnu Library License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Lithuanian pattern for hyphenation; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>n/a<br>
-</h2>
-<h3>Lithuanian pattern for hyphenation<br>
-</h3>
-<br>
-<a href="#lppl">jump to the LaTeX Project Public License</a><br>
-
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Polish hyphenation dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Adam Polaczynski<br>
-</h2>
-<h3>Polish hyphenation dictionary<br>
-</h3>
-<br>
-<a href="#lgpl">Lesser Gnu Library License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Slovenian pattern for hyphenation; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Matjaz Vrecko<br>
-</h2>
-<h3>Slovenian pattern for hyphenation<br>
-</h3>
-<br>
-<a href="#lgpl">Lesser Gnu Library License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Zulu hyphenation dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Friedel Wolff<br>
-</h2>
-<h3>Zulu hyphenation dictionary<br>
-</h3>
-<br>
-<a href="#lgpl">Lesser Gnu Library License</a><br>
- </body>
- </html>
-<html> - -<head> -</head> - -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: ICU; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>International Business Machine Corporation (IBM)<br> -</h2> -<h3>ICU<br> -</h3> - - -<h4>ICU License - ICU 1.8.1 and later</h4> -<pre> -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1995-2002 International Business Machines Corporation and others -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - +our latest development version and read online documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You can also contact us individually at:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +David Turner<BR>Robert Wilhelm<BR>Werner Lemberg</P> +<H2 LANG="en-US" CLASS="western">GNU ISO C++ Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: GNU ISO C++ +Library. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +© Free Software Foundation, Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western">Additional License(s)</H3> +<PRE LANG="en-US" CLASS="western"> +<SPAN LANG="en-US">libstdc++:</SPAN> +<SPAN LANG="en-US">// Explicit instantiation file.</SPAN> + +<SPAN LANG="en-US">// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002</SPAN> +<SPAN LANG="en-US">// Free Software Foundation, Inc.</SPAN> +<SPAN LANG="en-US">//</SPAN> +<SPAN LANG="en-US">// This file is part of the GNU ISO C++ Library. This library is free</SPAN> +<SPAN LANG="en-US">// software; you can redistribute it and/or modify it under the</SPAN> +<SPAN LANG="en-US">// terms of the GNU General Public License as published by the</SPAN> +<SPAN LANG="en-US">// Free Software Foundation; either version 2, or (at your option)</SPAN> +<SPAN LANG="en-US">// any later version.</SPAN> + +<SPAN LANG="en-US">// This library is distributed in the hope that it will be useful,</SPAN> +<SPAN LANG="en-US">// but WITHOUT ANY WARRANTY; without even the implied warranty of</SPAN> +<SPAN LANG="en-US">// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</SPAN> +<SPAN LANG="en-US">// GNU General Public License for more details.</SPAN> + +<SPAN LANG="en-US">// You should have received a copy of the GNU General Public License along</SPAN> +<SPAN LANG="en-US">// with this library; see the file COPYING. If not, write to the Free</SPAN> +<SPAN LANG="en-US">// Software Foundation, 59 Temple Place - Suite 330, Boston, MA</SPAN> +<SPAN LANG="en-US">02111-1307,</SPAN> +<SPAN LANG="en-US">// USA.</SPAN> + +<SPAN LANG="en-US">// As a special exception, you may use this file as part of a free</SPAN> +<SPAN LANG="en-US">software</SPAN> +<SPAN LANG="en-US">// library without restriction. Specifically, if other files instantiate</SPAN> +<SPAN LANG="en-US">// templates or use macros or inline functions from this file, or you</SPAN> +<SPAN LANG="en-US">compile</SPAN> +<SPAN LANG="en-US">// this file and link it with other files to produce an executable, this</SPAN> +<SPAN LANG="en-US">// file does not by itself cause the resulting executable to be covered by</SPAN> +<SPAN LANG="en-US">// the GNU General Public License. This exception does not however</SPAN> +<SPAN LANG="en-US">// invalidate any other reasons why the executable file might be</SPAN> +<SPAN LANG="en-US">covered by</SPAN> +<SPAN LANG="en-US">// the GNU General Public License.</SPAN> + +<SPAN LANG="en-US">libgcc:</SPAN> +<SPAN LANG="en-US">//</SPAN> +<SPAN LANG="en-US">// ISO C++ 14882:</SPAN> +<SPAN LANG="en-US">//</SPAN> + +<SPAN LANG="en-US">/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.</SPAN> + <SPAN LANG="en-US">Contributed by Jakub Jelinek .</SPAN> + + <SPAN LANG="en-US">This file is part of GNU CC.</SPAN> + + <SPAN LANG="en-US">GNU CC is free software; you can redistribute it and/or modify</SPAN> + <SPAN LANG="en-US">it under the terms of the GNU General Public License as published by</SPAN> + <SPAN LANG="en-US">the Free Software Foundation; either version 2, or (at your option)</SPAN> + <SPAN LANG="en-US">any later version.</SPAN> + + <SPAN LANG="en-US">GNU CC is distributed in the hope that it will be useful,</SPAN> + <SPAN LANG="en-US">but WITHOUT ANY WARRANTY; without even the implied warranty of</SPAN> + <SPAN LANG="en-US">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</SPAN> + <SPAN LANG="en-US">GNU General Public License for more details.</SPAN> + + <SPAN LANG="en-US">You should have received a copy of the GNU General Public License</SPAN> + <SPAN LANG="en-US">along with GNU CC; see the file COPYING. If not, write to</SPAN> + <SPAN LANG="en-US">the Free Software Foundation, 59 Temple Place - Suite 330,</SPAN> + <SPAN LANG="en-US">Boston, MA 02111-1307, USA. */</SPAN> + +<SPAN LANG="en-US">/* As a special exception, if you link this library with other files,</SPAN> + <SPAN LANG="en-US">some of which are compiled with GCC, to produce an executable,</SPAN> + <SPAN LANG="en-US">this library does not by itself cause the resulting executable</SPAN> + <SPAN LANG="en-US">to be covered by the GNU General Public License.</SPAN> + <SPAN LANG="en-US">This exception does not however invalidate any other reasons why</SPAN> + <SPAN LANG="en-US">the executable file might be covered by the GNU General Public</SPAN> +<SPAN LANG="en-US">License. */</SPAN> + +<SPAN LANG="en-US">/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF</SPAN> + <SPAN LANG="en-US">segment and dl_iterate_phdr to avoid register/deregister calls at</SPAN> + <SPAN LANG="en-US">DSO load/unload. */</SPAN></PRE><H2 LANG="en-US" CLASS="western"> +Graphite2</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Graphite2. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 2010, SIL International All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This library is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +License, or (at your option) any later version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program 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 for more details.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You should also have received a copy of the GNU Lesser General Public +License along with this library in the file named "LICENSE". +If not, write to the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307, USA or visit their web page on the + internet at <A HREF="http://www.fsf.org/licenses/lgpl.html">http://www.fsf.org/licenses/lgpl.html</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Alternatively, you may use this library under the terms of the +Mozilla Public License (<A HREF="http://mozilla.org/MPL">http://mozilla.org/MPL</A>) +or under the GNU General Public License, as published by the Free +Sofware Foundation; either version 2 of the license or (at your +option) any later version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">HSQLDB</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: HSQLDB. Use +of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">ORIGINAL LICENSE (a.k.a. +"hypersonic_lic.txt")</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For content, code, and products originally developed by Thomas +Mueller and the Hypersonic SQL Group:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1995-2000 by the Hypersonic SQL Group. All rights +reserved. Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution of source code must retain the above copyright notice, +this list of conditions and the following disclaimer.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Neither the name of the Hypersonic SQL Group nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE HYPERSONIC SQL GROUP, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary +contributions made by many individuals on behalf of the Hypersonic +SQL Group.</P> +<H3 LANG="en-US" CLASS="western">For work added by the HSQL +Development Group (a.k.a. hsqldb_lic.txt)</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2001-2004, The HSQL Development Group All rights +reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution of source code must retain the above copyright notice, +this list of conditions and the following disclaimer.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Neither the name of the HSQL Development Group nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<H2 LANG="en-US" CLASS="western">Hunspell</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hunspell. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GPL 2.0/LGPL 2.1/MPL 1.1 tri-license</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The contents of this software may be used under the terms of the GNU +General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the +"LGPL") or (excepting the LGPLed GNU gettext library in the +intl/ directory) the Mozilla Public License Version 1.1 or later (the +"MPL").</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Software distributed under these licenses is distributed on an "AS +IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +implied. See the licenses for the specific language governing rights +and limitations under the licenses.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">Hyphen</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hyphen. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GPL 2.0/LGPL 2.1/MPL 1.1 tri-license</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The contents of this software may be used under the terms of the GNU +General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the +"LGPL") or (excepting the LGPLed GNU gettext library in the +intl/ directory) the Mozilla Public License Version 1.1 or later (the +"MPL").</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Plain TeX hyphenation tables "hyphen.tex" by Donald E. +Knuth has a non MPL/LGPL compatible license, but freely +redistributable: "Unlimited copying and redistribution of this +file are permitted as long as this file is not modified. +Modifications are permitted, but only if the resulting file is not +named hyphen.tex."</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Software distributed under these licenses is distributed on an "AS +IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +implied. See the licenses for the specific language governing rights +and limitations under the licenses.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">ICU</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: ICU. Use of +any of this software is governed by the terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">ICU License - ICU 1.8.1 and later</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +COPYRIGHT AND PERMISSION NOTICE</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1995-2002 International Business Machines Corporation +and others All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, provided +that the above copyright notice(s) and this permission notice appear +in all copies of the Software and that both the above copyright +notice(s) and this permission notice appear in supporting +documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE +COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY +CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. - --------------------------------------------------------------------------------- -All trademarks and registered trademarks mentioned herein are the property of their respective owners. -</pre> -</body> -</html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: JDOM; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Jason Hunter, Brett McLaughlin<br> -</h2> -<h3>JDOM<br> -</h3> -Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. - All rights reserved. - <br> - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - <br> - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. - <br> - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. - <br> - - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact <request_AT_jdom_DOT_org>. - <br> - - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management <request_AT_jdom_DOT_org>. - <br> - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - <br> - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - <br> - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. - <br> - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - <br> - - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter <jhunter_AT_jdom_DOT_org> and - Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information - on the JDOM Project, please see <http://www.jdom.org/>. - <br> - - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: IJG JPEG Library; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Independent JPEG Group (IJG)<br> -</h2> -<h3>IJG JPEG Library<br> -</h3> -<pre> -LEGAL ISSUES -============ - -In plain English: - -1. We don't promise that this software works. (But if you find any bugs, - please let us know!) -2. You can use this software for whatever you want. You don't have to pay us. -3. You may not pretend that you wrote this software. If you use it in a - program, you must acknowledge somewhere in your documentation that - you've used the IJG code. - -In legalese: - -The authors make NO WARRANTY or representation, either express or implied, -with respect to this software, its quality, accuracy, merchantability, or -fitness for a particular purpose. This software is provided "AS IS", and you, -its user, assume the entire risk as to its quality and accuracy. - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -Permission is hereby granted to use, copy, modify, and distribute this -software (or portions thereof) for any purpose, without fee, subject to these -conditions: -(1) If any part of the source code for this software is distributed, then this -README file must be included, with this copyright and no-warranty notice -unaltered; and any additions, deletions, or changes to the original files -must be clearly indicated in accompanying documentation. -(2) If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the work of -the Independent JPEG Group". -(3) Permission for use of this software is granted only if the user accepts -full responsibility for any undesirable consequences; the authors accept -NO LIABILITY for damages of any kind. - -These conditions apply to any software derived from or based on the IJG code, -not just to the unmodified library. If you use our work, you ought to -acknowledge us. - -Permission is NOT granted for the use of any IJG author's name or company name -in advertising or publicity relating to this software or products derived from -it. This software may be referred to only as "the Independent JPEG Group's -software". - -We specifically permit and encourage the use of this software as the basis of -commercial products, provided that all warranty or liability claims are -assumed by the product vendor. - - -ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, -sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. -ansi2knr.c is NOT covered by the above copyright and conditions, but instead -by the usual distribution terms of the Free Software Foundation; principally, -that you must include source code if you redistribute it. (See the file -ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part -of any program generated from the IJG code, this does not limit you more than -the foregoing paragraphs do. - -The Unix configuration script "configure" was produced with GNU Autoconf. -It is copyright by the Free Software Foundation but is freely distributable. -The same holds for its supporting scripts (config.guess, config.sub, -ltconfig, ltmain.sh). Another support script, install-sh, is copyright -by M.I.T. but is also freely distributable. - -It appears that the arithmetic coding option of the JPEG spec is covered by -patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot -legally be used without obtaining one or more licenses. For this reason, -support for arithmetic coding has been removed from the free JPEG software. -(Since arithmetic coding provides only a marginal gain over the unpatented -Huffman mode, it is unlikely that very many implementations will support it.) -So far as we are aware, there are no patent restrictions on the remaining -code. - -The IJG distribution formerly included code to read and write GIF files. -To avoid entanglement with the Unisys LZW patent, GIF reading support has -been removed altogether, and the GIF writer has been simplified to produce -"uncompressed GIFs". This technique does not use the LZW algorithm; the -resulting GIF files are larger than usual, but are readable by all standard -GIF decoders. - -We are required to state that - "The Graphics Interchange Format(c) is the Copyright property of - CompuServe Incorporated. GIF(sm) is a Service Mark property of - CompuServe Incorporated." - -</pre> - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libegg; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Anders Carlson - <br> -</h2> -<h3>libegg<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libmspack; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Stuart Caie - <br> -</h2> -<h3>libmspack<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Redland RDF Library librdf; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Dave Beckett<br> -</h2> -<h3>librdf<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: GNU ISO C++ Library; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Free Software Foundation, Inc.<br>
-</h2>
-<h3>GNU ISO C++ Library<br>
-</h3>
-<br>
-<a href="#gpl">Jump to GPL</a><br>
-
-
-<pre>
-GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-Additional License(s)
-
-libstdc++:
-// Explicit instantiation file.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library 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 General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING. If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free
-software
-// library without restriction. Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you
-compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License. This exception does not however
-// invalidate any other reasons why the executable file might be
-covered by
-// the GNU General Public License.
-
-libgcc:
-//
-// ISO C++ 14882:
-//
-
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- Contributed by Jakub Jelinek .
-
- This file is part of GNU CC.
-
- GNU CC is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- GNU CC 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNU CC; see the file COPYING. If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* As a special exception, if you link this library with other files,
- some of which are compiled with GCC, to produce an executable,
- this library does not by itself cause the resulting executable
- to be covered by the GNU General Public License.
- This exception does not however invalidate any other reasons why
- the executable file might be covered by the GNU General Public
-License. */
-
-/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF
- segment and dl_iterate_phdr to avoid register/deregister calls at
- DSO load/unload. */
-
-</pre>
-
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: libtextcat; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>WiseGuys Internet B.V.<br>
-</h2>
-<h3>libtextcat<br>
-</h3>
-<br>Copyright (c) 2003, WiseGuys Internet B.V.
-<br>
-All rights reserved.
-<br>
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-<br>
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-<br>
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-<br>
-- Neither the name of the WiseGuys Internet B.V. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-<br>
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libwpd; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>William LaChance<br> -</h2> -<h3>libwpd<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -Except where otherwise noted in the source code (trio files, hash.c and list.c) -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libxml2; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Daniel Veillard<br> -</h2> -<h3>libxml2<br> -</h3> - - Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Daniel Veillard shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: XML Security Library; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Aleksey Sanin<br> -</h2> -<h3>XML Security Library<br> -</h3> -<br> -<pre> -XML Security Library - -Use of any of this software is governed by the terms of the license below: - -Please note: We do not use all libraries of the project, but only: -- xmlsec-core; License: MIT -- xmlsec-nss; License: GPL + MPL - -------------------------------------------------- -The MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -The GNU General Public License (GPL) -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most -of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you can -do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show them -these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually -obtain patent licenses, in effect making the program proprietary. To prevent -this, we have made it clear that any patent must be licensed for everyone's free -use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program or -work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included without -limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of any -warranty; and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating that -you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or -in part contains or is derived from the Program or any part thereof, to be -licensed as a whole at no charge to all third parties under the terms of this -License. - - c) If the modified program normally reads commands interactively when run, -you must cause it, when started running for such interactive use in the most -ordinary way, to print or display an announcement including an appropriate -copyright notice and a notice that there is no warranty (or else, saying that -you provide a warranty) and that users may redistribute the program under these -conditions, and telling the user how to view a copy of this License. (Exception: -if the Program itself is interactive but does not normally print such an -announcement, your work based on the Program is not required to print an -announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section -2) in object code or executable form under the terms of Sections 1 and 2 above -provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to -give any third party, for a charge no more than your cost of physically -performing source distribution, a complete machine-readable copy of the -corresponding source code, to be distributed under the terms of Sections 1 and 2 -above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to -distribute corresponding source code. (This alternative is allowed only for -noncommercial distribution and only if you received the program in object code -or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code distributed -need not include anything that is normally distributed (in either source or -binary form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component itself -accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source code -from the same place counts as distribution of the source code, even though third -parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or any -work based on the Program), you indicate your acceptance of this License to do -so, and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by third -parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed -on you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your -obligations under this License and any other pertinent obligations, then as a -consequence you may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by all those -who receive copies directly or indirectly through you, then the only way you -could satisfy both it and this License would be to refrain entirely from -distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and the -section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the -Program does not specify a version number of this License, you may choose any -version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE -PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED -IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS -IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT -NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY -TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF -THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use -to the public, the best way to achieve this is to make it free software which -everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - one line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) any -later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes -with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, -and you are welcome to redistribute it under certain conditions; type `show c' -for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here is -a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest - in the program `Gnomovision' (which makes passes at compilers) - written by James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may consider -it more useful to permit linking proprietary applications with the library. If -this is what you want to do, use the GNU Library General Public License instead -of this License. ----------------------------------------------------------- -Mozilla Public License Version 1.0 - -1. Definitions. - - 1.1. "Contributor" means each entity that creates or contributes to the -creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original Code, -prior Modifications used by a Contributor, and the Modifications made by that -particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the -combination of the Original Code and Modifications, in each case including -portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally -accepted in the software development community for the electronic transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source Code. - - 1.6. "Initial Developer" means the individual or entity identified as the -Initial Developer in the Source Code notice required by Exhibit A. - - 1.7. "Larger Work" means a work which combines Covered Code or portions -thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.9. "Modifications" means any addition to or deletion from the substance -or structure of either the Original Code or any previous Modifications. When -Covered Code is released as a series of files, a Modification is: - - A. Any addition to or deletion from the contents of a file -containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or -previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code which is -described in the Source Code notice required by Exhibit A as Original Code, and -which, at the time of its release under this License is not already Covered Code -governed by this License. - - 1.11. "Source Code" means the preferred form of the Covered Code for -making modifications to it, including all modules it contains, plus any -associated interface definition files, scripts used to control compilation and -installation of an Executable, or a list of source code differential comparisons -against either the Original Code or another well known, available Covered Code -of the Contributor's choice. The Source Code can be in a compressed or archival -form, provided the appropriate decompression or de-archiving software is widely -available for no charge. - - 1.12. "You" means an individual or a legal entity exercising rights under, -and complying with all of the terms of, this License or a future version of this -License issued under Section 6.1. For legal entities, "You" includes any entity -which controls, is controlled by, or is under common control with You. For -purposes of this definition, "control" means (a) the power, direct or indirect, -to cause the direction or management of such entity, whether by contract or -otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding -shares or beneficial ownership of such entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: - - (a) to use, reproduce, modify, display, perform, sublicense and -distribute the Original Code (or portions thereof) with or without -Modifications, or as part of a Larger Work; and - - (b) under patents now or hereafter owned or controlled by Initial -Developer, to make, have made, use and sell ("Utilize") the Original Code (or -portions thereof), but solely to the extent that any such patent is reasonably -necessary to enable You to Utilize the Original Code (or portions thereof) and -not to any greater extent that may be necessary to Utilize further Modifications -or combinations. - - 2.2. Contributor Grant. - Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: - - (a) to use, reproduce, modify, display, perform, sublicense and -distribute the Modifications created by such Contributor (or portions thereof) -either on an unmodified basis, with other Modifications, as Covered Code or as -part of a Larger Work; and - - (b) under patents now or hereafter owned or controlled by -Contributor, to Utilize the Contributor Version (or portions thereof), but -solely to the extent that any such patent is reasonably necessary to enable You -to Utilize the Contributor Version (or portions thereof), and not to any greater -extent that may be necessary to Utilize further Modifications or combinations. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are governed -by the terms of this License, including without limitation Section 2.2. The -Source Code version of Covered Code may be distributed only under the terms of -this License or a future version of this License released under Section 6.1, and -You must include a copy of this License with every copy of the Source Code You -distribute. You may not offer or impose any terms on any Source Code version -that alters or restricts the applicable version of this License or the -recipients' rights hereunder. However, You may include an additional document -offering the additional rights described in Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be made -available in Source Code form under the terms of this License either on the same -media as an Executable version or via an accepted Electronic Distribution -Mechanism to anyone to whom you made an Executable version available; and if -made available via Electronic Distribution Mechanism, must remain available for -at least twelve (12) months after the date it initially became available, or at -least six (6) months after a subsequent version of that particular Modification -has been made available to such recipients. You are responsible for ensuring -that the Source Code version remains available even if the Electronic -Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which you contribute to contain a file -documenting the changes You made to create that Covered Code and the date of any -change. You must include a prominent statement that the Modification is derived, -directly or indirectly, from Original Code provided by the Initial Developer and -including the name of the Initial Developer in (a) the Source Code, and (b) in -any notice in an Executable version or related documentation in which You -describe the origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - - (a) Third Party Claims. - If You have knowledge that a party claims an intellectual property -right in particular functionality or code (or its utilization under this -License), you must include a text file with the source code distribution titled -"LEGAL" which describes the claim and the party making the claim in sufficient -detail that a recipient will know whom to contact. If you obtain such knowledge -after You make Your Modification available as described in Section 3.2, You -shall promptly modify the LEGAL file in all copies You make available thereafter -and shall take other steps (such as notifying appropriate mailing lists or -newsgroups) reasonably calculated to inform those who received the Covered Code -that new knowledge has been obtained. - - (b) Contributor APIs. - If Your Modification is an application programming interface and You -own or control patents which are reasonably necessary to implement that API, you -must also include this information in the LEGAL file. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source -Code, and this License in any documentation for the Source Code, where You -describe recipients' rights relating to Covered Code. If You created one or more -Modification(s), You may add your name as a Contributor to the notice described -in Exhibit A. If it is not possible to put such notice in a particular Source -Code file due to its structure, then you must include such notice in a location -(such as a relevant directory file) where a user would be likely to look for -such a notice. You may choose to offer, and to charge a fee for, warranty, -support, indemnity or liability obligations to one or more recipients of Covered -Code. However, You may do so only on Your own behalf, and not on behalf of the -Initial Developer or any Contributor. You must make it absolutely clear than any -such warranty, support, indemnity or liability obligation is offered by You -alone, and You hereby agree to indemnify the Initial Developer and every -Contributor for any liability incurred by the Initial Developer or such -Contributor as a result of warranty, support, indemnity or liability terms You -offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the -requirements of Section 3.1-3.5 have been met for that Covered Code, and if You -include a notice stating that the Source Code version of the Covered Code is -available under the terms of this License, including a description of how and -where You have fulfilled the obligations of Section 3.2. The notice must be -conspicuously included in any notice in an Executable version, related -documentation or collateral in which You describe recipients' rights relating to -the Covered Code. You may distribute the Executable version of Covered Code -under a license of Your choice, which may contain terms different from this -License, provided that You are in compliance with the terms of this License and -that the license for the Executable version does not attempt to limit or alter -the recipient's rights in the Source Code version from the rights set forth in -this License. If You distribute the Executable version under a different license -You must make it absolutely clear that any terms which differ from this License -are offered by You alone, not by the Initial Developer or any Contributor. You -hereby agree to indemnify the Initial Developer and every Contributor for any -liability incurred by the Initial Developer or such Contributor as a result of -any such terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code not -governed by the terms of this License and distribute the Larger Work as a single -product. In such a case, You must make sure the requirements of this License are -fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Code due to statute or -regulation then You must: (a) comply with the terms of this License to the -maximum extent possible; and (b) describe the limitations and the code they -affect. Such description must be included in the LEGAL file described in Section -3.4 and must be included with all distributions of the Source Code. Except to -the extent prohibited by statute or regulation, such description must be -sufficiently detailed for a recipient of ordinary skill to be able to understand -it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has attached -the notice in Exhibit A, and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised -and/or new versions of the License from time to time. Each version will be given -a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the -License, You may always continue to use it under the terms of that version. You -may also choose to use such Covered Code under the terms of any subsequent -version of the License published by Netscape. No one other than Netscape has the -right to modify the terms applicable to Covered Code created under this License. - - 6.3. Derivative Works. - If you create or use a modified version of this License (which you may -only do in order to apply it to code which is not already Covered Code governed -by this License), you must (a) rename Your license so that the phrases -"Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar -phrase do not appear anywhere in your license and (b) otherwise make it clear -that your version of the license contains terms which differ from the Mozilla -Public License and Netscape Public License. (Filling in the name of the Initial -Developer, Original Code or Contributor in the notice described in Exhibit A -shall not of themselves be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, -FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE -QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. -THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO -USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - This License and the rights granted hereunder will terminate automatically -if You fail to comply with terms herein and fail to cure such breach within 30 -days of becoming aware of the breach. All sublicenses to the Covered Code which -are properly granted shall survive any termination of this License. Provisions -which, by their nature, must remain in effect beyond the termination of this -License shall survive. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER -CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH -PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR -MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH -PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS -LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL -INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW -PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR -LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND -LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in 48 -C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and -"commercial computer software documentation," as such terms are used in 48 -C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. -227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire -Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject matter -hereof. If any provision of this License is held to be unenforceable, such -provision shall be reformed only to the extent necessary to make it enforceable. -This License shall be governed by California law provisions (except to the -extent applicable law, if any, provides otherwise), excluding its -conflict-of-law provisions. With respect to disputes in which at least one party -is a citizen of, or an entity chartered or registered to do business in, the -United States of America: (a) unless otherwise agreed in writing, all disputes -relating to this License (excepting any dispute relating to intellectual -property rights) shall be subject to final and binding arbitration, with the -losing party paying all costs of arbitration; (b) any arbitration relating to -this Agreement shall be held in Santa Clara County, California, under the -auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement -shall be subject to the jurisdiction of the Federal Courts of the Northern -District of California, with venue lying in Santa Clara County, California, with -the losing party responsible for costs, including without limitation, court -costs and reasonable attorneys fees and expenses. The application of the United -Nations Convention on Contracts for the International Sale of Goods is expressly -excluded. Any law or regulation which provides that the language of a contract -shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. - - Except in cases where another Contributor has failed to comply with -Section 3.4, You are responsible for damages arising, directly or indirectly, -out of Your utilization of rights under this License, based on the number of -copies of Covered Code you made available, the revenues you received from -utilizing such rights, and other relevant factors. You agree to work with -affected parties to distribute responsibility on an equitable basis. - -EXHIBIT A. - - "The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the -specific language governing rights and limitations under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. -Portions created by ______________________ are Copyright (C) ______ -_______________________. All Rights Reserved. - - Contributor(s): ______________________________________." - -</pre> - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: libxslt; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>www.xmlsoft.org<br> -</h2> -<h3>libxslt<br> -</h3> - Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. -<br> -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: -<br> -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -<br> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -<br> -Except as contained in this notice, the name of Daniel Veillard shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. - -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: lpsolve; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Kjell Eikland and Peter Notebaert - <br> -</h2> -<h3>lpsolve<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Network Audio System; Use of any of this -software is governed -by the terms of the license below:<br> -<h2>Network Computer Devices, Inc.</h2> -<h3>Network Audio System (NAS)</h3> -Copyright 1995 Network Computing Devices, Inc. Permission to use, copy, -modify, distribute, and sell this software and its documentation for -any purpose is hereby granted without fee, provided that the above -copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, -and that the name Network Computing Devices, Inc. not be used in -advertising or publicity pertaining to distribution of this software -without specific, written prior permission. <br> -<br> -THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC., -DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK -COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, -INCLUDING SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS -OF USE, DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, -AND REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: NeoLight 1.1.x; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Planamesa, Inc.<br>
-</h2>
-<h3>NeoLight<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: neon; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Joe Orton<br> -</h2> -<h3>neon<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"><html><head> - - <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"> - - <meta content="Mozilla/4.5 [en]C-NSCP (Win95; U) [Netscape]" name="GENERATOR"><title>Mozilla Public License version 1.1</title></head> - - - -<body alink="#ff0000" vlink="#551a8b" link="#0000ee" bgcolor="#ffffff" text="#000000"> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Network Security Services; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>The Mozilla Foundation<br> -</h2> -<h3>Network Security Services (NSS)<br> -</h3> - - -<center><b><font size="+2">MOZILLA PUBLIC LICENSE</font></b> - -<br><b>Version 1.1</b> - -<p> - -</p><hr width="20%"></center> - - -<a name="1"></a> -<p><b>1. Definitions.</b> - -<a name="1.0.1"></a> -</p><ul><b>1.0.1. "Commercial Use" </b>means distribution or otherwise making - -the Covered Code available to a third party. - -<a name="1.1"></a> -<p><b>1.1. ''Contributor''</b> means each entity that creates or contributes - -to the creation of Modifications. - -<a name="1.2"></a> -</p><p><b>1.2. ''Contributor Version''</b> means the combination of the Original - -Code, prior Modifications used by a Contributor, and the Modifications - -made by that particular Contributor. - -<a name="1.3"></a> -</p><p><b>1.3. ''Covered Code''</b> means the Original Code or Modifications - -or the combination of the Original Code and Modifications, in each case - -including portions thereof<b>.</b> - -<a name="1.4"></a> -</p><p><b>1.4. ''Electronic Distribution Mechanism''</b> means a mechanism - -generally accepted in the software development community for the electronic - -transfer of data. - -<a name="1.5"></a> -</p><p><b>1.5. ''Executable''</b> means Covered Code in any form other than - -Source Code. - -<a name="1.6"></a> -</p><p><b>1.6. ''Initial Developer''</b> means the individual or entity identified - -as the Initial Developer in the Source Code notice required by <b>Exhibit - -A</b>. - -<a name="1.7"></a> -</p><p><b>1.7. ''Larger Work''</b> means a work which combines Covered Code - -or portions thereof with code not governed by the terms of this License. - -<a name="1.8"></a> -</p><p><b>1.8. ''License''</b> means this document. - -<a name="1.8.1"></a> -</p><p><b>1.8.1. "Licensable"</b> means having the right to grant, to the maximum - -extent possible, whether at the time of the initial grant or subsequently - -acquired, any and all of the rights conveyed herein. - -<a name="1.9"></a> -</p><p><b>1.9. ''Modifications''</b> means any addition to or deletion from - -the substance or structure of either the Original Code or any previous - -Modifications. When Covered Code is released as a series of files, a Modification - -is: - -</p><ul><b>A.</b> Any addition to or deletion from the contents of a file containing - -Original Code or previous Modifications. - -<p><b>B.</b> Any new file that contains any part of the Original Code or - -previous Modifications. - -<br> </p></ul> - -<a name="1.10"></a> -<b>1.10. ''Original Code''</b> means Source Code of computer software code - -which is described in the Source Code notice required by <b>Exhibit A</b> - -as Original Code, and which, at the time of its release under this License - -is not already Covered Code governed by this License. - -<a name="1.10.1"></a> -<p><b>1.10.1. "Patent Claims"</b> means any patent claim(s), now owned - -or hereafter acquired, including without limitation, method, process, - -and apparatus claims, in any patent Licensable by grantor. - -<a name="1.11"></a> -</p><p><b>1.11. ''Source Code''</b> means the preferred form of the Covered - -Code for making modifications to it, including all modules it contains, - -plus any associated interface definition files, scripts used to control - -compilation and installation of an Executable, or source code differential - -comparisons against either the Original Code or another well known, available - -Covered Code of the Contributor's choice. The Source Code can be in a compressed - -or archival form, provided the appropriate decompression or de-archiving - -software is widely available for no charge. - -<a name="1.12"></a> -</p><p><b>1.12. "You'' (or "Your") </b> means an individual or a legal - -entity exercising rights under, and complying with all of the terms of, - -this License or a future version of this License issued under Section 6.1. - -For legal entities, "You'' includes any entity which controls, is controlled - -by, or is under common control with You. For purposes of this definition, - -"control'' means (a) the power, direct or indirect, to cause the direction - -or management of such entity, whether by contract or otherwise, or (b) - -ownership of more than fifty percent (50%) of the outstanding shares or - -beneficial ownership of such entity.</p></ul> - -<a name="2"></a> -<b>2. Source Code License.</b> - -<a name="2.1"></a> -<ul><b>2.1. The Initial Developer Grant.</b> - -<br>The Initial Developer hereby grants You a world-wide, royalty-free, - -non-exclusive license, subject to third party intellectual property claims: - -<ul><b>(a)</b> <b> </b>under intellectual property rights (other than - -patent or trademark) Licensable by Initial Developer to use, reproduce, - -modify, display, perform, sublicense and distribute the Original Code (or - -portions thereof) with or without Modifications, and/or as part of a Larger - -Work; and - -<p><b>(b)</b> under Patents Claims infringed by the making, using or selling - -of Original Code, to make, have made, use, practice, sell, and offer for - -sale, and/or otherwise dispose of the Original Code (or portions thereof). - -</p><ul> - -<ul> </ul> - -</ul> - -<b>(c) </b>the licenses granted in this Section 2.1(a) and (b) are effective - -on the date Initial Developer first distributes Original Code under the - -terms of this License. - -<p><b>(d) </b>Notwithstanding Section 2.1(b) above, no patent license is - -granted: 1) for code that You delete from the Original Code; 2) separate - -from the Original Code; or 3) for infringements caused by: i) the - -modification of the Original Code or ii) the combination of the Original - -Code with other software or devices. - -<br> </p></ul> - -<a name="2.2"></a> -<b>2.2. Contributor Grant.</b> - -<br>Subject to third party intellectual property claims, each Contributor - -hereby grants You a world-wide, royalty-free, non-exclusive license - -<ul> - -<br><b>(a)</b> <b> </b>under intellectual property rights (other than - -patent or trademark) Licensable by Contributor, to use, reproduce, modify, - -display, perform, sublicense and distribute the Modifications created by - -such Contributor (or portions thereof) either on an unmodified basis, with - -other Modifications, as Covered Code and/or as part of a Larger Work; and - -<p><b>(b)</b> under Patent Claims infringed by the making, using, or selling - -of Modifications made by that Contributor either alone and/or in<font color="#000000"> - -combination with its Contributor Version (or portions of such combination), - -to make, use, sell, offer for sale, have made, and/or otherwise dispose - -of: 1) Modifications made by that Contributor (or portions thereof); and - -2) the combination of Modifications made by that Contributor with - -its Contributor Version (or portions of such combination).</font> - -</p><p><b>(c) </b>the licenses granted in Sections 2.2(a) and 2.2(b) are effective - -on the date Contributor first makes Commercial Use of the Covered Code. - -</p><p><b>(d) </b> Notwithstanding Section 2.2(b) above, no - -patent license is granted: 1) for any code that Contributor has deleted - -from the Contributor Version; 2) separate from the Contributor Version; - -3) for infringements caused by: i) third party modifications of Contributor - -Version or ii) the combination of Modifications made by that Contributor - -with other software (except as part of the Contributor Version) or - -other devices; or 4) under Patent Claims infringed by Covered Code in the - -absence of Modifications made by that Contributor.</p></ul> - -</ul> - - - -<a name="3"></a> -<p><br><b>3. Distribution Obligations.</b> - -<a name="3.1"></a> -</p><ul><b>3.1. Application of License.</b> - -<br>The Modifications which You create or to which You contribute are governed - -by the terms of this License, including without limitation Section <b>2.2</b>. - -The Source Code version of Covered Code may be distributed only under the - -terms of this License or a future version of this License released under - -Section <b>6.1</b>, and You must include a copy of this License with every - -copy of the Source Code You distribute. You may not offer or impose any - -terms on any Source Code version that alters or restricts the applicable - -version of this License or the recipients' rights hereunder. However, You - -may include an additional document offering the additional rights described - -in Section <b>3.5</b>. - -<a name="3.2"></a> -<p><b>3.2. Availability of Source Code.</b> - -<br>Any Modification which You create or to which You contribute must be - -made available in Source Code form under the terms of this License either - -on the same media as an Executable version or via an accepted Electronic - -Distribution Mechanism to anyone to whom you made an Executable version - -available; and if made available via Electronic Distribution Mechanism, - -must remain available for at least twelve (12) months after the date it - -initially became available, or at least six (6) months after a subsequent - -version of that particular Modification has been made available to such - -recipients. You are responsible for ensuring that the Source Code version - -remains available even if the Electronic Distribution Mechanism is maintained - -by a third party. - -<a name="3.3"></a> -</p><p><b>3.3. Description of Modifications.</b> - -<br>You must cause all Covered Code to which You contribute to contain - -a file documenting the changes You made to create that Covered Code and - -the date of any change. You must include a prominent statement that the - -Modification is derived, directly or indirectly, from Original Code provided - -by the Initial Developer and including the name of the Initial Developer - -in (a) the Source Code, and (b) in any notice in an Executable version - -or related documentation in which You describe the origin or ownership - -of the Covered Code. - -<a name="3.4"></a> -</p><p><b>3.4. Intellectual Property Matters</b> - -</p><ul><b>(a) Third Party Claims</b>. - -<br>If Contributor has knowledge that a license under a third party's intellectual - -property rights is required to exercise the rights granted by such Contributor - -under Sections 2.1 or 2.2, Contributor must include a text file with the - -Source Code distribution titled "LEGAL'' which describes the claim and - -the party making the claim in sufficient detail that a recipient will know - -whom to contact. If Contributor obtains such knowledge after the Modification - -is made available as described in Section 3.2, Contributor shall promptly - -modify the LEGAL file in all copies Contributor makes available thereafter - -and shall take other steps (such as notifying appropriate mailing lists - -or newsgroups) reasonably calculated to inform those who received the Covered - -Code that new knowledge has been obtained. - -<p><b>(b) Contributor APIs</b>. - -<br>If Contributor's Modifications include an application programming interface - -and Contributor has knowledge of patent licenses which are reasonably necessary - -to implement that API, Contributor must also include this information in - -the LEGAL file. - -<br> </p></ul> - - <b>(c) - -Representations.</b> - -<ul>Contributor represents that, except as disclosed pursuant to Section - -3.4(a) above, Contributor believes that Contributor's Modifications are - -Contributor's original creation(s) and/or Contributor has sufficient rights - -to grant the rights conveyed by this License.</ul> - - - -<a name="3.5"></a> -<p><br><b>3.5. Required Notices.</b> - -<br>You must duplicate the notice in <b>Exhibit A</b> in each file of the - -Source Code. If it is not possible to put such notice in a particular - -Source Code file due to its structure, then You must include such notice - -in a location (such as a relevant directory) where a user would be likely - -to look for such a notice. If You created one or more Modification(s) - -You may add your name as a Contributor to the notice described in <b>Exhibit - -A</b>. You must also duplicate this License in any documentation - -for the Source Code where You describe recipients' rights or ownership - -rights relating to Covered Code. You may choose to offer, and to - -charge a fee for, warranty, support, indemnity or liability obligations - -to one or more recipients of Covered Code. However, You may do so only - -on Your own behalf, and not on behalf of the Initial Developer or any Contributor. - -You must make it absolutely clear than any such warranty, support, indemnity - -or liability obligation is offered by You alone, and You hereby agree to - -indemnify the Initial Developer and every Contributor for any liability - -incurred by the Initial Developer or such Contributor as a result of warranty, - -support, indemnity or liability terms You offer. - -<a name="3.6"></a> -</p><p><b>3.6. Distribution of Executable Versions.</b> - -<br>You may distribute Covered Code in Executable form only if the requirements - -of Section <b>3.1-3.5</b> have been met for that Covered Code, and if You - -include a notice stating that the Source Code version of the Covered Code - -is available under the terms of this License, including a description of - -how and where You have fulfilled the obligations of Section <b>3.2</b>. - -The notice must be conspicuously included in any notice in an Executable - -version, related documentation or collateral in which You describe recipients' - -rights relating to the Covered Code. You may distribute the Executable - -version of Covered Code or ownership rights under a license of Your choice, - -which may contain terms different from this License, provided that You - -are in compliance with the terms of this License and that the license for - -the Executable version does not attempt to limit or alter the recipient's - -rights in the Source Code version from the rights set forth in this License. - -If You distribute the Executable version under a different license You - -must make it absolutely clear that any terms which differ from this License - -are offered by You alone, not by the Initial Developer or any Contributor. - -You hereby agree to indemnify the Initial Developer and every Contributor - -for any liability incurred by the Initial Developer or such Contributor - -as a result of any such terms You offer. - -<a name="3.7"></a> -</p><p><b>3.7. Larger Works.</b> - -<br>You may create a Larger Work by combining Covered Code with other code - -not governed by the terms of this License and distribute the Larger Work - -as a single product. In such a case, You must make sure the requirements - -of this License are fulfilled for the Covered Code.</p></ul> - -<a name="4"></a> -<b>4. Inability to Comply Due to Statute or Regulation.</b> - -<ul>If it is impossible for You to comply with any of the terms of this - -License with respect to some or all of the Covered Code due to statute, - -judicial order, or regulation then You must: (a) comply with the terms - -of this License to the maximum extent possible; and (b) describe the limitations - -and the code they affect. Such description must be included in the LEGAL - -file described in Section <b>3.4</b> and must be included with all distributions - -of the Source Code. Except to the extent prohibited by statute or regulation, - -such description must be sufficiently detailed for a recipient of ordinary - -skill to be able to understand it.</ul> - -<a name="5"></a> -<b>5. Application of this License.</b> - -<ul>This License applies to code to which the Initial Developer has attached - -the notice in <b>Exhibit A</b> and to related Covered Code.</ul> - -<a name="6"></a> -<b>6. Versions of the License.</b> - -<a name="6.1"></a> -<ul><b>6.1. New Versions</b>. - -<br>Netscape Communications Corporation (''Netscape'') may publish revised - -and/or new versions of the License from time to time. Each version will - -be given a distinguishing version number. - -<a name="6.2"></a> -<p><b>6.2. Effect of New Versions</b>. - -<br>Once Covered Code has been published under a particular version of - -the License, You may always continue to use it under the terms of that - -version. You may also choose to use such Covered Code under the terms of - -any subsequent version of the License published by Netscape. No one other - -than Netscape has the right to modify the terms applicable to Covered Code - -created under this License. - -<a name="6.3"></a> -</p><p><b>6.3. Derivative Works</b>. - -<br>If You create or use a modified version of this License (which you - -may only do in order to apply it to code which is not already Covered Code - -governed by this License), You must (a) rename Your license so that the - -phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' - -or any confusingly similar phrase do not appear in your license (except - -to note that your license differs from this License) and (b) otherwise - -make it clear that Your version of the license contains terms which differ - -from the Mozilla Public License and Netscape Public License. (Filling in - -the name of the Initial Developer, Original Code or Contributor in the - -notice described in <b>Exhibit A</b> shall not of themselves be deemed - -to be modifications of this License.)</p></ul> - -<a name="7"></a> -<b>7. DISCLAIMER OF WARRANTY.</b> - -<ul>COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT - -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, - -WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT - -FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY - -AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE - -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER - -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. - -THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. - -NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.</ul> - -<a name="8"></a> -<b>8. TERMINATION.</b> - -<a name="8.1"></a> -<ul><b>8.1. </b>This License and the rights granted hereunder will - -terminate automatically if You fail to comply with terms herein and fail - -to cure such breach within 30 days of becoming aware of the breach. All - -sublicenses to the Covered Code which are properly granted shall survive - -any termination of this License. Provisions which, by their nature, must - -remain in effect beyond the termination of this License shall survive. - -<a name="8.2"></a> -<p><b>8.2. </b>If You initiate litigation by asserting a patent infringement - -claim (excluding declatory judgment actions) against Initial Developer - -or a Contributor (the Initial Developer or Contributor against whom You - -file such action is referred to as "Participant") alleging that: - -</p><p><b>(a) </b>such Participant's Contributor Version directly or - -indirectly infringes any patent, then any and all rights granted by such - -Participant to You under Sections 2.1 and/or 2.2 of this License shall, - -upon 60 days notice from Participant terminate prospectively, unless if - -within 60 days after receipt of notice You either: (i) agree in writing - -to pay Participant a mutually agreeable reasonable royalty for Your past - -and future use of Modifications made by such Participant, or (ii) withdraw - -Your litigation claim with respect to the Contributor Version against such - -Participant. If within 60 days of notice, a reasonable royalty and - -payment arrangement are not mutually agreed upon in writing by the parties - -or the litigation claim is not withdrawn, the rights granted by Participant - -to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration - -of the 60 day notice period specified above. - -</p><p><b>(b)</b> any software, hardware, or device, other than such - -Participant's Contributor Version, directly or indirectly infringes any - -patent, then any rights granted to You by such Participant under Sections - -2.1(b) and 2.2(b) are revoked effective as of the date You first made, - -used, sold, distributed, or had made, Modifications made by that Participant. - -<a name="8.3"></a> -</p><p><b>8.3. </b>If You assert a patent infringement claim against - -Participant alleging that such Participant's Contributor Version directly - -or indirectly infringes any patent where such claim is resolved (such as - -by license or settlement) prior to the initiation of patent infringement - -litigation, then the reasonable value of the licenses granted by such Participant - -under Sections 2.1 or 2.2 shall be taken into account in determining the - -amount or value of any payment or license. - -<a name="8.4"></a> -</p><p><b>8.4.</b> In the event of termination under Sections 8.1 or - -8.2 above, all end user license agreements (excluding distributors - -and resellers) which have been validly granted by You or any distributor - -hereunder prior to termination shall survive termination.</p></ul> - -<a name="9"></a> -<b>9. LIMITATION OF LIABILITY.</b> - -<ul>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING - -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, - -ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER - -OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, - -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT - -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE - -OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN - -IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. - -THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR - -PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE - -LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION - -OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION - -AND LIMITATION MAY NOT APPLY TO YOU.</ul> - -<a name="10"></a> -<b>10. U.S. GOVERNMENT END USERS.</b> - -<ul>The Covered Code is a ''commercial item,'' as that term is defined - -in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' - -and ''commercial computer software documentation,'' as such terms are used - -in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and - -48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government - -End Users acquire Covered Code with only those rights set forth herein.</ul> - -<a name="11"></a> -<b>11. MISCELLANEOUS.</b> - -<ul>This License represents the complete agreement concerning subject matter - -hereof. If any provision of this License is held to be unenforceable, such - -provision shall be reformed only to the extent necessary to make it enforceable. - -This License shall be governed by California law provisions (except to - -the extent applicable law, if any, provides otherwise), excluding its conflict-of-law - -provisions. With respect to disputes in which at least one party is a citizen - -of, or an entity chartered or registered to do business in the United States - -of America, any litigation relating to this License shall be subject to - -the jurisdiction of the Federal Courts of the Northern District of California, - -with venue lying in Santa Clara County, California, with the losing party - -responsible for costs, including without limitation, court costs and reasonable - -attorneys' fees and expenses. The application of the United Nations Convention - -on Contracts for the International Sale of Goods is expressly excluded. - -Any law or regulation which provides that the language of a contract shall - -be construed against the drafter shall not apply to this License.</ul> - -<a name="12"></a> -<b>12. RESPONSIBILITY FOR CLAIMS.</b> - -<ul>As between Initial Developer and the Contributors, each party is responsible - -for claims and damages arising, directly or indirectly, out of its utilization - -of rights under this License and You agree to work with Initial Developer - -and Contributors to distribute such responsibility on an equitable basis. - -Nothing herein is intended or shall be deemed to constitute any admission - -of liability.</ul> - -<a name="13"></a> -<b>13. MULTIPLE-LICENSED CODE.</b> - -<ul>Initial Developer may designate portions of the Covered Code as “Multiple-Licensed”. - -“Multiple-Licensed” means that the Initial Developer permits you to utilize - -portions of the Covered Code under Your choice of the MPL or the alternative - -licenses, if any, specified by the Initial Developer in the file described - -in Exhibit A.</ul> - - - -<a name="EXHIBIT-A"></a> -<p><br><b>EXHIBIT A -Mozilla Public License.</b> - -</p><ul>``The contents of this file are subject to the Mozilla Public License - -Version 1.1 (the "License"); you may not use this file except in compliance - -with the License. You may obtain a copy of the License at - -<br>http://www.mozilla.org/MPL/ - -<p>Software distributed under the License is distributed on an "AS IS" - -basis, WITHOUT WARRANTY OF - -<br>ANY KIND, either express or implied. See the License for the specific - -language governing rights and - -<br>limitations under the License. - -</p><p>The Original Code is ______________________________________. - -</p><p>The Initial Developer of the Original Code is ________________________. - -Portions created by - -<br> ______________________ are Copyright (C) ______ _______________________. - -All Rights - -<br>Reserved. - -</p><p>Contributor(s): ______________________________________. - -</p><p>Alternatively, the contents of this file may be used under the terms - -of the _____ license (the “[___] License”), in which case the provisions - -of [______] License are applicable instead of those above. - -If you wish to allow use of your version of this file only under the terms - -of the [____] License and not to allow others to use your version of this - -file under the MPL, indicate your decision by deleting the provisions - -above and replace them with the notice and other provisions required - -by the [___] License. If you do not delete the provisions above, - -a recipient may use your version of this file under either the MPL or the - -[___] License." - -</p><p>[NOTE: The text of this Exhibit A may differ slightly from the text - -of the notices in the Source Code files of the Original Code. You should - -use the text of this Exhibit A rather than the text found in the Original - -Code Source Code for Your Modifications.] - -</p><p> - -</p></ul></body></html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: OpenSSL; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>OpenSSL Project<br> -</h2> -<h3>OpenSSL<br> -</h3> -<pre> - LICENSE ISSUES - ============== - - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core@openssl.org. - - OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -</pre> -<br> -</body> -</html> - - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:PortAudio - Portable Real-Time Audio Library; Use of any of this software -is governed -by the terms of the license below:<br> -<h2> Ross Bencina and Phil Burk - <br> -</h2> -<h3>PortAudio<br> -</h3> - - -PortAudio Portable Real-Time Audio Library -<br>Copyright (c) 1999-2000 Ross Bencina and Phil Burk -<p>Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following conditions: -</p><ul> -<li> -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software.</li> - -<li> -Any person wishing to distribute modifications to the Software is requested -to send the modifications to the original developer so that they can be -incorporated into the canonical version.</li> -</ul> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. -<br>IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. -<br> -<h4> -Plain English Interpretation of the License</h4> -The following is a plain English interpretation of the license. This interpretation -is not part of the license and has no legal significance. To understand -the full legal implications of the license you should consult the license -itself. -<ul> -<li> -You <b>can</b> use PortAudio for free in your projects or applications, -even commercial applications.</li> - -<li> -You do <b>not</b> have to make your own source available as open-source -code just because you used PortAudio.</li> - -<li> -Do <b>not</b> take our copyright information out of the PortAudio source -code.</li> - -<li> -If you fix a bug in PortAudio, please send us the fix.</li> - -<li> -You <b>cannot</b> sue us if your program fails because of PortAudio.</li> -</ul> - -<p><br> -</p></td> - -</body></html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: XT; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>James Clark, Bill Lindsey<br> -</h2> -<h3> PostgreSQL Database Management System </h3> -<br> -(formerly known as Postgres, then as Postgres95) -<br> - -Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group -<br> - -Portions Copyright (c) 1994, The Regents of the University of California -<br> - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose, without fee, and without a written agreement -is hereby granted, provided that the above copyright notice and this -paragraph and the following two paragraphs appear in all copies. -<br> - -IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR -DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING -LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS -DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -<br> - -THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS -ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO -PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. -<br> -</body> -</html> -<html> -<body> - <hr style="width: 100%; height: 2px;">The following software may be -included in this product: PostScript(R) AFM Files; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Adobe<br> -</h2> -<h3>Printer Description Files<br> -</h3> -<br> -<pre> - Copyright 1987-1995 Adobe Systems Incorporated. - All Rights Reserved. - Permission is granted for redistribution of this file as - long as this copyright notice is intact and the contents - of the file is not altered in any way from its original form. - End of Copyright statement -</pre> - </body> - -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Python; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Python Software Foundation<br> -</h2> -<h3>Python<br> -</h3> -<pre> - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PSF LICENSE AGREEMENT FOR PYTHON 2.3 ------------------------------------- - +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written +authorization of the copyright holder.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All trademarks and registered trademarks mentioned herein are the +property of their respective owners.</P> +<H2 LANG="en-US" CLASS="western">IJG JPEG Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: IJG JPEG +Library. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In plain English:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + We don't promise that this software works. (But if you find any + bugs, please let us know!)</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + You can use this software for whatever you want. You don't have to + pay us.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + You may not pretend that you wrote this software. If you use it in a + program, you must acknowledge somewhere in your documentation that + you've used the IJG code.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In legalese:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The authors make NO WARRANTY or representation, either express or +implied, with respect to this software, its quality, accuracy, +merchantability, or fitness for a particular purpose. This software +is provided "AS IS", and you, its user, assume the entire +risk as to its quality and accuracy.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This software is copyright (C) 1991-1998, Thomas G. Lane. All Rights +Reserved except as specified below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted to use, copy, modify, and distribute +this software (or portions thereof) for any purpose, without fee, +subject to these conditions: (1) If any part of the source code for +this software is distributed, then this README file must be included, +with this copyright and no-warranty notice unaltered; and any +additions, deletions, or changes to the original files must be +clearly indicated in accompanying documentation. (2) If only +executable code is distributed, then the accompanying documentation +must state that "this software is based in part on the work of +the Independent JPEG Group". (3) Permission for use of this +software is granted only if the user accepts full responsibility for +any undesirable consequences; the authors accept NO LIABILITY for +damages of any kind.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These conditions apply to any software derived from or based on the +IJG code, not just to the unmodified library. If you use our work, +you ought to acknowledge us.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is NOT granted for the use of any IJG author's name or +company name in advertising or publicity relating to this software or +products derived from it. This software may be referred to only as +"the Independent JPEG Group's software".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We specifically permit and encourage the use of this software as the +basis of commercial products, provided that all warranty or liability +claims are assumed by the product vendor.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +ansi2knr.c is included in this distribution by permission of L. Peter +Deutsch, sole proprietor of its copyright holder, Aladdin Enterprises +of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright +and conditions, but instead by the usual distribution terms of the +Free Software Foundation; principally, that you must include source +code if you redistribute it. (See the file ansi2knr.c for full +details.) However, since ansi2knr.c is not needed as part of any +program generated from the IJG code, this does not limit you more +than the foregoing paragraphs do.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Unix configuration script "configure" was produced with +GNU Autoconf. It is copyright by the Free Software Foundation but is +freely distributable. The same holds for its supporting scripts +(config.guess, config.sub, ltconfig, ltmain.sh). Another support +script, install-sh, is copyright by M.I.T. but is also freely +distributable.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +It appears that the arithmetic coding option of the JPEG spec is +covered by patents owned by IBM, AT&T, and Mitsubishi. Hence +arithmetic coding cannot legally be used without obtaining one or +more licenses. For this reason, support for arithmetic coding has +been removed from the free JPEG software. (Since arithmetic coding +provides only a marginal gain over the unpatented Huffman mode, it is +unlikely that very many implementations will support it.) So far as +we are aware, there are no patent restrictions on the remaining code.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The IJG distribution formerly included code to read and write GIF +files. To avoid entanglement with the Unisys LZW patent, GIF reading +support has been removed altogether, and the GIF writer has been +simplified to produce "uncompressed GIFs". This technique +does not use the LZW algorithm; the resulting GIF files are larger +than usual, but are readable by all standard GIF decoders.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We are required to state that</P> +<P LANG="en-US" CLASS="western" STYLE="margin-left: 1.25cm; margin-top: 0.3cm; margin-bottom: 0.3cm"> +"The Graphics Interchange Format(c) is the Copyright property of +CompuServe Incorporated. GIF(sm) is a Service Mark property of +CompuServe Incorporated."</P> +<H2 LANG="en-US" CLASS="western">JDOM</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: JDOM. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All +rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. Redistribution of source code must retain the above copyright +notice, this list of conditions, and the following disclaimer.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Redistribution in binary form must reproduce the above copyright +notice, this list of conditions, and the disclaimer that follows +these conditions in the documentation and/or other materials provided +with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. The name "JDOM" must not be used to endorse or promote +products derived from this software without prior written permission. +For written permission, please contact <request_AT_jdom_DOT_org>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. Products derived from this software may not be called "JDOM", +nor may "JDOM" appear in their name, without prior written +permission from the JDOM Project Management +<request_AT_jdom_DOT_org>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In addition, we request (but do not require) that you include in the +end-user documentation provided with the redistribution and/or in the +software itself an acknowledgement equivalent to the following:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"This product includes software developed by the JDOM Project +(<A HREF="http://www.jdom.org/">http://www.jdom.org/</A>)."</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Alternatively, the acknowledgment may be graphical using the logos +available at <A HREF="http://www.jdom.org/images/logos">http://www.jdom.org/images/logos</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This software consists of voluntary contributions made by many +individuals on behalf of the JDOM Project and was originally created +by Jason Hunter <jhunter_AT_jdom_DOT_org> and Brett McLaughlin +<brett_AT_jdom_DOT_org>. For more information on the JDOM +Project, please see <A HREF="http://www.jdom.org/">http://www.jdom.org/</A>.</P> +<H2 LANG="en-US" CLASS="western">libcurl</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libcurl. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1996 - 2009, Daniel Stenberg, <daniel@haxx.se>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the +above copyright notice and this permission notice appear in all +copies.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written +authorization of the copyright holder.</P> +<H2 LANG="en-US" CLASS="western">libtextcat</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libtextcat. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2003, WiseGuys Internet B.V.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +- Redistribution of source code must retain the above copyright +notice, this list of conditions and the following disclaimer.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +- Redistribution in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +- Neither the name of the WiseGuys Internet B.V. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.</P> +<H2 LANG="en-US" CLASS="western">libwpd</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libwpd. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">libwpg</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libwpg. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">libwps</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libwps. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">libxml2</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libxml2. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except where otherwise noted in the source code (e.g. the files +hash.c, list.c and the trio files, which are covered by a similar +license but with different Copyright notices) all the files are:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of Daniel Veillard shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from him.</P> +<H2 LANG="en-US" CLASS="western">libxslt</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: libxslt. Use +of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">License for libxslt except libexslt</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of Daniel Veillard shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from him.</P> +<H3 LANG="en-US" CLASS="western">License for libexslt</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel +Veillard. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of the authors shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +him.</P> +<H2 LANG="en-US" CLASS="western">lpsolve</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: lpsolve. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Lucene</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Lucene. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +Apache Lucene<BR>Copyright 2006 The Apache Software Foundation</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN STYLE="text-decoration: none">This product includes software +developed by The Apache Software Foundation (</SPAN><A HREF="http://www.apache.org/">http://www.apache.org/</A><SPAN STYLE="text-decoration: none">).</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN STYLE="text-decoration: none">The snowball stemmers in +contrib/snowball/src/java/net/sf/snowball were developed by Martin +Porter and Richard Boulton. The full snowball package is available +from </SPAN><A HREF="http://snowball.tartarus.org/">http://snowball.tartarus.org/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western" STYLE="text-decoration: none">mdds</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +The following software may be included in this product: mdds. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +Copyright (c) 2010 Kohei Yoshida</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; text-decoration: none"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Microsoft Visual C++ 2008 Runtime +Libraries</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Microsoft +Visual C++ 2008 Runtime Libraries. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +MICROSOFT SOFTWARE LICENSE TERMS</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +MICROSOFT VISUAL C++ 2008 RUNTIME LIBRARIES (X86, IA64 AND X64), +SERVICE PACK 1</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These license terms are an agreement between Microsoft Corporation +(or based on where you live, one of its affiliates) and you. Please +read them. They apply to the software named above, which includes +the media on which you received it, if any. The terms also apply to +any Microsoft</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• updates,</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• supplements,</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• Internet-based services, and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• support services</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +for this software, unless other terms accompany those items. If so, +those terms apply.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT +THEM, DO NOT USE THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you comply with these license terms, you have the rights below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. INSTALLATION AND USE RIGHTS. You may install and use any number +of copies of the software on your devices.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. SCOPE OF LICENSE. The software is licensed, not sold. This +agreement only gives you some rights to use the software. Microsoft +reserves all other rights. Unless applicable law gives you more +rights despite this limitation, you may use the software only as +expressly permitted in this agreement. In doing so, you must comply +with any technical limitations in the software that only allow you to +use it in certain ways. You may not</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• disclose the results of any benchmark tests of the software to +any third party without Microsoft’s prior written approval;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• work around any technical limitations in the software;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• reverse engineer, decompile or disassemble the software, +except and only to the extent that applicable law expressly permits, +despite this limitation;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• make more copies of the software than specified in this +agreement or allowed by applicable law, despite this limitation;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• publish the software for others to copy;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• rent, lease or lend the software;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• transfer the software or this agreement to any third party; or</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• use the software for commercial software hosting services.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. BACKUP COPY. You may make one backup copy of the software. You +may use it only to reinstall the software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. DOCUMENTATION. Any person that has valid access to your computer +or internal network may copy and use the documentation for your +internal, reference purposes.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. EXPORT RESTRICTIONS. The software is subject to United States +export laws and regulations. You must comply with all domestic and +international export laws and regulations that apply to the software. + These laws include restrictions on destinations, end users and end +use. For additional information, see www.microsoft.com/exporting.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. SUPPORT SERVICES. Because this software is “as is,” we +may not provide support services for it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +7. ENTIRE AGREEMENT. This agreement, and the terms for supplements, +updates, Internet-based services and support services that you use, +are the entire agreement for the software and support services.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +8. APPLICABLE LAW.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a. United States. If you acquired the software in the United States, +Washington state law governs the interpretation of this agreement and +applies to claims for breach of it, regardless of conflict of laws +principles. The laws of the state where you live govern all other +claims, including claims under state consumer protection laws, unfair +competition laws, and in tort.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +b. Outside the United States. If you acquired the software in any +other country, the laws of that country apply.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +9. LEGAL EFFECT. This agreement describes certain legal rights. You +may have other rights under the laws of your country. You may also +have rights with respect to the party from whom you acquired the +software. This agreement does not change your rights under the laws +of your country if the laws of your country do not permit it to do +so.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +10. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” + YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS +WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL +CONSUMER RIGHTS UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT +CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT +EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NON-INFRINGEMENT.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +11. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN +RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO +U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING +CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This limitation applies to</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• anything related to the software, services, content (including +code) on third party Internet sites, or third party programs; and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +• claims for breach of contract, breach of warranty, guarantee +or condition, strict liability, negligence, or other tort to the +extent permitted by applicable law.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +It also applies even if Microsoft knew or should have known about the +possibility of the damages. The above limitation or exclusion may +not apply to you because your country may not allow the exclusion or +limitation of incidental, consequential or other damages.</P> +<H2 LANG="en-US" CLASS="western">Mozilla</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Mozilla, +Mozilla Address Book, NP SDK. Use of any of this software is governed +by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#10.Mozilla Public License Version 1.1|outline">Jump to MPL +1.1</A></P> +<H2 LANG="en-US" CLASS="western">MySQL Connector/C++</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product:<BR>MySQL +Connector/C++. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 2007-2008 MySQL AB, 2008-2009 Sun Microsystems Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">MyThes</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: MyThes. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 2003 Kevin B. Hendricks, Stratford, Ontario, Canada And +Contributors. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. Redistribution of source code must retain the above copyright +notice, this list of conditions and the following disclaimer.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Redistribution in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. All modifications to the source code must be clearly marked as +such. Binary redistribution based on modified source code must be +clearly marked as modified versions in the documentation and/or other +materials provided with the distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS ``AS +IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEVIN B. +HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.</P> +<H2 LANG="en-US" CLASS="western">neon</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: neon. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +neon is Copyright (C) 1999-2007 Joe Orton +<joe@manyfish.co.uk><BR>Portions are:<BR>Copyright (C) +1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi><BR>Copyright +(C) 1999-2000 Peter Boos <pedib@colorfullife.com><BR>Copyright +(C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.<BR>Copyright +(C) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org><BR>Copyright +(C) 2004 Jiang Lei <tristone@deluxe.ocn.ne.jp><BR>Copyright (C) +2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Network Security Services (NSS)</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Network +Security Services (NSS). Use of any of this software is governed by +the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#10.Mozilla Public License Version 1.1|outline">Jump to MPL +1.1</A></P> +<H2 LANG="en-US" CLASS="western">OpenSSL</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: OpenSSL. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The OpenSSL toolkit stays under a dual license, i.e. both the +conditions of the OpenSSL License and the original SSLeay license +apply to the toolkit.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +See below for the actual license texts. Actually both licenses are +BSD-style Open Source licenses. In case of any license issues related +to OpenSSL please contact openssl-core@openssl.org.</P> +<H3 LANG="en-US" CLASS="western">OpenSSL License</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + All advertising materials mentioning features or use of this + software must display the following acknowledgment: "This + product includes software developed by the OpenSSL Project for use + in the OpenSSL Toolkit. (<A HREF="http://www.openssl.org/">http://www.openssl.org/</A>)"</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The names "OpenSSL Toolkit" and "OpenSSL Project" + must not be used to endorse or promote products derived from this + software without prior written permission. For written permission, + please contact openssl-core@openssl.org.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Products derived from this software may not be called "OpenSSL" + nor may "OpenSSL" appear in their names without prior + written permission of the OpenSSL Project.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of any form whatsoever must retain the following + acknowledgment: "This product includes software developed by + the OpenSSL Project for use in the OpenSSL Toolkit + (<A HREF="http://www.openssl.org/">http://www.openssl.org/</A>)"</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This product includes cryptographic software written by Eric Young +(eay@cryptsoft.com). This product includes software written by Tim +Hudson (tjh@cryptsoft.com).</P> +<H3 LANG="en-US" CLASS="western">Original SSLeay License</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights +reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This package is an SSL implementation written by Eric Young +(<A HREF="mailto:eay@cryptsoft.com">eay@cryptsoft.com</A>).<BR>The +implementation was written so as to conform with Netscapes SSL.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This library is free for commercial and non-commercial use as long as +the following conditions are aheared to. The following conditions +apply to all code found in this distribution, be it the RC4, RSA, +lhash, DES, etc., code; not just the SSL code. The SSL documentation +included with this distribution is covered by the same copyright +terms except that the holder is Tim Hudson (tjh@cryptsoft.com).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright remains Eric Young's, and as such any Copyright notices in +the code are not to be removed. If this package is used in a product, +Eric Young should be given attribution as the author of the parts of +the library used. This can be in the form of a textual message at +program startup or in documentation (online or textual) provided with +the package.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain the copyright notice, this + list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + All advertising materials mentioning features or use of this + software must display the following acknowledgment: "This + product includes cryptographic software written by Eric Young + (eay@cryptsoft.com)" The word 'cryptographic' can be left out + if the routines from the library being used are not cryptographic + related :-).</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + If you include any Windows specific code (or a derivative thereof) + from the apps directory (application code) you must include an + acknowledgment: "This product includes software written by Tim + Hudson (tjh@cryptsoft.com)"</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The license and distribution terms for any publicly available version +or derivative of this code cannot be changed. i.e. this code cannot +simply be copied and put under another distribution license +[including the GNU Public License.]</P> +<H2 LANG="en-US" CLASS="western">Pentaho Reporting Flow Engine</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Pentaho +Reporting Flow Engine (including core, flow-engine, libbase, +libfonts, libformula, liblayout, libloader, librepository, +libserializer, and libxml). Use of any of this software is governed +by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Pixman</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Pixman +(libpixman). Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following is the MIT license, agreed upon by most contributors.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright holders of new code should use this license statement where +possible. They may also add themselves to the list below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1987, 1988, 1989, 1998 The Open Group<BR>Copyright 1987, +1988, 1989 Digital Equipment Corporation<BR>Copyright 1999, 2004, +2008 Keith Packard<BR>Copyright 2000 SuSE, Inc.<BR>Copyright 2000 +Keith Packard, member of The XFree86 Project, Inc.<BR>Copyright 2004, +2005, 2007, 2008, 2009, 2010 Red Hat, Inc.<BR>Copyright 2004 Nicholas +Miell<BR>Copyright 2005 Lars Knoll & Zack Rusin, +Trolltech<BR>Copyright 2005 Trolltech AS<BR>Copyright 2007 Luca +Barbato<BR>Copyright 2008 Aaron Plattner, NVIDIA +Corporation<BR>Copyright 2008 Rodrigo Kumpera<BR>Copyright 2008 André +Tupinambá<BR>Copyright 2008 Mozilla Corporation<BR>Copyright 2008 +Frederic Plourde<BR>Copyright 2009, Oracle and/or its affiliates. All +rights reserved.<BR>Copyright 2009, 2010 Nokia Corporation</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: The above copyright notice and +this permission notice (including the next paragraph) shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Platform SDK Redistributable: GDI+</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Platform SDK +Redistributable: GDI+ (gdiplus.dll). Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +PLEASE NOTE: Microsoft Corporation (or based on where you live, one +of its affiliates) licenses this supplement to you. The supplement is +identified for use with one or more Microsoft operating system +products (the 'software'). You may use a copy of this supplement with +each validly licensed copy of the software. You may not use it if you +do not have a license for the software. The license terms for the +software apply to your use of this supplement. To read the license +terms, go to <A HREF="http://www.microsoft.com/useterms">www.microsoft.com/useterms</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Microsoft provides support services for the supplement as described +at <A HREF="../../../C:/Documents%20and%20Settings/timar/Dokumentumok/www.support.%20microsoft.com/common/international.aspx">www.support. +microsoft.com/common/international.aspx</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +EULAID:HFX_RM.1_GDR_NRL_EN</P> +<H2 LANG="en-US" CLASS="western">Python</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Python. Use +of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">PSF LICENSE AGREEMENT FOR PYTHON 2.3</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.3 software in source or binary form and its -associated documentation. - +("PSF"), and the Individual or Organization ("Licensee") +accessing and otherwise using Python 2.3 software in source or binary +form and its associated documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 2.3 alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are -retained in Python 2.3 alone or in any derivative version prepared by -Licensee. - +License Agreement and PSF's notice of copyright, i.e., "Copyright +(c) 2001, 2002, 2003, 2004 Python Software Foundation; All Rights +Reserved" are retained in Python 2.3 alone or in any derivative +version prepared by Licensee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.3 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.3. - -4. PSF is making Python 2.3 available to Licensee on an "AS IS" +or incorporates Python 2.3 or any part thereof, and wants to make the +derivative work available to others as provided herein, then Licensee +hereby agrees to include in any such work a brief summary of the +changes made to Python 2.3.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. PSF is making Python 2.3 available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR +FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL +NOT INFRINGE ANY THIRD PARTY RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY +THEREOF.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. This License Agreement will automatically terminate upon a +material breach of its terms and conditions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - +Licensee. This License Agreement does not grant permission to use +PSF trademarks or trade name in a trademark sense to endorse or +promote products or services of Licensee, or any third party.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 8. By copying, installing or otherwise using Python 2.3, Licensee agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - +Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), +having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and +the Individual or Organization ("Licensee") accessing and +otherwise using this software in source or binary form and its +associated documentation ("the Software").</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 2. Subject to the terms and conditions of this BeOpen Python License Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use the Software alone or in any derivative version, provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - +Software, alone or in any derivative version prepared by Licensee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. BeOpen is making the Software available to Licensee on an "AS +IS" basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, +EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN +MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE +OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR +LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR +ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. This License Agreement will automatically terminate upon a +material breach of its terms and conditions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 6. This License Agreement shall be governed by and interpreted in all respects by the law of the State of California, excluding conflict of law provisions. Nothing in this License Agreement shall be deemed to @@ -5613,4313 +1709,6369 @@ create any relationship of agency, partnership, or joint venture between BeOpen and Licensee. This License Agreement does not grant permission to use BeOpen trademarks or trade names in a trademark sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - +third party. As an exception, the "BeOpen Python" logos +available at <A HREF="http://www.pythonlabs.com/logos.html">http://www.pythonlabs.com/logos.html</A> +may be used according to the permissions granted on that web page.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 7. By copying, installing or otherwise using the software, Licensee agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- - +Agreement.</P> +<H3 LANG="en-US" CLASS="western">CNRI LICENSE AGREEMENT FOR PYTHON +1.6.1</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide +Reston, VA 20191 ("CNRI"), and the Individual or +Organization ("Licensee") accessing and otherwise using +Python 1.6.1 software in source or binary form and its associated +documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Subject to the terms and conditions of this License Agreement, +CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - +License Agreement and CNRI's notice of copyright, i.e., "Copyright +(c) 1995-2001 Corporation for National Research Initiatives; All +Rights Reserved" are retained in Python 1.6.1 alone or in any +derivative version prepared by Licensee. Alternately, in lieu of +CNRI's License Agreement, Licensee may substitute the following text +(omitting the quotes): "Python 1.6.1 is made available subject +to the terms and conditions in CNRI's License Agreement. This +Agreement together with Python 1.6.1 may be located on the Internet +using the following unique, persistent identifier (known as a +handle): 1895.22/1013. This Agreement may also be obtained from a +proxy server on the Internet using the following URL: +<A HREF="http://hdl.handle.net/1895.22/1013">http://hdl.handle.net/1895.22/1013</A>".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 3. In the event Licensee prepares a derivative work that is based on or incorporates Python 1.6.1 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - +the changes made to Python 1.6.1.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. CNRI is making Python 1.6.1 available to Licensee on an "AS +IS" basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS +OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR +FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 +WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON +1.6.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY +THEREOF.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. This License Agreement will automatically terminate upon a +material breach of its terms and conditions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 7. This License Agreement shall be governed by the federal intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of +limitation the federal copyright law, and, to the extent such U.S. +federal law does not apply, by the law of the Commonwealth of Virginia, excluding Virginia's conflict of law provisions. Notwithstanding the foregoing, with regard to derivative works based on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License +previously distributed under the GNU General Public License (GPL), +the law of the Commonwealth of Virginia shall govern this License Agreement only as to issues arising under or with respect to Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - +agency, partnership, or joint venture between CNRI and Licensee. +This License Agreement does not grant permission to use CNRI +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +8. By clicking on the "ACCEPT" button where indicated, or +by copying, installing or otherwise using Python 1.6.1, Licensee +agrees to be bound by the terms and conditions of this License +Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + ACCEPT</P> +<H3 LANG="en-US" CLASS="western">CWI LICENSE AGREEMENT FOR PYTHON +0.9.0 THROUGH 1.2</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - +The Netherlands. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -</pre> -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Redland RDF Library librdf; Use of any of this software -is governed by the terms of the license below:<br> -<h2>librdf.org - <br> -</h2> -<h3>librdf<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: regexp; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Free Software Foundation, Inc. - <br> -</h2> -<h3>regexp<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Remote Control Wrapper; Use of any of this -software is governed by the terms of the license below:<br> -<h2>Martin Kahr<br> -</h2> -<h3>Remote Control Wrapper<br> -</h3> - -<pre> - -Created by Martin Kahr under a MIT-style license. -Copyright (c) 2006/2007 martinkahr.com. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -</pre> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Rhino; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Norris Boyd, Patrick Beard<br> -</h2> -<h3>Rhino<br> -</h3> -<center><b><font size="+2">MOZILLA PUBLIC LICENSE</font></b> -<br> -<b>Version 1.1</b> -<p></p> -<hr width="20%"></center> -<a name="1"></a> -<p><b>1. Definitions.</b> -<a name="1.0.1"></a></p> -<ul> - <b>1.0.1. "Commercial Use" </b>means distribution or otherwise -making -the Covered Code available to a third party. - <a name="1.1"></a> - <p><b>1.1. ''Contributor''</b> means each entity that creates or -contributes -to the creation of Modifications. - <a name="1.2"></a></p> - <p><b>1.2. ''Contributor Version''</b> means the combination of the -Original -Code, prior Modifications used by a Contributor, and the Modifications -made by that particular Contributor. - <a name="1.3"></a></p> - <p><b>1.3. ''Covered Code''</b> means the Original Code or -Modifications -or the combination of the Original Code and Modifications, in each case -including portions thereof<b>.</b> - <a name="1.4"></a></p> - <p><b>1.4. ''Electronic Distribution Mechanism''</b> means a -mechanism -generally accepted in the software development community for the -electronic -transfer of data. - <a name="1.5"></a></p> - <p><b>1.5. ''Executable''</b> means Covered Code in any form other -than -Source Code. - <a name="1.6"></a></p> - <p><b>1.6. ''Initial Developer''</b> means the individual or entity -identified -as the Initial Developer in the Source Code notice required by <b>Exhibit -A</b>. - <a name="1.7"></a></p> - <p><b>1.7. ''Larger Work''</b> means a work which combines Covered -Code -or portions thereof with code not governed by the terms of this -License. - <a name="1.8"></a></p> - <p><b>1.8. ''License''</b> means this document. - <a name="1.8.1"></a></p> - <p><b>1.8.1. "Licensable"</b> means having the right to grant, to the -maximum -extent possible, whether at the time of the initial grant or -subsequently -acquired, any and all of the rights conveyed herein. - <a name="1.9"></a></p> - <p><b>1.9. ''Modifications''</b> means any addition to or deletion -from -the substance or structure of either the Original Code or any previous -Modifications. When Covered Code is released as a series of files, a -Modification -is: - </p> - <ul> - <b>A.</b> Any addition to or deletion from the contents of a file -containing -Original Code or previous Modifications. - <p><b>B.</b> Any new file that contains any part of the Original -Code or -previous Modifications. - <br> - </p> - </ul> - <a name="1.10"></a> - <b>1.10. ''Original Code''</b> means Source Code of computer software -code -which is described in the Source Code notice required by <b>Exhibit A</b> -as Original Code, and which, at the time of its release under this -License -is not already Covered Code governed by this License. - <a name="1.10.1"></a> - <p><b>1.10.1. "Patent Claims"</b> means any patent claim(s), now -owned -or hereafter acquired, including without limitation, method, -process, -and apparatus claims, in any patent Licensable by grantor. - <a name="1.11"></a></p> - <p><b>1.11. ''Source Code''</b> means the preferred form of the -Covered -Code for making modifications to it, including all modules it contains, -plus any associated interface definition files, scripts used to control -compilation and installation of an Executable, or source code -differential -comparisons against either the Original Code or another well known, -available -Covered Code of the Contributor's choice. The Source Code can be in a -compressed -or archival form, provided the appropriate decompression or -de-archiving -software is widely available for no charge. - <a name="1.12"></a></p> - <p><b>1.12. "You'' (or "Your") </b> means an individual or a -legal -entity exercising rights under, and complying with all of the terms of, -this License or a future version of this License issued under Section -6.1. -For legal entities, "You'' includes any entity which controls, is -controlled -by, or is under common control with You. For purposes of this -definition, -"control'' means (a) the power, direct or indirect, to cause the -direction -or management of such entity, whether by contract or otherwise, or (b) -ownership of more than fifty percent (50%) of the outstanding shares or -beneficial ownership of such entity.</p> -</ul> -<a name="2"></a> -<b>2. Source Code License.</b> -<a name="2.1"></a> -<ul> - <b>2.1. The Initial Developer Grant.</b> - <br> -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property -claims: - <ul> - <b>(a)</b> <b> </b>under intellectual property rights (other -than -patent or trademark) Licensable by Initial Developer to use, reproduce, -modify, display, perform, sublicense and distribute the Original Code -(or -portions thereof) with or without Modifications, and/or as part of a -Larger -Work; and - <p><b>(b)</b> under Patents Claims infringed by the making, using -or selling -of Original Code, to make, have made, use, practice, sell, and offer -for -sale, and/or otherwise dispose of the Original Code (or portions -thereof). - </p> - <ul> - <ul> - - </ul> - </ul> - <b>(c) </b>the licenses granted in this Section 2.1(a) and (b) are -effective -on the date Initial Developer first distributes Original Code under the -terms of this License. - <p><b>(d) </b>Notwithstanding Section 2.1(b) above, no patent -license is -granted: 1) for code that You delete from the Original Code; 2) -separate -from the Original Code; or 3) for infringements caused by: i) the -modification of the Original Code or ii) the combination of the -Original -Code with other software or devices. - <br> - </p> - </ul> - <a name="2.2"></a> - <b>2.2. Contributor Grant.</b> - <br> -Subject to third party intellectual property claims, each Contributor -hereby grants You a world-wide, royalty-free, non-exclusive license - <ul> - - <br> - <b>(a)</b> <b> </b>under intellectual property rights (other -than -patent or trademark) Licensable by Contributor, to use, reproduce, -modify, -display, perform, sublicense and distribute the Modifications created -by -such Contributor (or portions thereof) either on an unmodified basis, -with -other Modifications, as Covered Code and/or as part of a Larger Work; -and - <p><b>(b)</b> under Patent Claims infringed by the making, using, -or selling -of Modifications made by that Contributor either alone and/or in<font - color="#000000"> -combination with its Contributor Version (or portions of such -combination), -to make, use, sell, offer for sale, have made, and/or otherwise dispose -of: 1) Modifications made by that Contributor (or portions thereof); -and -2) the combination of Modifications made by that Contributor with -its Contributor Version (or portions of such combination).</font> - </p> - <p><b>(c) </b>the licenses granted in Sections 2.2(a) and 2.2(b) -are effective -on the date Contributor first makes Commercial Use of the Covered Code. - </p> - <p><b>(d) </b> Notwithstanding Section 2.2(b) -above, no -patent license is granted: 1) for any code that Contributor has deleted -from the Contributor Version; 2) separate from the Contributor -Version; -3) for infringements caused by: i) third party modifications of -Contributor -Version or ii) the combination of Modifications made by that -Contributor -with other software (except as part of the Contributor Version) -or -other devices; or 4) under Patent Claims infringed by Covered Code in -the -absence of Modifications made by that Contributor.</p> - </ul> -</ul> -<a name="3"></a> -<p><br> -<b>3. Distribution Obligations.</b> -<a name="3.1"></a></p> -<ul> - <b>3.1. Application of License.</b> - <br> -The Modifications which You create or to which You contribute are -governed -by the terms of this License, including without limitation Section <b>2.2</b>. -The Source Code version of Covered Code may be distributed only under -the -terms of this License or a future version of this License released -under -Section <b>6.1</b>, and You must include a copy of this License with -every -copy of the Source Code You distribute. You may not offer or impose any -terms on any Source Code version that alters or restricts the -applicable -version of this License or the recipients' rights hereunder. However, -You -may include an additional document offering the additional rights -described -in Section <b>3.5</b>. - <a name="3.2"></a> - <p><b>3.2. Availability of Source Code.</b> - <br> -Any Modification which You create or to which You contribute must be -made available in Source Code form under the terms of this License -either -on the same media as an Executable version or via an accepted -Electronic -Distribution Mechanism to anyone to whom you made an Executable version -available; and if made available via Electronic Distribution Mechanism, -must remain available for at least twelve (12) months after the date it -initially became available, or at least six (6) months after a -subsequent -version of that particular Modification has been made available to such -recipients. You are responsible for ensuring that the Source Code -version -remains available even if the Electronic Distribution Mechanism is -maintained -by a third party. - <a name="3.3"></a></p> - <p><b>3.3. Description of Modifications.</b> - <br> -You must cause all Covered Code to which You contribute to contain -a file documenting the changes You made to create that Covered Code and -the date of any change. You must include a prominent statement that the -Modification is derived, directly or indirectly, from Original Code -provided -by the Initial Developer and including the name of the Initial -Developer -in (a) the Source Code, and (b) in any notice in an Executable version -or related documentation in which You describe the origin or ownership -of the Covered Code. - <a name="3.4"></a></p> - <p><b>3.4. Intellectual Property Matters</b> - </p> - <ul> - <b>(a) Third Party Claims</b>. - <br> -If Contributor has knowledge that a license under a third party's -intellectual -property rights is required to exercise the rights granted by such -Contributor -under Sections 2.1 or 2.2, Contributor must include a text file with -the -Source Code distribution titled "LEGAL'' which describes the claim and -the party making the claim in sufficient detail that a recipient will -know -whom to contact. If Contributor obtains such knowledge after the -Modification -is made available as described in Section 3.2, Contributor shall -promptly -modify the LEGAL file in all copies Contributor makes available -thereafter -and shall take other steps (such as notifying appropriate mailing lists -or newsgroups) reasonably calculated to inform those who received the -Covered -Code that new knowledge has been obtained. - <p><b>(b) Contributor APIs</b>. - <br> -If Contributor's Modifications include an application programming -interface -and Contributor has knowledge of patent licenses which are reasonably -necessary -to implement that API, Contributor must also include this information -in -the LEGAL file. - <br> - </p> - </ul> - <b>(c) -Representations.</b> - <ul> -Contributor represents that, except as disclosed pursuant to Section -3.4(a) above, Contributor believes that Contributor's Modifications are -Contributor's original creation(s) and/or Contributor has sufficient -rights -to grant the rights conveyed by this License. - </ul> - <a name="3.5"></a> - <p><br> - <b>3.5. Required Notices.</b> - <br> -You must duplicate the notice in <b>Exhibit A</b> in each file of the -Source Code. If it is not possible to put such notice in a -particular -Source Code file due to its structure, then You must include such -notice -in a location (such as a relevant directory) where a user would be -likely -to look for such a notice. If You created one or more -Modification(s) -You may add your name as a Contributor to the notice described in <b>Exhibit -A</b>. You must also duplicate this License in any documentation -for the Source Code where You describe recipients' rights or ownership -rights relating to Covered Code. You may choose to offer, and to -charge a fee for, warranty, support, indemnity or liability obligations -to one or more recipients of Covered Code. However, You may do so only -on Your own behalf, and not on behalf of the Initial Developer or any -Contributor. -You must make it absolutely clear than any such warranty, support, -indemnity -or liability obligation is offered by You alone, and You hereby agree -to -indemnify the Initial Developer and every Contributor for any liability -incurred by the Initial Developer or such Contributor as a result of -warranty, -support, indemnity or liability terms You offer. - <a name="3.6"></a></p> - <p><b>3.6. Distribution of Executable Versions.</b> - <br> -You may distribute Covered Code in Executable form only if the -requirements -of Section <b>3.1-3.5</b> have been met for that Covered Code, and if -You -include a notice stating that the Source Code version of the Covered -Code -is available under the terms of this License, including a description -of -how and where You have fulfilled the obligations of Section <b>3.2</b>. -The notice must be conspicuously included in any notice in an -Executable -version, related documentation or collateral in which You describe -recipients' -rights relating to the Covered Code. You may distribute the Executable -version of Covered Code or ownership rights under a license of Your -choice, -which may contain terms different from this License, provided that You -are in compliance with the terms of this License and that the license -for -the Executable version does not attempt to limit or alter the -recipient's -rights in the Source Code version from the rights set forth in this -License. -If You distribute the Executable version under a different license You -must make it absolutely clear that any terms which differ from this -License -are offered by You alone, not by the Initial Developer or any -Contributor. -You hereby agree to indemnify the Initial Developer and every -Contributor -for any liability incurred by the Initial Developer or such Contributor -as a result of any such terms You offer. - <a name="3.7"></a></p> - <p><b>3.7. Larger Works.</b> - <br> -You may create a Larger Work by combining Covered Code with other code -not governed by the terms of this License and distribute the Larger -Work -as a single product. In such a case, You must make sure the -requirements -of this License are fulfilled for the Covered Code.</p> -</ul> -<a name="4"></a> -<b>4. Inability to Comply Due to Statute or Regulation.</b> -<ul> -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Code due to statute, -judicial order, or regulation then You must: (a) comply with the terms -of this License to the maximum extent possible; and (b) describe the -limitations -and the code they affect. Such description must be included in the -LEGAL -file described in Section <b>3.4</b> and must be included with all -distributions -of the Source Code. Except to the extent prohibited by statute or -regulation, -such description must be sufficiently detailed for a recipient of -ordinary -skill to be able to understand it. -</ul> -<a name="5"></a> -<b>5. Application of this License.</b> -<ul> -This License applies to code to which the Initial Developer has -attached -the notice in <b>Exhibit A</b> and to related Covered Code. -</ul> -<a name="6"></a> -<b>6. Versions of the License.</b> -<a name="6.1"></a> -<ul> - <b>6.1. New Versions</b>. - <br> -Netscape Communications Corporation (''Netscape'') may publish revised -and/or new versions of the License from time to time. Each version will -be given a distinguishing version number. - <a name="6.2"></a> - <p><b>6.2. Effect of New Versions</b>. - <br> -Once Covered Code has been published under a particular version of -the License, You may always continue to use it under the terms of that -version. You may also choose to use such Covered Code under the terms -of -any subsequent version of the License published by Netscape. No one -other -than Netscape has the right to modify the terms applicable to Covered -Code -created under this License. - <a name="6.3"></a></p> - <p><b>6.3. Derivative Works</b>. - <br> -If You create or use a modified version of this License (which you -may only do in order to apply it to code which is not already Covered -Code -governed by this License), You must (a) rename Your license so that the -phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", -''NPL'' -or any confusingly similar phrase do not appear in your license (except -to note that your license differs from this License) and (b) otherwise -make it clear that Your version of the license contains terms which -differ -from the Mozilla Public License and Netscape Public License. (Filling -in -the name of the Initial Developer, Original Code or Contributor in the -notice described in <b>Exhibit A</b> shall not of themselves be deemed -to be modifications of this License.)</p> -</ul> -<a name="7"></a> -<b>7. DISCLAIMER OF WARRANTY.</b> -<ul> -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, -WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, -WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT -FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE -QUALITY -AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED -CODE -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY -OTHER -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR -CORRECTION. -THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS -LICENSE. -NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS -DISCLAIMER. -</ul> -<a name="8"></a> -<b>8. TERMINATION.</b> -<a name="8.1"></a> -<ul> - <b>8.1. </b>This License and the rights granted hereunder will -terminate automatically if You fail to comply with terms herein and -fail -to cure such breach within 30 days of becoming aware of the breach. All -sublicenses to the Covered Code which are properly granted shall -survive -any termination of this License. Provisions which, by their nature, -must -remain in effect beyond the termination of this License shall survive. - <a name="8.2"></a> - <p><b>8.2. </b>If You initiate litigation by asserting a -patent infringement -claim (excluding declatory judgment actions) against Initial Developer -or a Contributor (the Initial Developer or Contributor against whom You -file such action is referred to as "Participant") alleging that: - </p> - <p><b>(a) </b>such Participant's Contributor Version directly -or -indirectly infringes any patent, then any and all rights granted by -such -Participant to You under Sections 2.1 and/or 2.2 of this License shall, -upon 60 days notice from Participant terminate prospectively, unless if -within 60 days after receipt of notice You either: (i) agree in -writing -to pay Participant a mutually agreeable reasonable royalty for Your -past -and future use of Modifications made by such Participant, or (ii) -withdraw -Your litigation claim with respect to the Contributor Version against -such -Participant. If within 60 days of notice, a reasonable royalty -and -payment arrangement are not mutually agreed upon in writing by the -parties -or the litigation claim is not withdrawn, the rights granted by -Participant -to You under Sections 2.1 and/or 2.2 automatically terminate at the -expiration -of the 60 day notice period specified above. - </p> - <p><b>(b)</b> any software, hardware, or device, other than -such -Participant's Contributor Version, directly or indirectly infringes any -patent, then any rights granted to You by such Participant under -Sections -2.1(b) and 2.2(b) are revoked effective as of the date You first made, -used, sold, distributed, or had made, Modifications made by that -Participant. - <a name="8.3"></a></p> - <p><b>8.3. </b>If You assert a patent infringement claim -against -Participant alleging that such Participant's Contributor Version -directly -or indirectly infringes any patent where such claim is resolved (such -as -by license or settlement) prior to the initiation of patent -infringement -litigation, then the reasonable value of the licenses granted by such -Participant -under Sections 2.1 or 2.2 shall be taken into account in determining -the -amount or value of any payment or license. - <a name="8.4"></a></p> - <p><b>8.4.</b> In the event of termination under Sections 8.1 -or -8.2 above, all end user license agreements (excluding -distributors -and resellers) which have been validly granted by You or any -distributor -hereunder prior to termination shall survive termination.</p> -</ul> -<a name="9"></a> -<b>9. LIMITATION OF LIABILITY.</b> -<ul> -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT -(INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, -ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY -SUPPLIER -OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, -SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, -WITHOUT -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER -FAILURE -OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN -IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH -DAMAGES. -THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR -PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT -APPLICABLE -LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE -EXCLUSION -OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION -AND LIMITATION MAY NOT APPLY TO YOU. -</ul> -<a name="10"></a> -<b>10. U.S. GOVERNMENT END USERS.</b> -<ul> -The Covered Code is a ''commercial item,'' as that term is defined -in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer -software'' -and ''commercial computer software documentation,'' as such terms are -used -in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and -48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. -Government -End Users acquire Covered Code with only those rights set forth herein. -</ul> -<a name="11"></a> -<b>11. MISCELLANEOUS.</b> -<ul> -This License represents the complete agreement concerning subject -matter -hereof. If any provision of this License is held to be unenforceable, -such -provision shall be reformed only to the extent necessary to make it -enforceable. -This License shall be governed by California law provisions (except to -the extent applicable law, if any, provides otherwise), excluding its -conflict-of-law -provisions. With respect to disputes in which at least one party is a -citizen -of, or an entity chartered or registered to do business in the United -States -of America, any litigation relating to this License shall be subject to -the jurisdiction of the Federal Courts of the Northern District of -California, -with venue lying in Santa Clara County, California, with the losing -party -responsible for costs, including without limitation, court costs and -reasonable -attorneys' fees and expenses. The application of the United Nations -Convention -on Contracts for the International Sale of Goods is expressly excluded. -Any law or regulation which provides that the language of a contract -shall -be construed against the drafter shall not apply to this License. -</ul> -<a name="12"></a> -<b>12. RESPONSIBILITY FOR CLAIMS.</b> -<ul> -As between Initial Developer and the Contributors, each party is -responsible -for claims and damages arising, directly or indirectly, out of its -utilization -of rights under this License and You agree to work with Initial -Developer -and Contributors to distribute such responsibility on an equitable -basis. -Nothing herein is intended or shall be deemed to constitute any -admission -of liability. -</ul> -<a name="13"></a> -<b>13. MULTIPLE-LICENSED CODE.</b> -<ul> -Initial Developer may designate portions of the Covered Code as -“Multiple-Licensed”. -“Multiple-Licensed” means that the Initial Developer permits you to -utilize -portions of the Covered Code under Your choice of the MPL or the -alternative -licenses, if any, specified by the Initial Developer in the file -described -in Exhibit A. -</ul> -<a name="EXHIBIT-A"></a> -<p><br> -<b>EXHIBIT A -Mozilla Public License.</b> -</p> -<ul> -``The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance -with the License. You may obtain a copy of the License at - <br> -http://www.mozilla.org/MPL/ - <p>Software distributed under the License is distributed on an "AS -IS" -basis, WITHOUT WARRANTY OF - <br> -ANY KIND, either express or implied. See the License for the specific -language governing rights and - <br> -limitations under the License. - </p> - <p>The Original Code is ______________________________________. - </p> - <p>The Initial Developer of the Original Code is -________________________. -Portions created by - <br> - ______________________ are Copyright (C) ______ -_______________________. -All Rights - <br> -Reserved. - </p> - <p>Contributor(s): ______________________________________. - </p> - <p>Alternatively, the contents of this file may be used under the -terms -of the _____ license (the “[___] License”), in which case the -provisions -of [______] License are applicable instead of those above. -If you wish to allow use of your version of this file only under the -terms -of the [____] License and not to allow others to use your version of -this -file under the MPL, indicate your decision by deleting the -provisions -above and replace them with the notice and other provisions -required -by the [___] License. If you do not delete the provisions above, -a recipient may use your version of this file under either the MPL or -the -[___] License." - </p> - <p>[NOTE: The text of this Exhibit A may differ slightly from the -text -of the notices in the Source Code files of the Original Code. You -should -use the text of this Exhibit A rather than the text found in the -Original -Code Source Code for Your Modifications.] - </p> - <p></p> -</ul> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: sRGB Profiles; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>International Color Consortium<br> -</h2> -<h3>sRGB Profiles<br></h3> - -<br> -To anyone who acknowledges that the files "sRGB_IEC61966-2-1_noBPC.icc" and -"sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" WITH NO EXPRESS OR IMPLIED -WARRANTY, permission to use, copy and distribute these file for any purpose is -hereby granted without fee, provided that the files are not changed including -the HP copyright notice tag, and that the name of Hewlett-Packard Company shall -not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. Hewlett-Packard Company -makes no representations about the suitability of this software for any purpose. - -<br> -</h3> -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Sablotron; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Ginger Alliance<br> -</h2> -<h3>Sablotron<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: SANE; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>David Mosberger-Tang, Andreas Beck<br> -</h2> -<h3>SANE<br> -</h3> -<pre> -/* sane - Scanner Access Now Easy. - Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck - This file is part of the SANE package. - - This file is in the public domain. You may use and modify it as - you see fit, as long as this copyright message is included and - that there is an indication as to what modifications have been - made (if any). - - SANE 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. - - This file declares SANE application interface. See the SANE - standard for a detailed explanation of the interface. */ -</pre> -<br> -</body> -</html> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Saxon (B); Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Michael Kay<br> -</h2> -<h3>Saxon (B)<br> -</h3> - - -<a href="#mpllic">jump to MPL 1.1</a><br> - - - </body> - </html> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Stax API; Use of any of this -software is governed by the terms of the license below:<br> -<h2>stax.codehouse.org<br> -</h2> -<h3>Stax<br> -</h3> -<pre> - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -</pre> - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:STLport; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Boris Fomitchev<br> -</h2> -<h3>STLport<br> -</h3> - - - -<h4>License Agreement</h4> - -<p><b>Boris Fomitchev</b> grants <b>Licensee</b> a non-exclusive, -non-transferable, royalty-free license to use <b>STLport</b> and its -documentation without fee.<br> -<br> -By downloading, using, or copying <b>STLport</b> or any portion thereof, -<b>Licensee</b> agrees to abide by the intellectual property laws and all other -applicable laws of the United States of America, and to all of the terms and -conditions of this Agreement.<br> -<br> -<b>Licensee</b> shall maintain the following copyright and permission -notices on <b>STLport </b>sources and its documentation unchanged :</p> - - -<b>Copyright 1999,2000 Boris Fomitchev</b><br> -<br> -This material is provided "as is", with absolutely no warranty -expressed or implied. Any use is at your own risk.<br> -Permission to use or copy this software for any purpose is hereby granted -without fee, provided the above notices are retained on all copies. Permission -to modify the code and to distribute modified code is granted, provided the -above notices are retained, and a notice that the code was modified is included -with the above copyright notice. - - -<p>The <b>Licensee</b> may distribute binaries compiled with <b>STLport</b> -(whether original or modified) without any royalties or restrictions.</p> -<p>The <b>Licensee</b> may distribute original or modified <b>STLport</b> sources, -provided that:</p> -<ul> - <li>The conditions indicated in the above permission notice are met;</li> - <li>The following copyright notices are retained when present, and conditions - provided in accompanying permission notices are met :</li> -</ul> -<p><b><i>Copyright 1994 Hewlett-Packard Company</i></b></p> -<p><b><i>Copyright 1996,97 Silicon Graphics Computer Systems, Inc.</i></b></p> -<p><b><i>Copyright 1997 Moscow Center for SPARC Technology.</i></b></p> -<blockquote> - <p><i><font size="2">Permission to use, copy, modify, distribute and sell this - software and its documentation for any purpose is hereby granted without fee, - provided that the above copyright notice appear in all copies and that both - that copyright notice and this permission notice appear in supporting - documentation. Hewlett-Packard Company makes no representations about the - suitability of this software for any purpose. It is provided "as is" - without express or implied warranty.</font></i></p> - <p><i><font size="2">Permission to use, copy, modify, distribute and sell this - software and its documentation for any purpose is hereby granted without fee, - provided that the above copyright notice appear in all copies and that both - that copyright notice and this permission notice appear in supporting - documentation. Silicon Graphics makes no representations about the suitability - of this software for any purpose. It is provided "as is" without - express or implied warranty.</font></i></p> -</blockquote> -<blockquote> - <i><font size="2">Permission to use, copy, modify, distribute and sell this - software and its documentation for any purpose is hereby granted without fee, - provided that the above copyright notice appear in all copies and that both - that copyright notice and this permission notice appear in supporting - documentation. Moscow Center for SPARC Technology makes no - representations about the suitability of this software for any purpose. It is - provided "as is" without express or implied warranty.</font></i> -</blockquote> - - -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Italian Thesaurus; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Daniela Volta, Davide Prina<br>
-</h2>
-<h3>Italian Thesaurus<br>
-</h3>
-<br>
-<a href="#gpl">Jump to GPL</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Nepali thesaurus dictionary; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>NepaLinux.org<br>
-</h2>
-<h3>Nepali thesaurus dictionary (LGPL v2.1)<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Italian Thesaurus; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Daniela Volta, Davide Prina<br>
-</h2>
-<h3>Sownik synonimw v. 1, (Polish Thesaurus)<br>
-</h3>
-<br>
-
-Open Software License v. 2.1
-<br>
-This Open Software License (the "License") applies to any original work of
-authorship (the "Original Work") whose owner (the "Licensor") has placed the
-following notice immediately following the copyright notice for the Original Work:
-
-<br>
-Licensed under the Open Software License version 2.1
-
-<br>
-1) Grant of Copyright License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license to do the following:
-
-<br>
- * to reproduce the Original Work in copies;
-<br>
- * to prepare derivative works ("Derivative Works") based upon the Original Work;
-<br>
- * to distribute copies of the Original Work and Derivative Works to the
-<br>
-public, with the proviso that copies of Original Work or Derivative Works that
-You distribute shall be licensed under the Open Software License;
- * to perform the Original Work publicly; and
-<br>
- * to display the Original Work publicly.
-<br>
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license, under patent
-claims owned or controlled by the Licensor that are embodied in the Original
-Work as furnished by the Licensor, to make, use, sell and offer for sale the
-Original Work and Derivative Works.
-
-<br>
-3) Grant of Source Code License. The term "Source Code" means the preferred form
-of the Original Work for making modifications to it and all available
-documentation describing how to modify the Original Work. Licensor hereby agrees
-to provide a machine-readable copy of the Source Code of the Original Work along
-with each copy of the Original Work that Licensor distributes. Licensor reserves
-the right to satisfy this obligation by placing a machine-readable copy of the
-Source Code in an information repository reasonably calculated to permit
-inexpensive and convenient access by You for as long as Licensor continues to
-distribute the Original Work, and by publishing the address of that information
-repository in a notice immediately following the copyright notice that applies
-to the Original Work.
-
-<br>
-4) Exclusions From License Grant. Neither the names of Licensor, nor the names
-of any contributors to the Original Work, nor any of their trademarks or service
-marks, may be used to endorse or promote products derived from this Original
-Work without express prior written permission of the Licensor. Nothing in this
-License shall be deemed to grant any rights to trademarks, copyrights, patents,
-trade secrets or any other intellectual property of Licensor except as expressly
-stated herein. No patent license is granted to make, use, sell or offer to sell
-embodiments of any patent claims other than the licensed claims defined in
-Section 2. No right is granted to the trademarks of Licensor even if such marks
-are included in the Original Work. Nothing in this License shall be interpreted
-to prohibit Licensor from licensing under different terms from this License any
-Original Work that Licensor otherwise would have a right to license.
-
-<br>
-5) External Deployment. The term "External Deployment" means the use or
-distribution of the Original Work or Derivative Works in any way such that the
-Original Work or Derivative Works may be used by anyone other than You, whether
-the Original Work or Derivative Works are distributed to those persons or made
-available as an application intended for use over a computer network. As an
-express condition for the grants of license hereunder, You agree that any
-External Deployment by You of a Derivative Work shall be deemed a distribution
-and shall be licensed to all under the terms of this License, as prescribed in
-section 1(c) herein.
-
-<br>
-6) Attribution Rights. You must retain, in the Source Code of any Derivative
-Works that You create, all copyright, patent or trademark notices from the
-Source Code of the Original Work, as well as any notices of licensing and any
-descriptive text identified therein as an "Attribution Notice." You must cause
-the Source Code for any Derivative Works that You create to carry a prominent
-Attribution Notice reasonably calculated to inform recipients that You have
-modified the Original Work.
-
-<br>
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the
-copyright in and to the Original Work and the patent rights granted herein by
-Licensor are owned by the Licensor or are sublicensed to You under the terms of
-this License with the permission of the contributor(s) of those copyrights and
-patent rights. Except as expressly stated in the immediately proceeding
-sentence, the Original Work is provided under this License on an "AS IS" BASIS
-and WITHOUT WARRANTY, either express or implied, including, without limitation,
-the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
-This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No
-license to Original Work is granted hereunder except under this disclaimer.
-
-<br>
-8) Limitation of Liability. Under no circumstances and under no legal theory,
-whether in tort (including negligence), contract, or otherwise, shall the
-Licensor be liable to any person for any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-the use of the Original Work including, without limitation, damages for loss of
-goodwill, work stoppage, computer failure or malfunction, or any and all other
-commercial damages or losses. This limitation of liability shall not apply to
-liability for death or personal injury resulting from Licensor's negligence to
-the extent applicable law prohibits such limitation. Some jurisdictions do not
-allow the exclusion or limitation of incidental or consequential damages, so
-this exclusion and limitation may not apply to You.
-
-<br>
-9) Acceptance and Termination. If You distribute copies of the Original Work or
-a Derivative Work, You must make a reasonable effort under the circumstances to
-obtain the express assent of recipients to the terms of this License. Nothing
-else but this License (or another written agreement between Licensor and You)
-grants You permission to create Derivative Works based upon the Original Work or
-to exercise any of the rights granted in Section 1 herein, and any attempt to do
-so except under the terms of this License (or another written agreement between
-Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent
-laws of other countries, and by international treaty. Therefore, by exercising
-any of the rights granted to You in Section 1 herein, You indicate Your
-acceptance of this License and all of its terms and conditions. This License
-shall terminate immediately and you may no longer exercise any of the rights
-granted to You by this License upon Your failure to honor the proviso in Section
-1(c) herein.
-
-<br>
-10) Termination for Patent Action. This License shall terminate automatically
-and You may no longer exercise any of the rights granted to You by this License
-as of the date You commence an action, including a cross-claim or counterclaim,
-against Licensor or any licensee alleging that the Original Work infringes a
-patent. This termination provision shall not apply for an action alleging patent
-infringement by combinations of the Original Work with other software or hardware.
-
-<br>
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this
-License may be brought only in the courts of a jurisdiction wherein the Licensor
-resides or in which Licensor conducts its primary business, and under the laws
-of that jurisdiction excluding its conflict-of-law provisions. The application
-of the United Nations Convention on Contracts for the International Sale of
-Goods is expressly excluded. Any use of the Original Work outside the scope of
-this License or after its termination shall be subject to the requirements and
-penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent
-laws of other countries, and international treaty. This section shall survive
-the termination of this License.
-
-<br>
-12) Attorneys Fees. In any action to enforce the terms of this License or
-seeking damages relating thereto, the prevailing party shall be entitled to
-recover its costs and expenses, including, without limitation, reasonable
-attorneys' fees and costs incurred in connection with such action, including any
-appeal of such action. This section shall survive the termination of this License.
-
-<br>
-13) Miscellaneous. This License represents the complete agreement concerning the
-subject matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent necessary to
-make it enforceable.
-
-<br>
-14) Definition of "You" in This License. "You" throughout this License, whether
-in upper or lower case, means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this License. For legal entities,
-"You" includes any entity that controls, is controlled by, or is under common
-control with you. For purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or
-more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-<br>
-15) Right to Use. You may use the Original Work in all ways not otherwise
-restricted or conditioned by this License or by law, and Licensor promises not
-to interfere with or be responsible for such uses by You.
-
-<br>
-This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
-Permission is hereby granted to copy and distribute this license without
-modification. This license may not be modified without the express written
-permission of its copyright owner.
-<br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Russian thesaurus; Use of any of this software
-is governed by the terms of the license below:<br>
-<h2>Mikhail Korolyov<br>
-</h2>
-<h3>Russian thesaurus<br>
-</h3>
-<br>
-<a href="#lgpl">jump to GNU Lesser General Public License</a><br>
- </body>
- </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: TWAIN; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>TWAIN Working Group<br> -</h2> -<h3>TWAIN<br> -</h3> - -<br> -The TWAIN License -<br> -The TWAIN Working Group grants customer ("Customer") the worldwide, -royalty-free, non-exclusive license to reproduce and distribute the software and -documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit was -designed to be used by third parties to assist them in becoming compliant with -the TWAIN standard, but it has not been developed to the standards of a -commercial product. Consequently, the TWAIN toolkit is provided AS IS without -any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN -toolkit whether implied, express or statutory, including, without limitation, -the implied warranties of merchantability, noninfringement of third party rights -and fitness for a particular purpose. The TWAIN Working Group disclaims all -liability for damages, whether direct, indirect, special, incidental, or -consequential, arising from the reproduction, distribution, modification, or -other use of the TWAIN Toolkit. -<br> -As a condition of this license, Customer agrees to include in software programs -based in whole or in part on the TWAIN Toolkit the following providions in (i) -the header or similar file in such software and (ii) prominently in its -documentation and to require its sublicensees to include these provisions in -similar locations: The TWAIN Toolkit is distributed as is. The developer and -distributors of the TWAIN Toolkit expressly disclaim all implied, express or -statutory warranties including, without limitation, the implied warranties of -merchantability, noninfringement of third party rights and fitness for a -particular purpose. Neither the developers nor the distributors will be liable -for damages, whether direct, indirect, special, incidental, or consequential, as -a result of the reproduction, modification, distribution or other use of the -TWAIN Toolkit. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Unicode's CLDR data repository; Use of any of this software -is governed by the terms of the license below:<br> -<h2>Unicode, Inc.<br> -</h2> -<h3>Unicode CLDR data repository<br> -</h3> -<br> -Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under -the Terms of Use in http://www.unicode.org/copyright.html. -<br> -Permission is hereby granted, free of charge, to any person obtaining a copy -of the Unicode data files and any associated documentation (the "Data Files") -or Unicode software and any associated documentation (the "Software") to deal -in the Data Files or Software without restriction, including without -limitation the rights to use, copy, modify, merge, publish, distribute, and/or -sell copies of the Data Files or Software, and to permit persons to whom the -Data Files or Software are furnished to do so, provided that (a) the above -copyright notice(s) and this permission notice appear with all copies of the -Data Files or Software, (b) both the above copyright notice(s) and this -permission notice appear in associated documentation, and (c) there is clear -notice in each modified Data File or in the Software as well as in the -documentation associated with the Data File(s) or Software that the data or -software has been modified. -<br> -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD -PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN -THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE -DATA FILES OR SOFTWARE. -<br> -Except as contained in this notice, the name of a copyright holder shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in these Data Files or Software without prior written authorization of the -copyright holder. -<br> - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: unixODBC; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>unixODBC.org<br> -</h2> -<h3>unixODBC<br> -</h3> -<a href="#lgpl">jump to LGPL</a><br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: vigra; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Ullrich Koethe<br> -</h2> -<h3>vigra<br> -</h3> - -<br> -The VIGRA Artistic License -<br> -========================== -<br> -(modeled after the Perl Artistic License) -<br> - -<br> - -Preamble -<br> --------- -<br> - -<br> -The intent of this document is to state the conditions under which -VIGRA may be copied, such that the author maintains some -semblance of artistic control over the development of the library, -while giving the users of the library the right to use and -distribute VIGRA in a more-or-less customary fashion, plus the -right to make reasonable modifications. -<br> - - -Definitions -<br> ------------ -<br> - -"Copyright Holder" of the VIGRA library is -Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany. -<br> - -"Library" refers to the collection of files distributed by the -Copyright Holder under the name "VIGRA" (including this -LICENSE file and all accompanying documentation), and derivatives of that -collection of files created through textual modification. -<br> - -"Standard Version" refers to the Library if it has not been +permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Raptor RDF Parser Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Raptor RDF +Parser Library. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2000-2008 <A HREF="http://www.dajobe.org/">David +Beckett</A><BR>Copyright (C) 2000-2005 <A HREF="http://www.bristol.ac.uk/">University +of Bristol</A>. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All the licenses below are alternatives and if you select one +license, that one alone applies.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">Rasqal RDF Query Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Rasqal RDF +Query Library. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2000-2008 <A HREF="http://www.dajobe.org/">David +Beckett</A><BR>Copyright (C) 2000-2005 <A HREF="http://www.bristol.ac.uk/">University +of Bristol</A>. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All the licenses below are alternatives and if you select one +license, that one alone applies.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">Redland RDF Application Framework</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Redland RDF +Application Framework. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2000-2008 <A HREF="http://www.dajobe.org/">David +Beckett</A><BR>Copyright (C) 2000-2005 <A HREF="http://www.bristol.ac.uk/">University +of Bristol</A>. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All the licenses below are alternatives and if you select one +license, that one alone applies.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">Remote Control Wrapper</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Remote +Control Wrapper. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Created by Martin Kahr under a MIT-style license. Copyright (c) +2006/2007 martinkahr.com. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Rhino</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Rhino. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#10.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">SANE</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: SANE. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +sane - Scanner Access Now Easy. Copyright (C) 1997-1999 David +Mosberger-Tang and Andreas Beck</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This file is part of the SANE package.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This file is in the public domain. You may use and modify it as you +see fit, as long as this copyright message is included and that there +is an indication as to what modifications have been made (if any).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +SANE 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.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This file declares SANE application interface. See the SANE standard +for a detailed explanation of the interface.</P> +<H2 LANG="en-US" CLASS="western">Saxon (B)</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Saxon (B). +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#10.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">Stax</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Stax API. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">STLPort</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product:STLport. Use +of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">License Agreement</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<B>Boris Fomitchev</B> grants <B>Licensee</B> a non-exclusive, +non-transferable, royalty-free license to use <B>STLport</B> and its +documentation without fee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +By downloading, using, or copying <B>STLport</B> or any portion +thereof, <B>Licensee</B> agrees to abide by the intellectual property +laws and all other applicable laws of the United States of America, +and to all of the terms and conditions of this Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<B>Licensee</B> shall maintain the following copyright and permission +notices on <B>STLport </B>sources and its documentation unchanged:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<B>Copyright 1999,2000 Boris Fomitchev</B></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This material is provided "as is", with absolutely no +warranty expressed or implied. Any use is at your own risk.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use or copy this software for any purpose is hereby +granted without fee, provided the above notices are retained on all +copies. Permission to modify the code and to distribute modified code +is granted, provided the above notices are retained, and a notice +that the code was modified is included with the above copyright +notice.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The <B>Licensee</B> may distribute binaries compiled with <B>STLport</B> +(whether original or modified) without any royalties or restrictions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The <B>Licensee</B> may distribute original or modified <B>STLport</B> +sources, provided that:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The conditions indicated in the above permission notice are met;</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The following copyright notices are retained when present, and + conditions provided in accompanying permission notices are met:</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1994 Hewlett-Packard Company</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1996,97 Silicon Graphics Computer Systems, Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1997 Moscow Center for SPARC Technology.</P> +<BLOCKQUOTE LANG="en-US" CLASS="western"><FONT SIZE=2><I>Permission +to use, copy, modify, distribute and sell this software and its +documentation for any purpose is hereby granted without fee, provided +that the above copyright notice appear in all copies and that both +that copyright notice and this permission notice appear in supporting +documentation. Hewlett-Packard Company makes no representations about +the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty.</I></FONT></BLOCKQUOTE> +<BLOCKQUOTE LANG="en-US" CLASS="western"><FONT SIZE=2><I>Permission +to use, copy, modify, distribute and sell this software and its +documentation for any purpose is hereby granted without fee, provided +that the above copyright notice appear in all copies and that both +that copyright notice and this permission notice appear in supporting +documentation. Silicon Graphics makes no representations about the +suitability of this software for any purpose. It is provided "as +is" without express or implied warranty.</I></FONT></BLOCKQUOTE> +<BLOCKQUOTE LANG="en-US" CLASS="western"><FONT SIZE=2><I>Permission +to use, copy, modify, distribute and sell this software and its +documentation for any purpose is hereby granted without fee, provided +that the above copyright notice appear in all copies and that both +that copyright notice and this permission notice appear in supporting +documentation. Moscow Center for </I></FONT><FONT SIZE=2><I>SPARC +Technology makes no representations about the suitability of this +software for any purpose. It is provided "as is" without +express or implied warranty.</I></FONT></BLOCKQUOTE> +<H2 LANG="en-US" CLASS="western">The Gimp Toolkit (GTK+)</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: GTK+ (The +Gimp Toolkit). Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">TWAIN</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: TWAIN. Use of +any of this software is governed by the terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">The TWAIN License</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The TWAIN Working Group grants customer ("Customer") the +worldwide, royalty-free, non-exclusive license to reproduce and +distribute the software and documentation of the TWAIN toolkit +("TWAIN Toolkit"). The TWAIN Toolkit was designed to be +used by third parties to assist them in becoming compliant with the +TWAIN standard, but it has not been developed to the standards of a +commercial product. Consequently, the TWAIN toolkit is provided AS IS +without any warranty. THE TWAIN Working Group disclaims all +warranties in the TWAIN toolkit whether implied, express or +statutory, including, without limitation, the implied warranties of +merchantability, non infringement of third party rights and fitness +for a particular purpose. The TWAIN Working Group disclaims all +liability for damages, whether direct, indirect, special, incidental, +or consequential, arising from the reproduction, distribution, +modification, or other use of the TWAIN Toolkit.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +As a condition of this license, Customer agrees to include in +software programs based in whole or in part on the TWAIN Toolkit the +following provisions in (i) the header or similar file in such +software and (ii) prominently in its documentation and to require its +sublicensees to include these provisions in similar locations: The +TWAIN Toolkit is distributed as is. The developer and distributors of +the TWAIN Toolkit expressly disclaim all implied, express or +statutory warranties including, without limitation, the implied +warranties of merchantability, non infringement of third party rights +and fitness for a particular purpose. Neither the developers nor the +distributors will be liable for damages, whether direct, indirect, +special, incidental, or consequential, as a result of the +reproduction, modification, distribution or other use of the TWAIN +Toolkit.</P> +<H2 LANG="en-US" CLASS="western">Unicode CLDR data repository</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Unicode's +CLDR data repository. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed +under the Terms of Use in <A HREF="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated +documentation (the "Software") to deal in the Data Files or +Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, and/or sell copies +of the Data Files or Software, and to permit persons to whom the Data +Files or Software are furnished to do so, provided that (a) the above +copyright notice(s) and this permission notice appear with all copies +of the Data Files or Software, (b) both the above copyright notice(s) +and this permission notice appear in associated documentation, and +(c) there is clear notice in each modified Data File or in the +Software as well as in the documentation associated with the Data +File(s) or Software that the data or software has been modified.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT +WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL +THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR +ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THE DATA FILES OR SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder.</P> +<H2 LANG="en-US" CLASS="western">UnixODBC</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: unixODBC. Use +of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">vigra</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: vigra. Use of +any of this software is governed by the terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">The VIGRA Artistic License</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +(modeled after the Perl Artistic License)</P> +<H4 LANG="en-US" CLASS="western">Preamble</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The intent of this document is to state the conditions under which +VIGRA may be copied, such that the author maintains some semblance of +artistic control over the development of the library, while giving +the users of the library the right to use and distribute VIGRA in a +more-or-less customary fashion, plus the right to make reasonable +modifications.</P> +<H4 LANG="en-US" CLASS="western">Definitions</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Copyright Holder" of the VIGRA library is Ullrich Koethe, +Cognitive Systems Group, University of Hamburg, Germany.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Library" refers to the collection of files distributed by +the Copyright Holder under the name "VIGRA" (including this +LICENSE file and all accompanying documentation), and derivatives of +that collection of files created through textual modification.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Standard Version" refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the -Copyright Holder as specified below. -<br> - -"You" is you, if you're thinking about using, copying, modifying or -distributing this Library. -<br> - -"Freely Available" means that no fee is charged for the item. -It also means that recipients of the item may redistribute it -under the same conditions they received it. -<br> - -"Reasonable copying fee" is whatever you can justify on the basis -of media cost, duplication charges, time of people involved, and so -on. (You will not be required to justify it to the Copyright Holder, -but only to the computing community at large as a market that must -bear the fee.) -<br> - - -License terms -<br> -------------- -<br> - -1. You may make and give away verbatim copies of the - Standard Version of this Library without restriction, provided that - you duplicate all of the original copyright notices, this license, - and associated disclaimers. - <br> - -2. The Standard Version of the Library may be distributed as part - of a collection of software, provided no more than a reasonable - copying fee is charged for the software collection. - <br> - -3. You may apply bug fixes and portability fixes - derived from the Public Domain or from the Copyright Holder. A - Library modified in such a way shall still be considered the - Standard Version. - <br> - +Copyright Holder as specified below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"You" is you, if you're thinking about using, copying, +modifying or distributing this Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Freely Available" means that no fee is charged for the +item. It also means that recipients of the item may redistribute it +under the same conditions they received it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Reasonable copying fee" is whatever you can justify on the +basis of media cost, duplication charges, time of people involved, +and so on. (You will not be required to justify it to the Copyright +Holder, but only to the computing community at large as a market that +must bear the fee.)</P> +<H4 LANG="en-US" CLASS="western">License terms</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. You may make and give away verbatim copies of the Standard Version +of this Library without restriction, provided that you duplicate all +of the original copyright notices, this license, and associated +disclaimers.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. The Standard Version of the Library may be distributed as part of +a collection of software, provided no more than a reasonable copying +fee is charged for the software collection.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. You may apply bug fixes and portability fixes derived from the +Public Domain or from the Copyright Holder. A Library modified in +such a way shall still be considered the Standard Version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 4. You may otherwise modify your copy of this Library in any way, - provided that you insert a prominent notice in each changed file - stating how and when you changed that file, and provided that you do - at least ONE of the following: - <br> - - a. place your modifications in the Public Domain or otherwise - make them Freely Available, for example by allowing the Copyright - Holder to include your modifications in the Standard Version of - the Library. - <br> - - b. use the modified Library only within your corporation or - organization. - <br> - - c. make other distribution arrangements with the Copyright - Holder. - <br> - -5. You may distribute programs which use this Library - in object code or executable form without restriction. - <br> - -6. Any object code generated as a result of using this Library - does not fall under the copyright of this Library, but - belongs to whomever generated it, and may be sold commercially. - <br> - -7. The name of the Copyright Holder or the Library may not be used to - endorse or promote products derived from this software without - specific prior written permission. - <br> - -8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - <br> - - IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, - INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER - OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY - THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE - OR PERFORMANCE OF THIS LIBRARY. - <br> - </body> - </html> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Xalan; Use of any of this -software is governed by the terms of the license below:<br> -<h2>The Apache Software Foundation<br> -</h2> -<h3>Xalan<br> -</h3> -<pre> - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -</pre> - </body> - </html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: XML Security Library (xmlsec); Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Aleksey Sanin<br> -</h2> -<h3>XML Security Library (xmlsec)<br> -</h3> -xmlsec, xmlsec-openssl, xmlsec-gnutls libraries -<br> ------------------------------------------------------------------------------- -<br> - -Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. -<br> - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: -<br> - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -<br> - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -<br> - -Except as contained in this notice, the name of Aleksey Sanin shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. -<br> - -<br> - -xmlsec-nss library -<br> ------------------------------------------------------------------------------- -<br> -Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. -<br> -Copyright (c) 2003 America Online, Inc. All rights reserved. -<br> - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: -<br> - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -<br> - -Portions of the Software were created using source code and/or APIs -governed by the Mozilla Public License (MPL). The MPL is available -at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such -portions to be distributed with code not governed by MPL, as long -as the requirements of MPL are fulfilled for such portions. -<br> - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -<br> - -Except as contained in this notice, the name of Aleksey Sanin shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. -<br> -</body> -</html> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: X11 XRender Extension; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>Keith Packard, SuSE, Inc.<br> -</h2> -<h3>X11 XRender Extension<br> -</h3> -Copyright © 2000 SuSE, Inc. -<br> -Permission to use, copy, modify, distribute, and sell this software and -its -documentation for any purpose is hereby granted without fee, provided -that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of SuSE not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. SuSE makes no representations about the -suitability of this software for any purpose. It is provided "as is" -without express or implied warranty. -<br> +provided that you insert a prominent notice in each changed file +stating how and when you changed that file, and provided that you do +at least ONE of the following:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a. place your modifications in the Public Domain or otherwise make +them Freely Available, for example by allowing the Copyright Holder +to include your modifications in the Standard Version of the Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +b. use the modified Library only within your corporation or +organization.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +c. make other distribution arrangements with the Copyright Holder.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. You may distribute programs which use this Library in object code +or executable form without restriction.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. Any object code generated as a result of using this Library does +not fall under the copyright of this Library, but belongs to whomever +generated it, and may be sold commercially.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +7. The name of the Copyright Holder or the Library may not be used to +endorse or promote products derived from this software without +specific prior written permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, +INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY +THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS LIBRARY.</P> +<H2 LANG="en-US" CLASS="western">W3C Simple API for CSS (SAC)</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: W3C Simple +API for CSS (SAC). Use of any of this software is governed by the +terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">W3C IPR SOFTWARE NOTICE</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2002 World Wide Web Consortium, (Massachusetts +Institute of Technology, Institut National de Recherche en +Informatique et en Automatique, Keio University). All Rights +Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<B>Note:</B> The original version of the W3C Software Copyright +Notice and License could be found at +<A HREF="http://www.w3.org/Consortium/Legal/copyright-software-19980720">http://www.w3.org/Consortium/Legal/copyright-software-19980720</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 1994-2002 <A HREF="http://www.w3.org/">World Wide +Web Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts +Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut +National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio +University</A>). All Rights Reserved. +<A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This W3C work (including software, documents, or other related items) +is being provided by the copyright holders under the following +license. By obtaining, using and/or copying this work, you (the +licensee) agree that you have read, understood, and will comply with +the following terms and conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, and modify this software and its +documentation, with or without modification, for any purpose and +without fee or royalty is hereby granted, provided that you include +the following on ALL copies of the software and documentation or +portions thereof, including modifications, that you make:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the following + form (hypertext is preferred, text is permitted) should be used + within the body of any redistributed or derivative code: "Copyright + © 2002 <A HREF="http://www.w3.org/">World Wide Web Consortium</A>, + (<A HREF="http://www.lcs.mit.edu/">Massachusetts Institute of + Technology</A>, <A HREF="http://www.inria.fr/">Institut National de + Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio + University</A>). All Rights Reserved. + <A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A>"</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.)</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND +COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY +OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE +OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, +COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE +SOFTWARE OR DOCUMENTATION.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to the software without specific, +written prior permission. Title to copyright in this software and any +associated documentation will at all times remain with copyright +holders.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +X11 XRender Extension</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: X11 XRender +Extension. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2000 SuSE, Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear in +supporting documentation, and that the name of SuSE not be used in +advertising or publicity pertaining to distribution of the software +without specific, written prior permission. SuSE makes no +representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied +warranty.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -SuSE -BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY -DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION -OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: XT; Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>James Clark, Bill Lindsey<br> -</h2> -<h3>XT <br> -</h3> -Copyright (c) 1998, 1999 James Clark -<br> +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT +SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Xalan</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Xalan. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.Apache License|outline">Jump to Apache License Version +2.0</A></P> +<H2 LANG="en-US" CLASS="western">XML Security Library (xmlsec)</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: XML Security +Library (xmlsec). Use of any of this software is governed by the +terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">xmlsec, xmlsec-openssl, +xmlsec-gnutls libraries</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the -``Software''), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: -<br> -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. -<br> -THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, -EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -<br> -Except as contained in this notice, the name of James Clark shall +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from James Clark. -<br> -<br> -Copyright (c) 2002 Bill Lindsey -<br> +from him.</P> +<H3 LANG="en-US" CLASS="western">xmlsec-nss library</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2003 America Online, Inc. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Portions of the Software were created using source code and/or APIs +governed by the Mozilla Public License (MPL). The MPL is available at +<A HREF="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>. +The MPL permits such portions to be distributed with code not +governed by MPL, as long as the requirements of MPL are fulfilled for +such portions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of Aleksey Sanin shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from him.</P> +<H2 LANG="en-US" CLASS="western">XSLT MathML Library</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: XSLT MathML +Library. Use of any of this software is governed by the terms of the +license below:</P> +<H3 LANG="en-US" CLASS="western">Copyright</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2001-2003 Vasil Yaroshevich</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to -the following conditions: -<br> -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. -Substantial portions of the Software are copyrighted by James Clark. -Copying permissions and restrictions for those portions are covered -in the file "copyingjc.txt" -<br> -THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, -EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL BILL LINDSEY BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -<br> -Except as contained in this notice, the name of Bill Lindsey shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from Bill Lindsey. -<br> -</body> -</html> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product:zlib; Use of any of this software -is governed -by the terms of the license below:<br> -<h2>Jean-Loup Gailly, Mark Adler<br> -</h2> -<h3>zlib<br> -</h3> -(C) 1995-2002 Jean-loup Gailly and Mark Adler <br> +the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the names of individuals credited +with contribution to this software shall not be used in advertising +or otherwise to promote the sale, use or other dealings in this +Software without prior written authorization from the individuals in +question.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Any stylesheet derived from this Software that is publicly +distributed will be identified with a different name and the version +strings in any derived Software will be changed so that no +possibility of confusion between the derived package and this +Software will exist.</P> +<H3 LANG="en-US" CLASS="western">Warranty</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER +CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western">Xpdf</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Xpdf. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Xpdf software and documentation are copyright 1996-2007 Glyph & +Cog, LLC.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">zlib</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: zlib. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +(C) 1995-2002 Jean-loup Gailly and Mark Adler</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages -arising from the use of this software. <br> +arising from the use of this software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: <br> -<br> -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software in -a product, an acknowledgment in the product documentation would be -appreciated but is not required. <br> -2. Altered source versions must be plainly marked as such, and must not -be misrepresented as being the original software. <br> +including commercial applications, and to alter it and redistribute +it freely, subject to the following restrictions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Altered source versions must be plainly marked as such, and must +not be misrepresented as being the original software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> 3. This notice may not be removed or altered from any source -distribution. <br> -</body> -</html> -<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> - <meta http-equiv="Content-Type" - content="text/html; charset=iso-8859-1"> - <meta name="GENERATOR" - content="Mozilla/4.5 [en]C-NSCP (Win95; U) [Netscape]"> - <title>Mozilla Public License version 1.1</title> -<!-- base href="http://www.mozilla.org/MPL/MPL-1.1.html" --> -</head> -<body> -<hr style="width: 100%; height: 2px;">The following software may be -included in this product: Mozilla, Mozilla Address Book, NP SDK: Use of any of this -software -is governed -by the terms of the license below:<br> -<h2>The Mozilla Foundation<br> -</h2> -<h3>Mozilla Address Book<br> -</h3> -<center><b><font size="+2"><a name="mpllic"></a>MOZILLA PUBLIC LICENSE</font></b> -<br> -<b>Version 1.1</b> -<p></p> -<hr width="20%"></center> -<a name="1"></a> -<p><b>1. Definitions.</b> -<a name="1.0.1"></a></p> -<ul> - <b>1.0.1. "Commercial Use" </b>means distribution or otherwise -making -the Covered Code available to a third party. <a name="1.1"></a> - <p><b>1.1. ''Contributor''</b> means each entity that creates or -contributes -to the creation of Modifications. <a name="1.2"></a></p> - <p><b>1.2. ''Contributor Version''</b> means the combination of the -Original -Code, prior Modifications used by a Contributor, and the Modifications -made by that particular Contributor. <a name="1.3"></a></p> - <p><b>1.3. ''Covered Code''</b> means the Original Code or -Modifications -or the combination of the Original Code and Modifications, in each case -including portions thereof<b>.</b> <a name="1.4"></a></p> - <p><b>1.4. ''Electronic Distribution Mechanism''</b> means a -mechanism -generally accepted in the software development community for the -electronic -transfer of data. <a name="1.5"></a></p> - <p><b>1.5. ''Executable''</b> means Covered Code in any form other -than -Source Code. <a name="1.6"></a></p> - <p><b>1.6. ''Initial Developer''</b> means the individual or entity -identified -as the Initial Developer in the Source Code notice required by <b>Exhibit -A</b>. <a name="1.7"></a></p> - <p><b>1.7. ''Larger Work''</b> means a work which combines Covered -Code -or portions thereof with code not governed by the terms of this -License. <a name="1.8"></a></p> - <p><b>1.8. ''License''</b> means this document. <a name="1.8.1"></a></p> - <p><b>1.8.1. "Licensable"</b> means having the right to grant, to the -maximum -extent possible, whether at the time of the initial grant or -subsequently -acquired, any and all of the rights conveyed herein. <a name="1.9"></a></p> - <p><b>1.9. ''Modifications''</b> means any addition to or deletion -from -the substance or structure of either the Original Code or any previous -Modifications. When Covered Code is released as a series of files, a -Modification -is: </p> - <ul> - <b>A.</b> Any addition to or deletion from the contents of a file -containing -Original Code or previous Modifications. - <p><b>B.</b> Any new file that contains any part of the Original -Code or -previous Modifications. <br> - </p> - </ul> - <a name="1.10"></a> <b>1.10. ''Original Code''</b> means Source Code -of computer software -code -which is described in the Source Code notice required by <b>Exhibit A</b> -as Original Code, and which, at the time of its release under this -License -is not already Covered Code governed by this License. <a name="1.10.1"></a> - <p><b>1.10.1. "Patent Claims"</b> means any patent claim(s), now -owned -or hereafter acquired, including without limitation, method, -process, -and apparatus claims, in any patent Licensable by grantor. <a - name="1.11"></a></p> - <p><b>1.11. ''Source Code''</b> means the preferred form of the -Covered -Code for making modifications to it, including all modules it contains, -plus any associated interface definition files, scripts used to control -compilation and installation of an Executable, or source code -differential -comparisons against either the Original Code or another well known, -available -Covered Code of the Contributor's choice. The Source Code can be in a -compressed -or archival form, provided the appropriate decompression or -de-archiving -software is widely available for no charge. <a name="1.12"></a></p> - <p><b>1.12. "You'' (or "Your") </b> means an individual or a -legal -entity exercising rights under, and complying with all of the terms of, -this License or a future version of this License issued under Section -6.1. -For legal entities, "You'' includes any entity which controls, is -controlled -by, or is under common control with You. For purposes of this -definition, -"control'' means (a) the power, direct or indirect, to cause the -direction -or management of such entity, whether by contract or otherwise, or (b) -ownership of more than fifty percent (50%) of the outstanding shares or -beneficial ownership of such entity.</p> -</ul> -<a name="2"></a> -<b>2. Source Code License.</b> -<a name="2.1"></a> -<ul> - <b>2.1. The Initial Developer Grant.</b> <br> -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property -claims: - <ul> - <b>(a)</b> <b> </b>under intellectual property rights (other -than -patent or trademark) Licensable by Initial Developer to use, reproduce, -modify, display, perform, sublicense and distribute the Original Code -(or -portions thereof) with or without Modifications, and/or as part of a -Larger -Work; and - <p><b>(b)</b> under Patents Claims infringed by the making, using -or selling -of Original Code, to make, have made, use, practice, sell, and offer -for -sale, and/or otherwise dispose of the Original Code (or portions -thereof). </p> - <ul> - <ul> - - </ul> - </ul> - <b>(c) </b>the licenses granted in this Section 2.1(a) and (b) are -effective -on the date Initial Developer first distributes Original Code under the -terms of this License. - <p><b>(d) </b>Notwithstanding Section 2.1(b) above, no patent -license is -granted: 1) for code that You delete from the Original Code; 2) -separate -from the Original Code; or 3) for infringements caused by: i) the -modification of the Original Code or ii) the combination of the -Original -Code with other software or devices. <br> - </p> - </ul> - <a name="2.2"></a> <b>2.2. Contributor Grant.</b> <br> -Subject to third party intellectual property claims, each Contributor -hereby grants You a world-wide, royalty-free, non-exclusive license - <ul> - <br> - <b>(a)</b> <b> </b>under intellectual property rights (other -than -patent or trademark) Licensable by Contributor, to use, reproduce, -modify, -display, perform, sublicense and distribute the Modifications created -by -such Contributor (or portions thereof) either on an unmodified basis, -with -other Modifications, as Covered Code and/or as part of a Larger Work; -and - <p><b>(b)</b> under Patent Claims infringed by the making, using, -or selling -of Modifications made by that Contributor either alone and/or in<font - color="#000000"> -combination with its Contributor Version (or portions of such -combination), -to make, use, sell, offer for sale, have made, and/or otherwise dispose -of: 1) Modifications made by that Contributor (or portions thereof); -and -2) the combination of Modifications made by that Contributor with -its Contributor Version (or portions of such combination).</font> </p> - <p><b>(c) </b>the licenses granted in Sections 2.2(a) and 2.2(b) -are effective -on the date Contributor first makes Commercial Use of the Covered Code. - </p> - <p><b>(d) </b> Notwithstanding Section 2.2(b) -above, no -patent license is granted: 1) for any code that Contributor has deleted -from the Contributor Version; 2) separate from the Contributor -Version; -3) for infringements caused by: i) third party modifications of -Contributor -Version or ii) the combination of Modifications made by that -Contributor -with other software (except as part of the Contributor Version) -or -other devices; or 4) under Patent Claims infringed by Covered Code in -the -absence of Modifications made by that Contributor.</p> - </ul> -</ul> -<a name="3"></a> -<p><br> -<b>3. Distribution Obligations.</b> -<a name="3.1"></a></p> -<ul> - <b>3.1. Application of License.</b> <br> -The Modifications which You create or to which You contribute are -governed -by the terms of this License, including without limitation Section <b>2.2</b>. -The Source Code version of Covered Code may be distributed only under -the -terms of this License or a future version of this License released -under -Section <b>6.1</b>, and You must include a copy of this License with -every -copy of the Source Code You distribute. You may not offer or impose any -terms on any Source Code version that alters or restricts the -applicable -version of this License or the recipients' rights hereunder. However, -You -may include an additional document offering the additional rights -described -in Section <b>3.5</b>. <a name="3.2"></a> - <p><b>3.2. Availability of Source Code.</b> <br> -Any Modification which You create or to which You contribute must be -made available in Source Code form under the terms of this License -either -on the same media as an Executable version or via an accepted -Electronic -Distribution Mechanism to anyone to whom you made an Executable version -available; and if made available via Electronic Distribution Mechanism, -must remain available for at least twelve (12) months after the date it -initially became available, or at least six (6) months after a -subsequent -version of that particular Modification has been made available to such -recipients. You are responsible for ensuring that the Source Code -version -remains available even if the Electronic Distribution Mechanism is -maintained -by a third party. <a name="3.3"></a></p> - <p><b>3.3. Description of Modifications.</b> <br> -You must cause all Covered Code to which You contribute to contain -a file documenting the changes You made to create that Covered Code and -the date of any change. You must include a prominent statement that the -Modification is derived, directly or indirectly, from Original Code -provided -by the Initial Developer and including the name of the Initial -Developer -in (a) the Source Code, and (b) in any notice in an Executable version -or related documentation in which You describe the origin or ownership -of the Covered Code. <a name="3.4"></a></p> - <p><b>3.4. Intellectual Property Matters</b> </p> - <ul> - <b>(a) Third Party Claims</b>. <br> -If Contributor has knowledge that a license under a third party's -intellectual -property rights is required to exercise the rights granted by such -Contributor -under Sections 2.1 or 2.2, Contributor must include a text file with -the -Source Code distribution titled "LEGAL'' which describes the claim and -the party making the claim in sufficient detail that a recipient will -know -whom to contact. If Contributor obtains such knowledge after the -Modification -is made available as described in Section 3.2, Contributor shall -promptly -modify the LEGAL file in all copies Contributor makes available -thereafter -and shall take other steps (such as notifying appropriate mailing lists -or newsgroups) reasonably calculated to inform those who received the -Covered -Code that new knowledge has been obtained. - <p><b>(b) Contributor APIs</b>. <br> -If Contributor's Modifications include an application programming -interface -and Contributor has knowledge of patent licenses which are reasonably -necessary -to implement that API, Contributor must also include this information -in -the LEGAL file. <br> - </p> - </ul> - <b>(c) -Representations.</b> - <ul> -Contributor represents that, except as disclosed pursuant to Section -3.4(a) above, Contributor believes that Contributor's Modifications are -Contributor's original creation(s) and/or Contributor has sufficient -rights -to grant the rights conveyed by this License. - </ul> - <a name="3.5"></a> - <p><br> - <b>3.5. Required Notices.</b> <br> -You must duplicate the notice in <b>Exhibit A</b> in each file of the -Source Code. If it is not possible to put such notice in a -particular -Source Code file due to its structure, then You must include such -notice -in a location (such as a relevant directory) where a user would be -likely -to look for such a notice. If You created one or more -Modification(s) -You may add your name as a Contributor to the notice described in <b>Exhibit -A</b>. You must also duplicate this License in any documentation -for the Source Code where You describe recipients' rights or ownership -rights relating to Covered Code. You may choose to offer, and to -charge a fee for, warranty, support, indemnity or liability obligations -to one or more recipients of Covered Code. However, You may do so only -on Your own behalf, and not on behalf of the Initial Developer or any -Contributor. -You must make it absolutely clear than any such warranty, support, -indemnity -or liability obligation is offered by You alone, and You hereby agree -to -indemnify the Initial Developer and every Contributor for any liability -incurred by the Initial Developer or such Contributor as a result of -warranty, -support, indemnity or liability terms You offer. <a name="3.6"></a></p> - <p><b>3.6. Distribution of Executable Versions.</b> <br> -You may distribute Covered Code in Executable form only if the -requirements -of Section <b>3.1-3.5</b> have been met for that Covered Code, and if -You -include a notice stating that the Source Code version of the Covered -Code -is available under the terms of this License, including a description -of -how and where You have fulfilled the obligations of Section <b>3.2</b>. -The notice must be conspicuously included in any notice in an -Executable -version, related documentation or collateral in which You describe -recipients' -rights relating to the Covered Code. You may distribute the Executable -version of Covered Code or ownership rights under a license of Your -choice, -which may contain terms different from this License, provided that You -are in compliance with the terms of this License and that the license -for -the Executable version does not attempt to limit or alter the -recipient's -rights in the Source Code version from the rights set forth in this -License. -If You distribute the Executable version under a different license You -must make it absolutely clear that any terms which differ from this -License -are offered by You alone, not by the Initial Developer or any -Contributor. -You hereby agree to indemnify the Initial Developer and every -Contributor -for any liability incurred by the Initial Developer or such Contributor -as a result of any such terms You offer. <a name="3.7"></a></p> - <p><b>3.7. Larger Works.</b> <br> -You may create a Larger Work by combining Covered Code with other code -not governed by the terms of this License and distribute the Larger -Work -as a single product. In such a case, You must make sure the -requirements -of this License are fulfilled for the Covered Code.</p> -</ul> -<a name="4"></a> -<b>4. Inability to Comply Due to Statute or Regulation.</b> -<ul> -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Code due to statute, -judicial order, or regulation then You must: (a) comply with the terms -of this License to the maximum extent possible; and (b) describe the -limitations -and the code they affect. Such description must be included in the -LEGAL -file described in Section <b>3.4</b> and must be included with all -distributions -of the Source Code. Except to the extent prohibited by statute or -regulation, -such description must be sufficiently detailed for a recipient of -ordinary -skill to be able to understand it. -</ul> -<a name="5"></a> -<b>5. Application of this License.</b> -<ul> -This License applies to code to which the Initial Developer has -attached -the notice in <b>Exhibit A</b> and to related Covered Code. -</ul> -<a name="6"></a> -<b>6. Versions of the License.</b> -<a name="6.1"></a> -<ul> - <b>6.1. New Versions</b>. <br> -Netscape Communications Corporation (''Netscape'') may publish revised -and/or new versions of the License from time to time. Each version will -be given a distinguishing version number. <a name="6.2"></a> - <p><b>6.2. Effect of New Versions</b>. <br> -Once Covered Code has been published under a particular version of -the License, You may always continue to use it under the terms of that -version. You may also choose to use such Covered Code under the terms -of -any subsequent version of the License published by Netscape. No one -other -than Netscape has the right to modify the terms applicable to Covered -Code -created under this License. <a name="6.3"></a></p> - <p><b>6.3. Derivative Works</b>. <br> -If You create or use a modified version of this License (which you -may only do in order to apply it to code which is not already Covered -Code -governed by this License), You must (a) rename Your license so that the -phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", -''NPL'' -or any confusingly similar phrase do not appear in your license (except -to note that your license differs from this License) and (b) otherwise -make it clear that Your version of the license contains terms which -differ -from the Mozilla Public License and Netscape Public License. (Filling -in -the name of the Initial Developer, Original Code or Contributor in the -notice described in <b>Exhibit A</b> shall not of themselves be deemed -to be modifications of this License.)</p> -</ul> -<a name="7"></a> -<b>7. DISCLAIMER OF WARRANTY.</b> -<ul> -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, -WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, -WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT -FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE -QUALITY -AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED -CODE -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY -OTHER -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR -CORRECTION. -THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS -LICENSE. -NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS -DISCLAIMER. -</ul> -<a name="8"></a> -<b>8. TERMINATION.</b> -<a name="8.1"></a> -<ul> - <b>8.1. </b>This License and the rights granted hereunder will -terminate automatically if You fail to comply with terms herein and -fail -to cure such breach within 30 days of becoming aware of the breach. All -sublicenses to the Covered Code which are properly granted shall -survive -any termination of this License. Provisions which, by their nature, -must -remain in effect beyond the termination of this License shall survive. <a - name="8.2"></a> - <p><b>8.2. </b>If You initiate litigation by asserting a -patent infringement -claim (excluding declatory judgment actions) against Initial Developer -or a Contributor (the Initial Developer or Contributor against whom You -file such action is referred to as "Participant") alleging that: </p> - <p><b>(a) </b>such Participant's Contributor Version directly -or -indirectly infringes any patent, then any and all rights granted by -such -Participant to You under Sections 2.1 and/or 2.2 of this License shall, -upon 60 days notice from Participant terminate prospectively, unless if -within 60 days after receipt of notice You either: (i) agree in -writing -to pay Participant a mutually agreeable reasonable royalty for Your -past -and future use of Modifications made by such Participant, or (ii) -withdraw -Your litigation claim with respect to the Contributor Version against -such -Participant. If within 60 days of notice, a reasonable royalty -and -payment arrangement are not mutually agreed upon in writing by the -parties -or the litigation claim is not withdrawn, the rights granted by -Participant -to You under Sections 2.1 and/or 2.2 automatically terminate at the -expiration -of the 60 day notice period specified above. </p> - <p><b>(b)</b> any software, hardware, or device, other than -such -Participant's Contributor Version, directly or indirectly infringes any -patent, then any rights granted to You by such Participant under -Sections -2.1(b) and 2.2(b) are revoked effective as of the date You first made, -used, sold, distributed, or had made, Modifications made by that -Participant. <a name="8.3"></a></p> - <p><b>8.3. </b>If You assert a patent infringement claim -against -Participant alleging that such Participant's Contributor Version -directly -or indirectly infringes any patent where such claim is resolved (such -as -by license or settlement) prior to the initiation of patent -infringement -litigation, then the reasonable value of the licenses granted by such -Participant -under Sections 2.1 or 2.2 shall be taken into account in determining -the -amount or value of any payment or license. <a name="8.4"></a></p> - <p><b>8.4.</b> In the event of termination under Sections 8.1 -or -8.2 above, all end user license agreements (excluding -distributors -and resellers) which have been validly granted by You or any -distributor -hereunder prior to termination shall survive termination.</p> -</ul> -<a name="9"></a> -<b>9. LIMITATION OF LIABILITY.</b> -<ul> -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT -(INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, -ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY -SUPPLIER -OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, -SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, -WITHOUT -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER -FAILURE -OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN -IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH -DAMAGES. -THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR -PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT -APPLICABLE -LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE -EXCLUSION -OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION -AND LIMITATION MAY NOT APPLY TO YOU. -</ul> -<a name="10"></a> -<b>10. U.S. GOVERNMENT END USERS.</b> -<ul> -The Covered Code is a ''commercial item,'' as that term is defined -in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer -software'' -and ''commercial computer software documentation,'' as such terms are -used -in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and -48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. -Government -End Users acquire Covered Code with only those rights set forth herein. -</ul> -<a name="11"></a> -<b>11. MISCELLANEOUS.</b> -<ul> -This License represents the complete agreement concerning subject -matter -hereof. If any provision of this License is held to be unenforceable, -such -provision shall be reformed only to the extent necessary to make it -enforceable. -This License shall be governed by California law provisions (except to -the extent applicable law, if any, provides otherwise), excluding its -conflict-of-law -provisions. With respect to disputes in which at least one party is a -citizen -of, or an entity chartered or registered to do business in the United -States -of America, any litigation relating to this License shall be subject to -the jurisdiction of the Federal Courts of the Northern District of -California, -with venue lying in Santa Clara County, California, with the losing -party -responsible for costs, including without limitation, court costs and -reasonable -attorneys' fees and expenses. The application of the United Nations -Convention -on Contracts for the International Sale of Goods is expressly excluded. -Any law or regulation which provides that the language of a contract -shall -be construed against the drafter shall not apply to this License. -</ul> -<a name="12"></a> -<b>12. RESPONSIBILITY FOR CLAIMS.</b> -<ul> -As between Initial Developer and the Contributors, each party is -responsible -for claims and damages arising, directly or indirectly, out of its -utilization -of rights under this License and You agree to work with Initial -Developer -and Contributors to distribute such responsibility on an equitable -basis. -Nothing herein is intended or shall be deemed to constitute any -admission -of liability. -</ul> -<a name="13"></a> -<b>13. MULTIPLE-LICENSED CODE.</b> -<ul> -Initial Developer may designate portions of the Covered Code as -“Multiple-Licensed”. -“Multiple-Licensed” means that the Initial Developer permits you to -utilize -portions of the Covered Code under Your choice of the MPL or the -alternative -licenses, if any, specified by the Initial Developer in the file -described -in Exhibit A. -</ul> -<a name="EXHIBIT-A"></a> -<p><br> -<b>EXHIBIT A -Mozilla Public License.</b> -</p> -<ul> -``The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance -with the License. You may obtain a copy of the License at <br> -http://www.mozilla.org/MPL/ - <p>Software distributed under the License is distributed on an "AS -IS" -basis, WITHOUT WARRANTY OF <br> -ANY KIND, either express or implied. See the License for the specific -language governing rights and <br> -limitations under the License. </p> - <p>The Original Code is ______________________________________. </p> - <p>The Initial Developer of the Original Code is -________________________. -Portions created by <br> - ______________________ are Copyright (C) ______ -_______________________. -All Rights <br> -Reserved. </p> - <p>Contributor(s): ______________________________________. </p> - <p>Alternatively, the contents of this file may be used under the -terms -of the _____ license (the “[___] License”), in which case the -provisions -of [______] License are applicable instead of those above. -If you wish to allow use of your version of this file only under the -terms -of the [____] License and not to allow others to use your version of -this -file under the MPL, indicate your decision by deleting the -provisions -above and replace them with the notice and other provisions -required -by the [___] License. If you do not delete the provisions above, -a recipient may use your version of this file under either the MPL or -the -[___] License." </p> - <p>[NOTE: The text of this Exhibit A may differ slightly from the -text -of the notices in the Source Code files of the Original Code. You -should -use the text of this Exhibit A rather than the text found in the -Original -Code Source Code for Your Modifications.] </p> - <p></p> -</ul> -</body> -</html> - <html>
-<head>
-</head>
-<body>
-<hr style="width: 100%; height: 2px;">
-<h2>FSF<br>
-</h2>
-<h3>GNU General Public License<br>
-</h3>
-
-<body>
-<hr style="width: 100%; height: 2px;">
-<br>
-<h4><a name="gpl">GNU GENERAL PUBLIC LICENSE</a></h4>
-<p>
-Version 2, June 1991
-</p>
-
-<pre>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</pre>
-
-<h4>Preamble</h4>
-
-<p>
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
-</p>
-
-<p>
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p>
-
-<p>
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p>
-
-<p>
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-</p>
-
-<p>
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p>
-
-<p>
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p>
-
-<p>
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p>
-
-<p>
- The precise terms and conditions for copying, distribution and
-modification follow.
-
-</p>
-
-
-<h4>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h4>
-
-
-<p>
-<strong>0.</strong>
- This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-</p>
-
-<p>
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p>
-
-<p>
-<strong>1.</strong>
- You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p>
-
-<p>
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p>
-
-<p>
-<strong>2.</strong>
- You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-</p>
-
-<dl>
- <dt></dt>
- <dd>
- <strong>a)</strong>
- You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
- </dd>
- <dt></dt>
- <dd>
-
- <strong>b)</strong>
- You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
- </dd>
- <dt></dt>
- <dd>
- <strong>c)</strong>
- If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
- </dd>
-</dl>
-
-<p>
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p>
-
-<p>
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p>
-
-<p>
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p>
-
-<p>
-<strong>3.</strong>
- You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-</p>
-
-<!-- we use this doubled UL to get the sub-sections indented, -->
-<!-- while making the bullets as unobvious as possible. -->
-
-<dl>
- <dt></dt>
- <dd>
- <strong>a)</strong>
- Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
- </dd>
- <dt></dt>
-
- <dd>
- <strong>b)</strong>
- Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
- </dd>
- <dt></dt>
- <dd>
- <strong>c)</strong>
- Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
- </dd>
-
-</dl>
-
-<p>
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p>
-
-<p>
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p>
-
-<p>
-<strong>4.</strong>
- You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p>
-
-<p>
-<strong>5.</strong>
- You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p>
-
-<p>
-<strong>6.</strong>
- Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p>
-
-<p>
-<strong>7.</strong>
-
- If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p>
-
-<p>
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p>
-
-<p>
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p>
-
-<p>
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p>
-
-<p>
-
-<strong>8.</strong>
- If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p>
-
-<p>
-<strong>9.</strong>
- The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p>
-
-<p>
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p>
-
-<p>
-<strong>10.</strong>
- If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p>
-
-<p><strong>NO WARRANTY</strong></p>
-
-<p>
-<strong>11.</strong>
- BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p>
-
-<p>
-<strong>12.</strong>
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p>
-
-<h4>END OF TERMS AND CONDITIONS</h4>
-</body>
-</html>
- <html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;"> -<h2>FSF<br> -</h2> -<h3>GNU Lesser General Public License<br> -</h3> - -<body> -<hr style="width: 100%; height: 2px;"> -<br> -<a name="lgpl">GNU LESSER GENERAL PUBLIC LICENSE</a> - <br> - Version 2.1, February 1999 - <br> - <br> - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - <br> - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - <br> - -<br> - Preamble - <br> - <br> - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - -<br> - This license, the Lesser General Public License, applies to some +distribution.</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12191_1300998327"></A> +Extensions</H1> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Only third party extensions are listed here whose source code is not +in the LibreOffice tree.</P> +<H2 LANG="en-US" CLASS="western">Barcode</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Barcode</SPAN>. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) Dániel Darabos and Kálmán Szalai</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or (at +your option) any later version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program 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 +General Public License for more details.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU General Public License Version 3|outline">Jump to GPL +Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Convert Text to Number</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Convert +Text to Number</SPAN>. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2008/2009 - Cor Nouws</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Diagram</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Diagram</SPAN>. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Copyright © Tibor Hornyák and OxygenOffice +Professional Team - </SPAN><A HREF="http://ooop.sf.net/">http://ooop.sf.net/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">OpenOffice.org2GoogleDocs - export & +import to Google Docs, Zoho, WebDAV</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: +<SPAN LANG="en-US">OpenOffice.org2GoogleDocs - export & import to +Google Docs, Zoho, WebDAV</SPAN>. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © Przemyslaw Rumik</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Hungarian cross-reference toolbar</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Hungarian +cross-reference toolbar</SPAN>. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2009-2010 (c) László Németh, license: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">LanguageTool Grammar Checker</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">LanguageTool +Grammar Checker</SPAN>. Use of any of this software is governed by +the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Lightproof Grammar Checker</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Lightproof +Grammar Checker</SPAN>. Use of any of this software is governed by +the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2009-2010 (c) László Németh, license: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Numbertext</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Numbertext</SPAN>. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: LGPL/BSD dual-license, 2009-2010 (C) László Németh (nemeth +at openoffice dot org)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Numbertext language data (Soros programs):</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +LGPL/BSD dual-license, 2009-2010 (C) László Németh et al. (see +AUTHORS)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Serbian modules:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +CC/LGPL/BSD tri-license, 2009 (C) Goran Rakić (grakic at devbase dot +net)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Note: for full distribution with specifications, +IDE and JavaScript implementation, see </SPAN><A HREF="http://NUMBERTEXT.org/">http://NUMBERTEXT.org</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Software distributed under the License is distributed on an "AS +IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +implied.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">OpenOffice.org Blogger – +Metaweblog support</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: +<SPAN LANG="en-US">OpenOffice.org Blogger</SPAN>. Use of any of this +software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Copyright © Caolán McNamara (2009) +</SPAN><A HREF="mailto:caolanm@redhat.com">caolanm@redhat.com</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Licensed under LGPLv3 or later.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Solver for Nonlinear Programming</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: zlib. Use of +any of this software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 2009 by Sun Microsystems, Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Typography Toolbar</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Typography +Toolbar</SPAN>. Use of any of this software is governed by the terms +of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2009-2010 (c) László Németh, license: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Validator</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">Validator</SPAN>. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Copyright © Tibor Hornyák and OxygenOffice +Professional Team - </SPAN><A HREF="http://ooop.sf.net/">http://ooop.sf.net/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">WatchWindow</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: <SPAN LANG="en-US">WatchWindow</SPAN>. +Use of any of this software is governed by the terms of the license +below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Copyright © Tibor Hornyák and OxygenOffice +Professional Team - </SPAN><A HREF="http://ooop.sf.net/">http://ooop.sf.net/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="3.GNU GENERAL PUBLIC LICENSE VERSION 2|outline"></A> +Fonts</H1> +<H2 LANG="en-US" CLASS="western">Adobe PostScript® AFM files</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: PostScript® +AFM Files. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Adobe Core 35 AFM Files with 314 Glyph Entries</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This file and the 35 PostScript® AFM files it accompanies may be +used, copied, and distributed for any purpose and without charge, +with or without modification, provided that all copyright notices are +retained; that the AFM files are not distributed without this file; +that all modifications to this file or any of the AFM files are +prominently noted in the modified file(s); and that this paragraph is +not modified. Adobe Systems has no responsibility or obligation to +support the use of the AFM files.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12193_1300998327"></A> +Deja Vu</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Deja Vu +fonts. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Fonts are (c) Bitstream (see below). DejaVu changes are in public +domain. Glyphs imported from Arev fonts are (c) Tavmjong Bah (see +below)</P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12195_1300998327"></A> +Bitstream Vera Fonts Copyright</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to +reproduce and distribute the Font Software, including without +limitation the rights to use, copy, merge, publish, distribute, +and/or sell copies of the Font Software, and to permit persons to +whom the Font Software is furnished to do so, subject to the +following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Font Software may be sold as part of a larger software package +but no copy of one or more of the Font Software typefaces may be sold +by itself.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN +NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, +INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT +SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome +Foundation or Bitstream Inc., respectively. For further information, +contact: fonts at gnome dot org.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12197_1300998327"></A> +Arev Fonts Copyright</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to +reproduce and distribute the modifications to the Bitstream Vera Font +Software, including without limitation the rights to use, copy, +merge, publish, distribute, and/or sell copies of the Font Software, +and to permit persons to whom the Font Software is furnished to do +so, subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Font Software may be sold as part of a larger software package +but no copy of one or more of the Font Software typefaces may be sold +by itself.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN +NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Except as contained in this notice, the name of Tavmjong Bah shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Font Software without prior written +authorization from Tavmjong Bah. For further information, contact: +tavmjong @ free . fr.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12199_1300998327"></A> +Gentium</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Gentium +fonts. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2003-2008 SIL International (<A HREF="http://www.sil.org/">http://www.sil.org/</A>), +with Reserved Font Names "Gentium" and "SIL".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This Font Software is licensed under the SIL Open Font License, +Version 1.1. This license is copied below, and is also available with +a FAQ at: <A HREF="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</A></P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12201_1300998327"></A> +SIL OPEN FONT LICENSE Version 1.1 - 1 February 2007</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of collaborative font projects, to support the +font creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that the font +names of derivative works are changed. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +DEFINITIONS "Font Software" refers to the set of files +released by the Copyright Holder(s) under this license and clearly +marked as such. This may include source files, build scripts and +documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Reserved Font Name" refers to any names specified as such +after the copyright statement(s).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Original Version" refers to the collection of Font +Software components as distributed by the Copyright Holder(s).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Modified Version" refers to any derivative made by adding +to, deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Author" refers to any designer, engineer, programmer, +technical writer or other person who contributed to the Font +Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +PERMISSION & CONDITIONS Permission is hereby granted, free of +charge, to any person obtaining a copy of the Font Software, to use, +study, copy, merge, embed, modify, redistribute, and sell modified +and unmodified copies of the Font Software, subject to the following +conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the +user.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4) The name(s) of the Copyright Holder(s) or the Author(s) of the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +TERMINATION This license becomes null and void if any of the above +conditions are not met.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT +WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER +RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, +INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT +SOFTWARE.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12203_1300998327"></A> +Liberation</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Liberation +fonts. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This font set had been released under GNU Public License version 2 +("GPLv2") with exceptions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU GENERAL PUBLIC LICENSE VERSION 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12205_1300998327"></A> +LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY<BR>LIBERATION FONT +SOFTWARE</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This agreement governs the use of the Software and any updates to the +Software, regardless of the delivery mechanism. Subject to the +following terms, Red Hat, Inc. ("Red Hat") grants to the +user ("Client") a license to this work pursuant to the GNU +General Public License v.2 with the exceptions set forth below and +such other terms as are set forth in this End User License Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. The Software and License Exception. LIBERATION font software (the +"Software") consists of TrueType-OpenType formatted font +software for rendering LIBERATION typefaces in sans-serif, serif, and +monospaced character styles. You are licensed to use, modify, copy, +and distribute the Software pursuant to the GNU General Public +License v.2 with the following exceptions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + (a) As a special exception, if you create a document which uses this +font, and embed this font or unaltered portions of this font into the +document, this font does not by itself cause the resulting document +to be covered by the GNU General Public License. This exception does +not however invalidate any other reasons why the document might be +covered by the GNU General Public License. If you modify this font, +you may extend this exception to your version of the font, but you +are not obligated to do so. If you do not wish to do so, delete this +exception statement from your version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + (b) As a further exception, any distribution of the object code of +the Software in a physical product must provide you the right to +access and modify the source code for the Software and to reinstall +that modified version of the Software in object code form on the same +physical product on which you received it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Intellectual Property Rights. The Software and each of its +components, including the source code, documentation, appearance, +structure and organization are owned by Red Hat and others and are +protected under copyright and other laws. Title to the Software and +any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. +The "LIBERATION" trademark is a trademark of Red Hat, Inc. +in the U.S. and other countries. This agreement does not permit +Client to distribute modified versions of the Software using Red +Hat's trademarks. If Client makes a redistribution of a modified +version of the Software, then Client must modify the files names to +remove any reference to the Red Hat trademarks and must not use the +Red Hat trademarks in any way to reference or promote the modified +Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. Limited Warranty. To the maximum extent permitted under applicable +law, the Software is provided and licensed "as is" without +warranty of any kind, expressed or implied, including the implied +warranties of merchantability, non-infringement or fitness for a +particular purpose. Red Hat does not warrant that the functions +contained in the Software will meet Client's requirements or that the +operation of the Software will be entirely error free or appear +precisely as described in the accompanying documentation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. Limitation of Remedies and Liability. To the maximum extent +permitted by applicable law, Red Hat or any Red Hat authorized dealer +will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the +use or inability to use the Software, even if Red Hat or such dealer +has been advised of the possibility of such damages.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. General. If any provision of this agreement is held to be +unenforceable, that shall not affect the enforceability of the +remaining provisions. This agreement shall be governed by the laws of +the State of North Carolina and of the United States, without regard +to any conflict of laws provisions, except that the United Nations +Convention on the International Sale of Goods shall not apply.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION +is a trademark of Red Hat, Inc.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12207_1300998327"></A> +Linux Libertine G and Linux Biolinum G</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This Font Software is Copyright (c) 2003-2006, Philipp H. Poll +(<A HREF="http://linuxlibertine.sf.net/">http://linuxlibertine.sf.net/</A>).<BR>All +Rights Reserved.<BR><BR>"Linux Libertine" is a Reserved +Font Name for this Font Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Graphite extension of the original Linux Libertine font was made by +Laszlo Nemeth under the same license.<BR><BR>Our fonts are free in +the sense of the GPL. In short: Changing the font is allowed as long +as the derivative work is published under the same license again. +Pedantics keep claiming that the embedded use of GPL-fonts in i.e. +PDFs requires the free publication of the PDF as well. This is why +our GPL contains the so called "font exception".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#3.GNU GENERAL PUBLIC LICENSE VERSION 2|outline">Jump to GPL +version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +As a special exception, if you create a document which uses this +font, and embed this font or unaltered portions of this font into the +document, this font does not by itself cause the resulting document +to be covered by the GNU General Public License. This exception does +not however invalidate any other reasons why the document might be +covered by the GNU General Public License. If you modify this font, +you may extend this exception to your version of the font, but you +are not obligated to do so. If you do not wish to do so, delete this +exception statement from your version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Additionally our fonts are licensed under the Open Fonts License (see +below).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This Font Software is licensed under the SIL Open Font License, +Version 1.0. No modification of the license is permitted, only +verbatim copy is allowed. This license is copied below, and is also +available with a FAQ at: <A HREF="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</A></P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12209_1300998327"></A> +SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of cooperative font projects, to support the +font creation efforts of academic and linguistic communities, and to +provide an open framework in which fonts may be shared and improved +in partnership with others.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and sold with any software provided that the font names +of derivative works are changed. The fonts and derivatives, however, +cannot be released under any other type of license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +DEFINITIONS "Font Software" refers to any and all of the +following: - font files - data files - source code - build +scripts - documentation</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Reserved Font Name" refers to the Font Software name as +seen by users and any other names as specified after the copyright +statement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Standard Version" refers to the collection of Font +Software components as distributed by the Copyright Holder.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Modified Version" refers to any derivative font software +made by adding to, deleting, or substituting -- in part or in whole +-- any of the components of the Standard Version, by changing formats +or by porting the Font Software to a new environment.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Author" refers to any designer, engineer, programmer, +technical writer or other person who contributed to the Font +Software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +PERMISSION & CONDITIONS Permission is hereby granted, free of +charge, to any person obtaining a copy of the Font Software, to use, +study, copy, merge, embed, modify, redistribute, and sell modified +and unmodified copies of the Font Software, subject to the following +conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1) Neither the Font Software nor any of its individual components, in +Standard or Modified Versions, may be sold by itself.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2) Standard or Modified Versions of the Font Software may be bundled, +redistributed and sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the +user.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3) No Modified Version of the Font Software may use the Reserved Font +Name(s), in part or in whole, unless explicit written permission is +granted by the Copyright Holder. This restriction applies to all +references stored in the Font Software, such as the font menu name +and other font description fields, which are used to differentiate +the font from others.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4) The name(s) of the Copyright Holder or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder and the Author(s) or with their explicit written +permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed using this license, and may not be distributed +under any other license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +TERMINATION This license becomes null and void if any of the above +conditions are not met.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT +WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER +RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, +INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT +SOFTWARE.</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12211_1300998327"></A><A NAME="4.GNU GENERAL PUBLIC LICENSE VERSION 2|outline"></A> +Dictionaries</H1> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12213_1300998327"></A> +Afrikaans</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12215_1300998327"></A> +Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Afrikaans +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<H4 LANG="en-US" CLASS="western">Afrikaans Wordlist</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Afrikaans wordlist used by MySpell is made up of multiple +wordlists. These are wither in the public domain, are used with the +authors permission or are licensed under the <A HREF="#3.GNU Lesser General Public License Version 3|outline">LGPL</A>. +The majority of the words are derived from the Nieuwoudt and Viljoen +list.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Nieuwoudt list was first published in this form in 1993 by +Bernard A Nieuwoudt. Contact details: origen at icon co za or +bnieuwoudt at acm org</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1993, 2003 Bernard A Nieuwoudt relicensed under the +<A HREF="#3.GNU Lesser General Public License Version 3|outline">LGPL</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Viljoen list is derived from the original Nieuwoudt list and is +used with permission of the author and relicensed under the <A HREF="#3.GNU Lesser General Public License Version 3|outline">LGPL</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1998 Danie Viljoen</P> +<H4 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12217_1300998327"></A> +MySpell Affix File</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2003 Dwayne Bailey under the <A HREF="#3.GNU Lesser General Public License Version 3|outline">LGPL</A> +based on the original ispell list by Renier de Vos which was released +under the BSD license.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12219_1300998327"></A> +Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Afrikaans +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2005 Friedel Wolff</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This library is free software; you can redistribute it and/or modify +it under the terms of the <A HREF="#3.GNU Lesser General Public License Version 3|outline">GNU +Lesser General Public License</A> as published by the Free Software +Foundation; either version 2.1 of the License, or (at your option) +any later version.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12221_1300998327"></A> +Breton</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Breton +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +LICENSE : "An Drouizig" spelling dictionary : <A HREF="#3.GNU Lesser General Public License Version 3|outline">LGPL</A></P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12223_1300998327"></A> +Catalan</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12225_1300998327"></A> +Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Catalan +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2002-2008 Joan Moratinos <<A HREF="mailto:jmo@softcatala.org">jmo@softcatala.org</A>></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. This program 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.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +See the GNU General Public License for more details. You should have +received a copy of the GNU General Public License along with this +program; if not, write to the Free Software Foundation, Inc., 59 +Temple Place - Suite 330, Boston, MA 02111-1307, USA.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU General Public License Version 3|outline">Jump to GPL +version 3</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Catalan +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU General Public License Version 3|outline">Jump to GPL +version 3</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Catalan +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2009 Joan Montané <joan@montane.cat> --- +Softcatalà</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: GPL/LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU General Public License Version 3|outline">Jump to GPL +version 3</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU Lesser General Public License Version 3|outline">Jump +to LGPL version 3</A></P> +<H2 LANG="en-US" CLASS="western">Czech</H2> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Czech +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, + NLPlab, Faculty of Informatics, Masaryk University</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this data (the "Data"), to deal in the Data +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Data, and to permit persons to whom the Data is +furnished to do so, subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Data.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA.</P> +<H2 LANG="en-US" CLASS="western">Croatian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Croatian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Croatian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These patterns were manually converted from TeX hyphenation patterns +using the guide at +<A HREF="http://wiki.services.openoffice.org/wiki/Documentation/SL/Using_TeX_hyphenation_patterns_in_OpenOffice.org">http://wiki.services.openoffice.org/wiki/Documentation/SL/Using_TeX_hyphenation_patterns_in_OpenOffice.org</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Original version: +<A HREF="http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-hr.pat.txt?revision=416">http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-hr.pat.txt?revision=416</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: OpenOffice.org adaption of this file is licensed under the +GNU LGPL license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Original license text: This file is part of hyph-utf8 package and +resulted from semi-manual conversions of hyphenation patterns into +UTF-8 in June 2008.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Source: hrhyph.tex (1996-04-10) Author: Marinović Igor <migor at +student.math.hr></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above mentioned file should become obsolete, and the author of +the original file should preferably modify this file instead.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Modifications were needed in order to support native UTF-8 engines, +but functionality (hopefully) didn't change in any way, at least not +intentionally. This file is no longer stand-alone; at least for 8-bit +engines you probably want to use loadhyph-foo.tex (which will load +this file) instead.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Modifications were done by Jonathan Kew, Mojca Miklavec & Arthur +Reutenauer with help & support from: - Karl Berry, who gave us +free hands and all resources - Taco Hoekwater, with useful macros - +Hans Hagen, who did the unicodifisation of patterns already long +before and helped with testing, suggestions and bug reports - Norbert +Preining, who tested & integrated patterns into TeX Live</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +However, the "copyright/copyleft" owner of patterns remains +the original author.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The copyright statement of this file is thus:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Do with this file whatever needs to be done in future for the sake of +"a better world" as long as you respect the copyright of +original file. If you're the original author of patterns or taking +over a new revolution, please remove all of the TUG comments & +credits that we added here - you are the Queen / the King, we are +only the servants.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you want to change this file, rather than uploading directly to +CTAN, we would be grateful if you could send it to us +(<A HREF="http://tug.org/tex-hyphen">http://tug.org/tex-hyphen</A>) +or ask for credentials for SVN repository and commit it yourself; we +will then upload the whole "package" to CTAN.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Before a new "pattern-revolution" starts, please try to +follow some guidelines if possible:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +- \lccode is *forbidden*, and I really mean it - all the patterns +should be in UTF-8 - the only "allowed" TeX commands in +this file are: \patterns, \hyphenation, and if you really cannot do +without, also \input and \message - in particular, please no \catcode +or \lccode changes, they belong to loadhyph-foo.tex, and no +\lefthyphenmin and \righthyphenmin, they have no influence here and +belong elsewhere - \begingroup and/or \endinput is not needed - feel +free to do whatever you want inside comments</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We know that TeX is extremely powerful, but give a stupid parser at +least a chance to read your patterns.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For more information see <A HREF="http://tug.org/tex-hyphen">http://tug.org/tex-hyphen</A></P> +<H2 LANG="en-US" CLASS="western">Danish</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Danish +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Stavekontrolden - Danish dictionary files for Hunspell</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Version 1.6 - 2010-09-19</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +da_DK.dic, da_DK.aff: © 2010 Foreningen for frit tilgængelige +sprogværktøjer</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="http://www.stavekontrolden.dk/">http://www.stavekontrolden.dk</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These files are published under the following open source licenses:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#12.GNU General Public License Version 2|outline">GNU GPL + version 2.0</A></P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#10.GNU Lesser General Public License Version 2.1|outline">GNU + LGPL version 2.1</A></P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#13.Mozilla Public License Version 1.1|outline">Mozilla MPL + version 1.1</A></P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This dictionary is based on data from Det Danske Sprog- og +Litteraturselskab</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +(The Danish Society for Language and Literature), <A HREF="http://www.dsl.dk/">http://www.dsl.dk</A>.</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Danish +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Danish +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#12.GNU General Public License Version 2|outline">GNU GPL + version 2.0</A></P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#10.GNU Lesser General Public License Version 2.1|outline">GNU + LGPL version 2.1</A></P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <A HREF="#13.Mozilla Public License Version 1.1|outline">Mozilla MPL + version 1.1</A></P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Stavekontrolden - Danish thesaurus files for OpenOffice.org 3.0.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Den Danske Ordbog - Synonymer</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +DanNet - leksikalsk-semantisk ordnet fra Det Danske Sprog- og +Litteraturselskab og Center for Sprogteknologi, Københavns +Universitet</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +© 2007 Foreningen for frit tilgængelige sprogværktøjer</P> +<H2 LANG="en-US" CLASS="western">Dutch</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary and hyphenation +patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Dutch +spelling dictionary and hyphenation patterns. Use of any of this +software is governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. Name: Dutch word list for spell checking - OpenTaal</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. Version of words list: 2.00G; version of spell checking: 2.00G.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. Requirements: Hunspell 1.2.8 and higher</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. Spelling Seal of Dutch Language Union: The OpenTaal list of lemmas +has received the Spelling Seal of Approval from the Dutch Language +Union, the formal Dutch language institute. For more information +please see: <A HREF="http://www.taalunieversum.org/keurmerk/">http://www.taalunieversum.org/keurmerk/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. Copyrights: © 2006-2010 OpenTaal, © 2001-2005 Simon +Brouwer e.a., © 1996 Nederlandstalige Tex Gebruikersgroep</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. Licenses: OpenTaal aims to create and publish free Dutch language +files. To enable the broadest (re)use the language files are freely +available under the below, liberal licenses at the discretion of the +user. We strongly recommend to read the applicable license before +usage.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + A. BSD (revised version):</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + - Full license text: +<A HREF="http://creativecommons.org/licenses/BSD/legalcode">http://creativecommons.org/licenses/BSD/legalcode</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + - Summary: <A HREF="http://creativecommons.org/licenses/BSD/deed.en">http://creativecommons.org/licenses/BSD/deed.en</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + B. Creative Commons, Attribution 3.0 (unported)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + - Full license text: +<A HREF="http://creativecommons.org/licenses/by/3.0/legalcode">http://creativecommons.org/licenses/by/3.0/legalcode</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + - Summary: <A HREF="http://creativecommons.org/licenses/by/3.0/deed.en">http://creativecommons.org/licenses/by/3.0/deed.en</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +7. Support OpenTaal: OpenTaal is a non-profit volunteer project. With +your (small) financial support OpenTaal will further expand its +activities and enhance its professionalism. Your donation is welcome +at account number: 15.62.32.782, BIC: RABONL2U, IBAN: +NL88RABO0156232782 of Stichting OpenTaal / OpenTaal Foundation. In +the Netherlands your donations are tax deductible. OpenTaal +Foundation has been designated by the Dutch Tax Administration as an +Institution for General Benefit (algemeen nut beogende instelling or +ANBI). Please see: <A HREF="http://belastingdienst.nl/anbi/">http://belastingdienst.nl/anbi/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +8. Participate: Everyone is welcome to participate. Please give +feedback, discuss on the mailing list or run Harvester. By +contributing to the project you agree that your contribution is +available under free or/open source licenses. In case you wish, your +name will be mentioned on the website. Your are invited to send us +your written request.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +9. Rights of third parties: OpenTaal respects the rights of third +parties and aims to keep its data freely available. Therefore you may +no use protected sources of third parties, i.e. dictionaries, without +their permission when you contribute to the project. It is permitted +to use the materials of the Dutch Language Union, i.e. their spelling +instruction and word list. In case you believe OpenTaal is violating +your rights, we ask you to send us a written notice as soon as +possible.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +10.Contact: OpenTaal Foundation, <A HREF="http://www.opentaal.org/">http://www.opentaal.org</A>, +bestuur@opentaal.org</P> +<H2 LANG="en-US" CLASS="western">German</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: German +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: Franz Michael Baumann <frami.baumann@web.de></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: <A HREF="#12.GNU General Public License Version 2|outline">GNU +GPL Version 2</A> or <A HREF="#11.GNU General Public License Version 3|outline">GPL +Version 3</A> or <A HREF="#OASIS distribution license agreement 0.1 from 2005-11-10|outline">OASIS +0.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The "frami"-dictionary contains the complete word list of +Björn Jacke's "igerman98"</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +(Version: 2011-03-21) and numerous supplements by Franz Michael +Baumann according to the reform of 2006-08-01.</P> +<H4 LANG="en-US" CLASS="western"><A NAME="OASIS distribution license agreement 0.1 from 2005-11-10|outline"></A> +OASIS distribution license agreement 0.1 from 2005-11-10</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Without any modifications this dictionary may be distributed with +programs that support the OASIS Open Document Format for Office +Applications and whose PRIMARY format for saving documents is the +Open Document Format.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This requires that all licenses and copyright files are also +distributed together with the package the dictionary is shipped with.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Any modifications of the dictionary files are not allowed for this +agreement, modifications require the use of the GNU GENERAL PUBLIC +LICENSE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you have questions or don't get along with this, send me your +comments/questions/ideas to Bjoern Jacke <bjoern@j3e.de></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.GNU General Public License Version 3|outline">Jump to GPL +version 3</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#12.GNU General Public License Version 2|outline">Jump to +GPL version 2</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: German +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Authors: Marco Huggenberger <marco@by-night.ch> / Daniel Naber +<naber at danielnaber de></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Version: 2011-05-05 (author and license information in source file +added)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: German +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +OpenThesaurus - Deutscher Thesaurus - Synonyme und Assoziationen</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Version: 2011-05-04 AT</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">English (Australia)</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English +(Australia) spelling dictionary. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2006 Cameron Roy</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#12.GNU General Public License Version 2|outline">Jump to +GPL version 2</A></P> +<H2 LANG="en-US" CLASS="western">English (Canada)</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="4.10.1.Spelling dictionary|outline"></A> +Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English +(Canada) spelling dictionary. Use of any of this software is governed +by the terms of the license below:</P> +<PRE LANG="en-US" CLASS="western">Wordlist en_CA spelling and morphological dictionary for OpenOffice.org +<SPAN LANG="en-US">Version 2008-12-18</SPAN> + +<SPAN LANG="en-US">Based on Wordlist Hunspell dictionaries version 2008-12-05</SPAN> +<SPAN LANG="en-US">and Wordlist POS and AGID data created by Kevin Atkinson</SPAN> +<SPAN LANG="en-US">and released on <A HREF="http://wordlist.sourceforge.net/">http://wordlist.sourceforge.net</A>.</SPAN> + +<SPAN LANG="en-US">Other fixes:</SPAN> + +<SPAN LANG="en-US">OOo Issue 48060 - add numbers with affixes by COMPOUNDRULE (1st, 111th, 1990s etc.)</SPAN> +<SPAN LANG="en-US">New REP items (better suggestions for accented words and a few mistakes)</SPAN> +<SPAN LANG="en-US">OOo Issue 63541 - remove *dessicated, *dessication</SPAN> + +<SPAN LANG="en-US">László Németh <nemeth at OO.o></SPAN> + +<SPAN LANG="en-US">Original license:</SPAN> + +<SPAN LANG="en-US">2008-12-05 Release</SPAN> + +<SPAN LANG="en-US">README file for en_US and en_CA Hunspell dictionaries</SPAN> + +<SPAN LANG="en-US">These dictionaries are created using the speller/make-hunspell-dict</SPAN> +<SPAN LANG="en-US">dictionary in SCOWL, SVN revision 74.</SPAN> + +<SPAN LANG="en-US">The NOSUGGEST flag was added to certain taboo words. While I made an</SPAN> +<SPAN LANG="en-US">honest attempt to flag the strongest taboo words with the NOSUGGEST</SPAN> +<SPAN LANG="en-US">flag, I MAKE NO GUARANTEE THAT I FLAGGED EVERY POSSIBLE TABOO WORD.</SPAN> +<SPAN LANG="en-US">The list was originally derived from Németh László, however I removed</SPAN> +<SPAN LANG="en-US">some words which, while being considered taboo by some dictionaries,</SPAN> +<SPAN LANG="en-US">are not really considered swear words in today's society.</SPAN> + +<SPAN LANG="en-US">You can find SCOWL and friend at <A HREF="http://wordlist.sourceforge.net/">http://wordlist.sourceforge.net/</A>.</SPAN> +<SPAN LANG="en-US">Bug reports should go to the Issue Tracker found on the previously</SPAN> +<SPAN LANG="en-US">mentioned web site. General discussion should go to the</SPAN> +<SPAN LANG="en-US">wordlist-devel at sourceforge net mailing list.</SPAN> + +<SPAN LANG="en-US">COPYRIGHT, SOURCES, and CREDITS:</SPAN> + +<SPAN LANG="en-US">The en_US and en_CA dictionaries come directly from SCOWL (up to level</SPAN> +<SPAN LANG="en-US">60) and is thus under the same copyright of SCOWL. The affix file is</SPAN> +<SPAN LANG="en-US">a heavily modified version of the original english.aff file which was</SPAN> +<SPAN LANG="en-US">released as part of Geoff Kuenning's Ispell and as such is covered by</SPAN> +<SPAN LANG="en-US">his BSD license. Part of SCOWL is also based on Ispell thus the</SPAN> +<SPAN LANG="en-US">Ispell copyright is included with the SCOWL copyright.</SPAN> + +<SPAN LANG="en-US">The collective work is Copyright 2000-2007 by Kevin Atkinson as well</SPAN> +<SPAN LANG="en-US">as any of the copyrights mentioned below:</SPAN> + + <SPAN LANG="en-US">Copyright 2000-2007 by Kevin Atkinson</SPAN> + + <SPAN LANG="en-US">Permission to use, copy, modify, distribute and sell these word</SPAN> + <SPAN LANG="en-US">lists, the associated scripts, the output created from the scripts,</SPAN> + <SPAN LANG="en-US">and its documentation for any purpose is hereby granted without fee,</SPAN> + <SPAN LANG="en-US">provided that the above copyright notice appears in all copies and</SPAN> + <SPAN LANG="en-US">that both that copyright notice and this permission notice appear in</SPAN> + <SPAN LANG="en-US">supporting documentation. Kevin Atkinson makes no representations</SPAN> + <SPAN LANG="en-US">about the suitability of this array for any purpose. It is provided</SPAN> + <SPAN LANG="en-US">"as is" without express or implied warranty.</SPAN> + +<SPAN LANG="en-US">Alan Beale <biljir@pobox.com> also deserves special credit as he has,</SPAN> +<SPAN LANG="en-US">in addition to providing the 12Dicts package and being a major</SPAN> +<SPAN LANG="en-US">contributor to the ENABLE word list, given me an incredible amount of</SPAN> +<SPAN LANG="en-US">feedback and created a number of special lists (those found in the</SPAN> +<SPAN LANG="en-US">Supplement) in order to help improve the overall quality of SCOWL.</SPAN> + +<SPAN LANG="en-US">The 10 level includes the 1000 most common English words (according to</SPAN> +<SPAN LANG="en-US">the Moby (TM) Words II [MWords] package), a subset of the 1000 most</SPAN> +<SPAN LANG="en-US">common words on the Internet (again, according to Moby Words II), and</SPAN> +<SPAN LANG="en-US">frequently class 16 from Brian Kelk's "UK English Wordlist</SPAN> +<SPAN LANG="en-US">with Frequency Classification".</SPAN> + +<SPAN LANG="en-US">The MWords package was explicitly placed in the public domain:</SPAN> + + <SPAN LANG="en-US">The Moby lexicon project is complete and has</SPAN> + <SPAN LANG="en-US">been place into the public domain. Use, sell,</SPAN> + <SPAN LANG="en-US">rework, excerpt and use in any way on any platform.</SPAN> + + <SPAN LANG="en-US">Placing this material on internal or public servers is</SPAN> + <SPAN LANG="en-US">also encouraged. The compiler is not aware of any</SPAN> + <SPAN LANG="en-US">export restrictions so freely distribute world-wide.</SPAN> + + <SPAN LANG="en-US">You can verify the public domain status by contacting</SPAN> + + <SPAN LANG="en-US">Grady Ward</SPAN> + <SPAN LANG="en-US">3449 Martha Ct.</SPAN> + <SPAN LANG="en-US">Arcata, CA 95521-4884</SPAN> + + <SPAN LANG="en-US">grady@netcom.com</SPAN> + <SPAN LANG="en-US">grady@northcoast.com</SPAN> + +<SPAN LANG="en-US">The "UK English Wordlist With Frequency Classification" is also in the</SPAN> +<SPAN LANG="en-US">Public Domain:</SPAN> + + <SPAN LANG="en-US">Date: Sat, 08 Jul 2000 20:27:21 +0100</SPAN> + <SPAN LANG="en-US">From: Brian Kelk <Brian.Kelk@cl.cam.ac.uk></SPAN> + + <SPAN LANG="en-US">> I was wondering what the copyright status of your "UK English</SPAN> + <SPAN LANG="en-US">> Wordlist With Frequency Classification" word list as it seems to</SPAN> + <SPAN LANG="en-US">> be lacking any copyright notice.</SPAN> + + <SPAN LANG="en-US">There were many many sources in total, but any text marked</SPAN> + <SPAN LANG="en-US">"copyright" was avoided. Locally-written documentation was one</SPAN> + <SPAN LANG="en-US">source. An earlier version of the list resided in a filespace called</SPAN> + <SPAN LANG="en-US">PUBLIC on the University mainframe, because it was considered public</SPAN> + <SPAN LANG="en-US">domain.</SPAN> + + <SPAN LANG="en-US">Date: Tue, 11 Jul 2000 19:31:34 +0100</SPAN> + + <SPAN LANG="en-US">> So are you saying your word list is also in the public domain?</SPAN> + + <SPAN LANG="en-US">That is the intention.</SPAN> + +<SPAN LANG="en-US">The 20 level includes frequency classes 7-15 from Brian's word list.</SPAN> + +<SPAN LANG="en-US">The 35 level includes frequency classes 2-6 and words appearing in at</SPAN> +<SPAN LANG="en-US">least 11 of 12 dictionaries as indicated in the 12Dicts package. All</SPAN> +<SPAN LANG="en-US">words from the 12Dicts package have had likely inflections added via</SPAN> +<SPAN LANG="en-US">my inflection database.</SPAN> + +<SPAN LANG="en-US">The 12Dicts package and Supplement is in the Public Domain.</SPAN> + +<SPAN LANG="en-US">The WordNet database, which was used in the creation of the</SPAN> +<SPAN LANG="en-US">Inflections database, is under the following copyright:</SPAN> + + <SPAN LANG="en-US">This software and database is being provided to you, the LICENSEE,</SPAN> + <SPAN LANG="en-US">by Princeton University under the following license. By obtaining,</SPAN> + <SPAN LANG="en-US">using and/or copying this software and database, you agree that you</SPAN> + <SPAN LANG="en-US">have read, understood, and will comply with these terms and</SPAN> + <SPAN LANG="en-US">conditions.:</SPAN> + + <SPAN LANG="en-US">Permission to use, copy, modify and distribute this software and</SPAN> + <SPAN LANG="en-US">database and its documentation for any purpose and without fee or</SPAN> + <SPAN LANG="en-US">royalty is hereby granted, provided that you agree to comply with</SPAN> + <SPAN LANG="en-US">the following copyright notice and statements, including the</SPAN> + <SPAN LANG="en-US">disclaimer, and that the same appear on ALL copies of the software,</SPAN> + <SPAN LANG="en-US">database and documentation, including modifications that you make</SPAN> + <SPAN LANG="en-US">for internal use or for distribution.</SPAN> + + <SPAN LANG="en-US">WordNet 1.6 Copyright 1997 by Princeton University. All rights</SPAN> + <SPAN LANG="en-US">reserved.</SPAN> + + <SPAN LANG="en-US">THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON</SPAN> + <SPAN LANG="en-US">UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR</SPAN> + <SPAN LANG="en-US">IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON</SPAN> + <SPAN LANG="en-US">UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT-</SPAN> + <SPAN LANG="en-US">ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE</SPAN> + <SPAN LANG="en-US">LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY</SPAN> + <SPAN LANG="en-US">THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</SPAN> + + <SPAN LANG="en-US">The name of Princeton University or Princeton may not be used in</SPAN> + <SPAN LANG="en-US">advertising or publicity pertaining to distribution of the software</SPAN> + <SPAN LANG="en-US">and/or database. Title to copyright in this software, database and</SPAN> + <SPAN LANG="en-US">any associated documentation shall at all times remain with</SPAN> + <SPAN LANG="en-US">Princeton University and LICENSEE agrees to preserve same.</SPAN> + +<SPAN LANG="en-US">The 40 level includes words from Alan's 3esl list found in version 4.0</SPAN> +<SPAN LANG="en-US">of his 12dicts package. Like his other stuff the 3esl list is also in the</SPAN> +<SPAN LANG="en-US">public domain.</SPAN> + +<SPAN LANG="en-US">The 50 level includes Brian's frequency class 1, words words appearing</SPAN> +<SPAN LANG="en-US">in at least 5 of 12 of the dictionaries as indicated in the 12Dicts</SPAN> +<SPAN LANG="en-US">package, and uppercase words in at least 4 of the previous 12</SPAN> +<SPAN LANG="en-US">dictionaries. A decent number of proper names is also included: The</SPAN> +<SPAN LANG="en-US">top 1000 male, female, and Last names from the 1990 Census report; a</SPAN> +<SPAN LANG="en-US">list of names sent to me by Alan Beale; and a few names that I added</SPAN> +<SPAN LANG="en-US">myself. Finally a small list of abbreviations not commonly found in</SPAN> +<SPAN LANG="en-US">other word lists is included.</SPAN> + +<SPAN LANG="en-US">The name files form the Census report is a government document which I</SPAN> +<SPAN LANG="en-US">don't think can be copyrighted.</SPAN> + +<SPAN LANG="en-US">The file special-jargon.50 uses common.lst and word.lst from the</SPAN> +<SPAN LANG="en-US">"Unofficial Jargon File Word Lists" which is derived from "The Jargon</SPAN> +<SPAN LANG="en-US">File". All of which is in the Public Domain. This file also contain</SPAN> +<SPAN LANG="en-US">a few extra UNIX terms which are found in the file "unix-terms" in the</SPAN> +<SPAN LANG="en-US">special/ directory.</SPAN> + +<SPAN LANG="en-US">The 55 level includes words from Alan's 2of4brif list found in version</SPAN> +<SPAN LANG="en-US">4.0 of his 12dicts package. Like his other stuff the 2of4brif is also</SPAN> +<SPAN LANG="en-US">in the public domain.</SPAN> + +<SPAN LANG="en-US">The 60 level includes Brian's frequency class 0 and all words</SPAN> +<SPAN LANG="en-US">appearing in at least 2 of the 12 dictionaries as indicated by the</SPAN> +<SPAN LANG="en-US">12Dicts package. A large number of names are also included: The 4,946</SPAN> +<SPAN LANG="en-US">female names and the 3,897 male names from the MWords package.</SPAN> + +<SPAN LANG="en-US">The 70 level includes the 74,550 common dictionary words and the</SPAN> +<SPAN LANG="en-US">21,986 names list from the MWords package The common dictionary words,</SPAN> +<SPAN LANG="en-US">like those from the 12Dicts package, have had all likely inflections</SPAN> +<SPAN LANG="en-US">added. The 70 level also included the 5desk list from version 4.0 of</SPAN> +<SPAN LANG="en-US">the 12Dics package which is the public domain</SPAN> + +<SPAN LANG="en-US">The 80 level includes the ENABLE word list, all the lists in the</SPAN> +<SPAN LANG="en-US">ENABLE supplement package (except for ABLE), the "UK Advanced Cryptics</SPAN> +<SPAN LANG="en-US">Dictionary" (UKACD), the list of signature words in from YAWL package,</SPAN> +<SPAN LANG="en-US">and the 10,196 places list from the MWords package.</SPAN> + +<SPAN LANG="en-US">The ENABLE package, mainted by M\Cooper <thegrendel@theriver.com>,</SPAN> +<SPAN LANG="en-US">is in the Public Domain:</SPAN> + + <SPAN LANG="en-US">The ENABLE master word list, WORD.LST, is herewith formally released</SPAN> + <SPAN LANG="en-US">into the Public Domain. Anyone is free to use it or distribute it in</SPAN> + <SPAN LANG="en-US">any manner they see fit. No fee or registration is required for its</SPAN> + <SPAN LANG="en-US">use nor are "contributions" solicited (if you feel you absolutely</SPAN> + <SPAN LANG="en-US">must contribute something for your own peace of mind, the authors of</SPAN> + <SPAN LANG="en-US">the ENABLE list ask that you make a donation on their behalf to your</SPAN> + <SPAN LANG="en-US">favorite charity). This word list is our gift to the Scrabble</SPAN> + <SPAN LANG="en-US">community, as an alternate to "official" word lists. Game designers</SPAN> + <SPAN LANG="en-US">may feel free to incorporate the WORD.LST into their games. Please</SPAN> + <SPAN LANG="en-US">mention the source and credit us as originators of the list. Note</SPAN> + <SPAN LANG="en-US">that if you, as a game designer, use the WORD.LST in your product,</SPAN> + <SPAN LANG="en-US">you may still copyright and protect your product, but you may *not*</SPAN> + <SPAN LANG="en-US">legally copyright or in any way restrict redistribution of the</SPAN> + <SPAN LANG="en-US">WORD.LST portion of your product. This *may* under law restrict your</SPAN> + <SPAN LANG="en-US">rights to restrict your users' rights, but that is only fair.</SPAN> + +<SPAN LANG="en-US">UKACD, by J Ross Beresford <ross@bryson.demon.co.uk>, is under the</SPAN> +<SPAN LANG="en-US">following copyright:</SPAN> + + <SPAN LANG="en-US">Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved.</SPAN> + + <SPAN LANG="en-US">The following restriction is placed on the use of this publication:</SPAN> + <SPAN LANG="en-US">if The UK Advanced Cryptics Dictionary is used in a software package</SPAN> + <SPAN LANG="en-US">or redistributed in any form, the copyright notice must be</SPAN> + <SPAN LANG="en-US">prominently displayed and the text of this document must be included</SPAN> + <SPAN LANG="en-US">verbatim.</SPAN> + + <SPAN LANG="en-US">There are no other restrictions: I would like to see the list</SPAN> + <SPAN LANG="en-US">distributed as widely as possible.</SPAN> + +<SPAN LANG="en-US">The 95 level includes the 354,984 single words and 256,772 compound</SPAN> +<SPAN LANG="en-US">words from the MWords package, ABLE.LST from the ENABLE Supplement,</SPAN> +<SPAN LANG="en-US">and some additional words found in my part-of-speech database that</SPAN> +<SPAN LANG="en-US">were not found anywhere else.</SPAN> + +<SPAN LANG="en-US">Accent information was taken from UKACD.</SPAN> + +<SPAN LANG="en-US">My VARCON package was used to create the American, British, and</SPAN> +<SPAN LANG="en-US">Canadian word list.</SPAN> + +<SPAN LANG="en-US">Since the original word lists used used in the VARCON package came</SPAN> +<SPAN LANG="en-US">from the Ispell distribution they are under the Ispell copyright:</SPAN> + + <SPAN LANG="en-US">Copyright 1993, Geoff Kuenning, Granada Hills, CA</SPAN> + <SPAN LANG="en-US">All rights reserved.</SPAN> + + <SPAN LANG="en-US">Redistribution and use in source and binary forms, with or without</SPAN> + <SPAN LANG="en-US">modification, are permitted provided that the following conditions</SPAN> + <SPAN LANG="en-US">are met:</SPAN> + + <SPAN LANG="en-US">1. Redistribution of source code must retain the above copyright</SPAN> + <SPAN LANG="en-US">notice, this list of conditions and the following disclaimer.</SPAN> + <SPAN LANG="en-US">2. Redistribution in binary form must reproduce the above copyright</SPAN> + <SPAN LANG="en-US">notice, this list of conditions and the following disclaimer in the</SPAN> + <SPAN LANG="en-US">documentation and/or other materials provided with the distribution.</SPAN> + <SPAN LANG="en-US">3. All modifications to the source code must be clearly marked as</SPAN> + <SPAN LANG="en-US">such. Binary redistribution based on modified source code</SPAN> + <SPAN LANG="en-US">must be clearly marked as modified versions in the documentation</SPAN> + <SPAN LANG="en-US">and/or other materials provided with the distribution.</SPAN> + <SPAN LANG="en-US">(clause 4 removed with permission from Geoff Kuenning)</SPAN> + <SPAN LANG="en-US">5. The name of Geoff Kuenning may not be used to endorse or promote</SPAN> + <SPAN LANG="en-US">products derived from this software without specific prior</SPAN> + <SPAN LANG="en-US">written permission.</SPAN> + + <SPAN LANG="en-US">THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS</SPAN> + <SPAN LANG="en-US">IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</SPAN> + <SPAN LANG="en-US">LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS</SPAN> + <SPAN LANG="en-US">FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEOFF</SPAN> + <SPAN LANG="en-US">KUENNING OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,</SPAN> + <SPAN LANG="en-US">INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,</SPAN> + <SPAN LANG="en-US">BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</SPAN> + <SPAN LANG="en-US">LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</SPAN> + <SPAN LANG="en-US">CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</SPAN> + <SPAN LANG="en-US">LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN</SPAN> + <SPAN LANG="en-US">ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</SPAN> + <SPAN LANG="en-US">POSSIBILITY OF SUCH DAMAGE.</SPAN></PRE><H2 LANG="en-US" CLASS="western"> +English (South Africa)</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English +(South Africa) spelling dictionary. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">English (United Kingdom)</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English +(United Kingdom) spelling dictionary. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English +(United Kingdom) hyphenation patterns. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +BSD-style. Unlimited copying, redistribution and modification of this +file is permitted with this copyright and license information.</P> +<H2 LANG="en-US" CLASS="western">English (USA)</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English (USA) +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#4.10.1.Spelling dictionary|outline">See English (Canada)</A>.</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English (USA) +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +BSD-style. Unlimited copying, redistribution and modification of this +file<BR>is permitted with this copyright and license information.</P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: English (USA) +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +WordNet Release 2.1</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This software and database is being provided to you, the LICENSEE, by +Princeton University under the following license. By obtaining, using +and/or copying this software and database, you agree that you have +read, understood, and will comply with these terms and conditions.:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, modify and distribute this software and +database and its documentation for any purpose and without fee or +royalty is hereby granted, provided that you agree to comply with the +following copyright notice and statements, including the disclaimer, +and that the same appear on ALL copies of the software, database and +documentation, including modifications that you make for internal use +or for distribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +WordNet 2.1 Copyright 2005 by Princeton University. All rights +reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND +PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS +OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON +UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- +ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY +THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The name of Princeton University or Princeton may not be used in +advertising or publicity pertaining to distribution of the software +and/or database. Title to copyright in this software, database and +any associated documentation shall at all times remain with Princeton +University and LICENSEE agrees to preserve same.</P> +<H2 LANG="en-US" CLASS="western">Estonian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Estonian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Dictionary is adapted to myspell by Jaak Pruulmann (jjpp@meso.ee, +<A HREF="http://www.meso.ee/~jjpp/speller/">http://www.meso.ee/~jjpp/speller/</A> +) on the base of word list created and shared by IEL (Institute of +the Estonian Language, tarkvara@eki.ee). The original of EKI software +license is available at <A HREF="http://www.eki.ee/eki/licence.html">http://www.eki.ee/eki/licence.html</A>. +The work of Jaak Pruulmann is licensed under LGPL (GNU Lesser General +Public License). The copies of licenses are added to current file. +IEL is informed about the use of this word list.</P> +<H4 LANG="en-US" CLASS="western">Software License Agreement</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Institute of the Estonian Language</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © Institute of the Estonian Language</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +E-mail: tarkvara@eki.ee</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +URL: <A HREF="http://www.eki.ee/tarkvara/">http://www.eki.ee/tarkvara/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The present License Agreement gives the user of this Software Product +(hereinafter: Product) the right to use the Product for whatever +purpose (incl. distribution, copying, altering, inclusion in other +software, and selling) on the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The present License Agreement should belong unaltered to each copy +ever made of this Product;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Neither the Institute of the Estonian Language (hereinafter: IEL) nor +the author(s) of the Product will take responsibility for any +detriment, direct or indirect, possibly ensuing from the application +of the Product;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The IEL is ready to share the Product with other users as we wish to +advance research on the Estonian language and to promote the use of +Estonian in IT-technology now rapidly developing, yet we refuse to +bind ourselves to any further obligation, which means that the IEL is +not obliged either to warrant the suitability of the Product for a +concrete use, to improve the program, or to provide a more detailed +description of the underlying algorithms. (Which does not mean, +though, that we may not do it.)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Whenever you use the Product, we request that you inform us by +writing to the e-mail address tarkvara@eki.ee or to street address +listed below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Institute of the Estonian Language</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Roosikrantsi 6<BR>EE-10119 Tallinn<BR>ESTONIA</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +E-mail: eki@eki.ee<BR>Phone & Fax: +372-6411443</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Estonian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Hyphenation file is adapted to OpenOffice.org by Jaak Pruulmann +(jjpp@meso.ee, <A HREF="http://www.meso.ee/~jjpp/speller/">http://www.meso.ee/~jjpp/speller/</A>) +on the base of the LaTeX hyphenation file created by Enn Saar +(saar@aai.ee), who has signed the JCA (Joint Copyright Agreement) +allowing to use his work for OpenOffice.org. The original file is +available at address <A HREF="http://www.cs.ut.ee/~tqnu/eehyph.tex">http://www.cs.ut.ee/~tqnu/eehyph.tex</A> +and in the heading of the file it is written that this file is +licensed under LPPL. The work of Jaak Pruulmann is licensed under +LGPL (GNU Lesser General Public License).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#15.The LaTeX Project Public License|outline">Jump to LPPL</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">French</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: French +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Olivier R. - dicollecte<at>free<dot>fr</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Dicollecte: <A HREF="http://www.dicollecte.org/">http://www.dicollecte.org/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Licenses:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + MPL: <A HREF="#13.Mozilla Public License Version 1.1|outline">Mozilla + Public License version 1.1</A> or higher</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + GPL: <A HREF="#12.GNU General Public License Version 2|outline">GNU + General Public License version 2.0</A> or higher</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + LGPL: <A HREF="#10.GNU Lesser General Public License Version 2.1|outline">GNU + Lesser General Public License version 2.1</A> or higher</P> +</UL> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: French +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Origin: Based on the TeX hyphenation tables frhyph.tex (V2.12) +<2002/12/11> +<A HREF="http://mirror.ctan.org/language/hyphenation/frhyph.tex">http://mirror.ctan.org/language/hyphenation/frhyph.tex</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The TeX hyphenation tables are released under the LaTeX Project +Public License (LPPL)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#15.The LaTeX Project Public License|outline">Jump to LPPL</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: OpenOffice.org adaptions of this package are licensed under +the GNU Lesser General Public License (LGPL) version 2.1 or higher.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: Conversion author is Paul Pichaureau +<paul.pichaureau@alcandre.net></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Based on a previous conversion by Blaise Drayer <blaise@drayer.ch></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: French +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Licence: LGPL: GNU Lesser General Public License version 2.1 or +higher.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Galician</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Galician +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This extension was made by Frco. Javier Rial RodrÃguez for Mancomún, +Centro de Referencia e Servizos de Software Libre 2008</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Spellchecker files (gl_ES.aff, gl_ES.dic) from Mar Castro Pereiro +also developed for Mancomún.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Distributed under the GPL License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.GNU General Public License Version 3|outline">Jump to +GPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Hebrew</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hebrew +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This dictionary is Copyright (C) 2000-2009, Nadav Har'El +(nyh@math.technion.ac.il) and Dan Kenigsberg +(<A HREF="mailto:danken@cs.technion.ac.il">danken@cs.technion.ac.il</A>).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +It is licensed under the GNU General Public License (GPL).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.GNU General Public License Version 3|outline">Jump to +GPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Hungarian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hungarian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GPL 2.0/LGPL 2.1/MPL 1.1 tri-license</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The contents of this software may be used under the terms of the GNU +General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the +"LGPL", see COPYING.LGPL) or (excepting the LGPLed GNU +gettext library in the intl/ directory) the Mozilla Public License +Version 1.1 or later (the "MPL", see COPYING.MPL).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Software distributed under these licenses is distributed on an "AS +IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +implied. See the licences for the specific language governing rights +and limitations under the licenses.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2010 (c) László Németh & Ferenc Godó</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hungarian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © Bence Nagy <gimb (at) freemail (dot) hu>, 2006</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Original license: GPL v2</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Patch author: László Németh <nemeth (at) OOo></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Patch license: MPL/GPL/LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Hungarian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2009, László Németh</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">Italian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Italian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2001, 2002 Gianluca Turconi<BR>Copyright (C) 2002, +2003, 2004 Gianluca Turconi and Davide Prina<BR>Copyright (C) 2004, +2005, 2006, 2007 Davide Prina<BR>Copyright (C) 2010 Andrea Pescetti</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.GNU General Public License Version 3|outline">Jump to +GPL Version 3</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Italian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Origin: Based on the TeX hyphenation tables by Claudio Beccari</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: conversion author is Giuseppe Bilotta +<<A HREF="mailto:giuseppe.bilotta@gmail.com">giuseppe.bilotta@gmail.com</A>></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Italian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2004,2005,2006,2007,2008 Daniela Volta<BR>Copyright (C) +2008 Giovanni Zuliani<BR>Copyright (C) 2006,2007,2008 Davide +Prina<BR>Copyright (C) 2010 Andrea Pescetti</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.GNU General Public License Version 3|outline">Jump to +GPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Kurdish</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Kurdish +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +(C) Copyright Reimar Heider <hunspell at ferheng dot org></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +With contributions from Kevin P. Scannell <scannell@slu.edu> +and Rêzan Tovjîn</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The original word list used for this package was augmented using +Kevin Scannell's web crawling software "An Crúbadán" and +then hand-checked by Ronahi and Tovjîn.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Originally GPL, relicensed on 04-07-2007 to GPLv3, LGPLv3, MPL 1.1</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#11.GNU General Public License Version 3|outline">Jump to +GPL Version 3</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">Lithuanian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Lithuanian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) Albertas Agejevas <alga@uosis.mif.vu.lt>, 2000, +2001. All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Neither the name of the Albertas Agejevas nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS +IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS +AGEJEVAS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Lithuanian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Origin: TeX hyphenation tables by Sigitas Tolusis and Vytas +Statulevicius. The original tables can be found at +<A HREF="http://www.vtex.lt/tex/download/zip/texmf.zip">http://www.vtex.lt/tex/download/zip/texmf.zip</A> + as lthyphen.tex.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: Converted to OOo format by Albertas Agejevas <alga@akl.lt></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: LaTeX Project Public Licence</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#15.The LaTeX Project Public License|outline">Jump to LPPL</A></P> +<H2 LANG="en-US" CLASS="western">Nepali</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Nepali +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Compiled by Madan Puraskar Pustakalaya</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Nepali +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Compiled by Madan Puraskar Pustakalaya</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Norwegian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Norwegian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Norwegian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Norwegian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">Occitan</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Occitan +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2006 Bruno GALLART</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">Polish</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Polish +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This dictionary for spell-checking Polish texts is licensed under +GPL, LGPL, MPL (Mozilla Public License) and Creative Commons +ShareAlike licenses (see <A HREF="http://creativecommons.org/licenses/sa/1.0">http://creativecommons.org/licenses/sa/1.0</A>).</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Polish +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Origin: Based on the TeX hyphenation patterns plhyph.tex, version +3.0a, Wednesday, May 17th, 1995. The original file is in CTAN +archives, for example +here:<A HREF="http://ctan.binkerton.com/ctan.readme.php?filename=language/polish/plhyph.tex">http://ctan.binkerton.com/ctan.readme.php?filename=language/polish/plhyph.tex</A> +and is licensed under LPPL.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: OpenOffice.org Adaptions of this package are licensed under +the GNU LGPL license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: conversion and corrects author is Artur PolaczyÅ„ski +<artiip@gmail.com></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Polish +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2004-2008 Marcin MiÅ‚kowski +<<A HREF="mailto:milek_pl@users.sourceforge.net">milek_pl@users.sourceforge.net</A>></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This product is made available subject to the terms of GNU Lesser +General Public License Version 2.1.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Portoguise (Brazil)</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Portoguise +(Brazilian) spelling dictionary. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This dictionary is under development by Raimundo Moura and his team. +It is licensed under the terms of the GNU Lesser General Public +License version 2.1 (LGPLv2.1), as published by the Free Software +Foundation. The credits are available at +<A HREF="http://www.broffice.org/creditos">http://www.broffice.org/creditos</A> +and you can find new releases at +<A HREF="http://www.broffice.org/verortografico">http://www.broffice.org/verortografico</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2006 - 2008 by Raimundo Santos Moura +<raimundomoura@openoffice.org></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Portoguise +(Brazilian) hyphenation patterns. Use of any of this software is +governed by the terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These hyphenation patterns are under development by Raimundo Moura +and his team. It is licensed under the terms of the GNU Lesser +General Public License version 2.1 (LGPLv2.1), as published by the +Free Software Foundation. The credits are available at +<A HREF="http://www.broffice.org/creditos">http://www.broffice.org/creditos</A> +and you can find new releases at +<A HREF="http://www.broffice.org/verortografico">http://www.broffice.org/verortografico</A>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2008 - 2009 by Raimundo Santos Moura +<raimundomoura@openoffice.org></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Romanian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Romanian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GPL 2.0/LGPL 2.1/MPL 1.1 tri-license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Romanian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GNU General Public License Version 2</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Romanian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +GNU General Public License Version 2 or later</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">Russian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Russian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 1997-2008, Alexander I. Lebedev</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All rights reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Modified versions must be clearly marked as such.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The name of Alexander I. Lebedev may not be used to endorse or + promote products derived from this software without specific prior + written permission.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Russian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +unknown</P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Russian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: GNU LGPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Author: Mikhail Korolyov <mkorolyov@yandex.ru></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Origin: Абрамовъ, Н. +Словарь русскихъ +синонимовъ +и сходныхъ по +смыслу выраженiй. +Изд. 3-е, доп., Пг., +1911</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<BR><BR> +</P> +<H2 LANG="en-US" CLASS="western">Serbian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Serbian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Serbian spellcheck dictionary (files sr.dic, sr.aff, sh.dic, sh.aff) +is released under disjunctive tri-licence GNU LGPL version 2.1 or +later / MPL version 1.1 or later / GNU GPL version 2 or later giving +you the choice of one of the three sets of free software licensing +terms. You can also use the dictionary under the terms of the +Creative Commons BY-SA 3.0 Unpored licence.</P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Serbian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Serbian hyphenation patterns (files hyph_sr.dic and hyph_sh.dic) are +derived from the official TeX patterns for Serbocroatian language +(Cyrillic and Latin) created by Dejan Muhamedagić +<dejan@hello-penguin.com> version 2.02 released on 22 June +2008. The format is adopted for usage with Hyphen hyphenation library +and is released again as hyphen-sr under the compatible GNU LGPL +version 2.1 or later.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Slovak</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovak +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Data are released under these licenses (you can select one):</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The GNU General Public License (GPL) Version 2, June 1991</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + GNU Lesser General Public License Version 2.1, February 1999</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Mozilla Public License 1.1 (MPL 1.1)</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovak +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Dictionary is created by converting TeX hyphenation patterns for +Slovak (Author: Jana ChlebÃková) with lingucomponent-tools +(<A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/oo-cs/lingucomponent-tools/">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/oo-cs/lingucomponent-tools/</A>).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Original license: LPPL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#15.The LaTeX Project Public License|outline">Jump to LPPL</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovak +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (c) 2004-2010 Tibor Bako, yorik (at) szm.sk, Zdenko +Podobný, zposter (at) gmail.com</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is hereby granted, free of charge, to any person obtaining +a copy of this data (the "Data"), to deal in the Data +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Data, and to permit persons to whom the Data is +furnished to do so, subject to the following conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Data.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA.</P> +<H2 LANG="en-US" CLASS="western">Slovenian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovenian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovenian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Slovenian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Spanish</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Spanish +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#9.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> +<H2 LANG="en-US" CLASS="western">Swahili</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Swahili +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2004 Jason M Githeko</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Swedish</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Swedish +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2003-08 Tom Westerberg <tweg@welho.com> and +Göran Andersson <goran@init.se>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The contents of The Swedish Dictionary for Spell Checking (i.e. the +files sv.aff and sv.dic) are subject to the Mozilla Public License +Version1.1 (the "License"); you may not use this file +except in compliance with the License. You may obtain a copy of the +License at <A HREF="http://www.mozilla.org/MPL/">http://www.mozilla.org/MPL/</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Software distributed under the License is distributed on an "AS +IS" basis,WITHOUT WARRANTY OF ANY KIND, either express or +implied. See the License for the specific language governing rights +and limitations under the License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Alternatively, The Swedish Dictionary may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), +or the GNU Lesser General Public License Version 2.1 or later (the +"LGPL"),in which case the provisions of the GPL or the LGPL +are applicable instead of those above. If you wish to allow use of +your version of this file only under the terms of either the GPL or +the LGPL, and not to allow others to use your version of this file +under the terms of the MPL, indicate your decision by deleting the +provisions above and replace them with the notice and other +provisions required by the GPL or the LGPL. If you do not delete the +provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">Thai</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Thai spelling +dictionary. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H2 LANG="en-US" CLASS="western">Ukrainian</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Ukrainian +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1999 Vladimir Yakovchuk, Oleg Podgurniy<BR>Copyright +(C) 2001 Dmytro Kovalyov, Maksym Polyakov, Andriy Rysin<BR>Copyright +(C) 2002 Valentyn Solomko, Volodymyr M. Lisivka<BR>Copyright (C) 2005 +Andriy Rysin, Eugeniy Meshcheryakov, Dmytro Kovalyov<BR>Copyright (C) +2006-2009 Andriy Rysin</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This dictionary is licensed under GPL 2.0 or above, LGPL 2.1 or above +and MPL (Mozilla Public License) 1.1 licenses.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Ukrainian +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1998-2002 Maksym Polyakov.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +License: GNU General Public License version 2 or any later version</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H3 LANG="en-US" CLASS="western">Thesaurus</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Ukrainian +thesaurus. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This thesaurus is based on: П. М. Деркач, +Короткий словник +синонімів +української +мови, Радянська +школа, Київ, +1960 С. Караванський, +Пошук українського +слова</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2009 Andriy Rysin</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This thesaurus is licensed under GPL, LGPL and MPL (Mozilla Public +License) licenses.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL +Version 1.1</A></P> +<H2 LANG="en-US" CLASS="western">Vietnamese</H2> +<H3 LANG="en-US" CLASS="western">Spelling dictionary</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Vietnamese +spelling dictionary. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Authors:<BR>Ivan Garcia <capiscuas@gmail.com><BR>Nguyễn +Xuân Minh <<A HREF="mailto:mxn@zoomtown.com">mxn@zoomtown.com</A>></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This spellchecker for OpenOffice was based on the Vietnamese +Dictionary list from Proffessor Hồ Ngọc Äức</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This spellchecker is released with GPLv2 license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU General Public License Version 2|outline">Jump to GPL +Version 2</A></P> +<H2 LANG="en-US" CLASS="western">Zulu</H2> +<H3 LANG="en-US" CLASS="western">Hyphenation patterns</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Zulu +hyphenation patterns. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 2005, 2007 Friedel Wolff</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always">Artwork</H1> +<H2 LANG="en-US" CLASS="western">KDE Crystal theme icons</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product:KDE Crystal +theme icons. Use of any of this software is governed by the terms of +the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +KDE Crystal theme icons.<BR>Copyright (C) 2002 and following years +KDE Artists This library is free software; you can redistribute it +and/or modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation, version 2.1 of +the License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<A HREF="#7.GNU Lesser General Public License Version 2.1|outline">Jump +to LGPL Version 2.1</A></P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always">Miscellaneous</H1> +<H2 LANG="en-US" CLASS="western">Adobe Printer Description Files</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: Adobe Printer +Description Files. Use of any of this software is governed by the +terms of the license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright 1987-1995 Adobe Systems Incorporated.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All Rights Reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is granted for redistribution of this file as long as this +copyright notice is intact and the contents of the file is not +altered in any way from its original form.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +End of Copyright statement</P> +<H2 LANG="en-US" CLASS="western">International Color Consortium sRGB +Profiles</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: ICC sRGB +Profiles. Use of any of this software is governed by the terms of the +license below:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To anyone who acknowledges that the files +"sRGB_IEC61966-2-1_noBPC.icc" and +"sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" +WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and +distribute these file for any purpose is hereby granted without fee, +provided that the files are not changed including the HP copyright +notice tag, and that the name of Hewlett-Packard Company shall not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. Hewlett-Packard +Company makes no representations about the suitability of this +software for any purpose.</P> +<H2 LANG="en-US" CLASS="western">MathML DTD</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: MathML DTD. +Use of any of this software is governed by the terms of the license +below:</P> +<H3 LANG="en-US" CLASS="western">W3C<SUP>®</SUP> SOFTWARE NOTICE +AND LICENSE</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN STYLE="font-weight: normal">Copyright © 1994-2001 <A HREF="http://www.w3.org/">World +Wide Web Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts +Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut +National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio +University</A>). All Rights Reserved. +<A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A></SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This W3C work (including software, documents, or other related items) +is being provided by the copyright holders under the following +license. By obtaining, using and/or copying this work, you (the +licensee) agree that you have read, understood, and will comply with +the following terms and conditions:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission to use, copy, modify, and distribute this software and its +documentation, with or without modification, for any purpose +and without fee or royalty is hereby granted, provided that you +include the following on ALL copies of the software and documentation +or portions thereof, including modifications, that you make:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the following + form (hypertext is preferred, text is permitted) should be used + within the body of any redistributed or derivative code: "Copyright + © [$date-of-software] <A HREF="http://www.w3.org/">World Wide + Web Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts + Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut + National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio + University</A>). All Rights Reserved. + <A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A>"</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.)</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND +COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY +OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE +OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, +COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE +SOFTWARE OR DOCUMENTATION.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to the software without specific, +written prior permission. Title to copyright in this software and any +associated documentation will at all times remain with copyright +holders.</P> +<H2 LANG="en-US" CLASS="western">NSIS</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The following software may be included in this product: NSIS +(Nullsoft Scriptable Install System). Use of any of this software is +governed by the terms of the license below:</P> +<H3 LANG="en-US" CLASS="western"><A NAME="Copyright"></A>Copyright</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright (C) 1995-2009 Contributors</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +More detailed copyright information can be found in the individual +source code files.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="Applicable_licenses"></A>Applicable +licenses</H3> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + All NSIS source code, plug-ins, documentation, examples, header + files and graphics, with the exception of the compression modules + and where otherwise noted, are licensed under the zlib/libpng + license.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The zlib compression module for NSIS is licensed under the + zlib/libpng license.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The bzip2 compression module for NSIS is licensed under the bzip2 + license.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The lzma compression module for NSIS is licensed under the Common + Public License version 1.0.</P> +</UL> +<H3 LANG="en-US" CLASS="western"><A NAME="zlib.2Flibpng_license"></A>zlib/libpng +license</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute +it freely, subject to the following restrictions:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + This notice may not be removed or altered from any source + distribution.</P> +</OL> +<H3 LANG="en-US" CLASS="western"><A NAME="bzip2_license"></A>bzip2 +license</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm; font-style: normal"> +THIS SOFTWARE IS PROVIDED BY THE AUTHOR “AS IS” AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Julian Seward, Cambridge, UK.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +jseward@acm.org</P> +<H3 LANG="en-US" CLASS="western"><A NAME="Common_Public_License_version_1.0"></A> +Common Public License version 1.0</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF +THIS AGREEMENT.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +1. DEFINITIONS</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Contribution" means:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and b) in the case of +each subsequent Contributor:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +i) changes to the Program, and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +ii) additions to the Program;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +where such changes and/or additions to the Program originate from and +are distributed by that particular Contributor. A Contribution +'originates' from a Contributor if it was added to the Program by +such Contributor itself or anyone acting on such Contributor's +behalf. Contributions do not include additions to the Program which: +(i) are separate modules of software distributed in conjunction with +the Program under their own license agreement, and (ii) are not +derivative works of the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Contributor" means any person or entity that distributes +the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Licensed Patents " mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Program" means the Contributions distributed in accordance +with this Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +2. GRANT OF RIGHTS</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a) Subject to the terms of this Agreement, each Contributor hereby +grants Recipient a non-exclusive, worldwide, royalty-free copyright +license to reproduce, prepare derivative works of, publicly display, +publicly perform, distribute and sublicense the Contribution of such +Contributor, if any, and such derivative works, in source code and +object code form.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +b) Subject to the terms of this Agreement, each Contributor hereby +grants Recipient a non-exclusive, worldwide, royalty-free patent +license under Licensed Patents to make, use, sell, offer to sell, +import and otherwise transfer the Contribution of such Contributor, +if any, in source code and object code form. This patent license +shall apply to the combination of the Contribution and the Program +if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by +the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +c) Recipient understands that although each Contributor grants the +licenses to its Contributions set forth herein, no assurances are +provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. +Each Contributor disclaims any liability to Recipient for claims +brought by any other entity based on infringement of intellectual +property rights or otherwise. As a condition to exercising the rights +and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is +required to allow Recipient to distribute the Program, it is +Recipient's responsibility to acquire that license before +distributing the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +d) Each Contributor represents that to its knowledge it has +sufficient copyright rights in its Contribution, if any, to grant the +copyright license set forth in this Agreement.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +3. REQUIREMENTS</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a) it complies with the terms and conditions of this Agreement; and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +b) its license agreement:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +i) effectively disclaims on behalf of all Contributors all warranties +and conditions, express and implied, including warranties or +conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +ii) effectively excludes on behalf of all Contributors all liability +for damages, including direct, indirect, special, incidental and +consequential damages, such as lost profits;</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +iii) states that any provisions which differ from this Agreement are +offered by that Contributor alone and not by any other party; and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable +manner on or through a medium customarily used for software exchange.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When the Program is made available in source code form:</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +a) it must be made available under this Agreement; and</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +b) a copy of this Agreement must be included with each copy of the +Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Contributors may not remove or alter any copyright notices contained +within the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +4. COMMERCIAL DISTRIBUTION</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use +of the Program, the Contributor who includes the Program in a +commercial product offering should do so in a manner which does not +create potential liability for other Contributors. Therefore, if a +Contributor includes the Program in a commercial product offering, +such Contributor ("Commercial Contributor") hereby agrees +to defend and indemnify every other Contributor ("Indemnified +Contributor") against any losses, damages and costs +(collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the +Program in a commercial product offering. The obligations in this +section do not apply to any claims or Losses relating to any actual +or alleged intellectual property infringement. In order to qualify, +an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial +Contributor to control, and cooperate with the Commercial Contributor +in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's +responsibility alone. Under this section, the Commercial Contributor +would have to defend claims against the other Contributors related to +those performance claims and warranties, and if a court requires any +other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +5. NO WARRANTY</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT +LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, +MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient +is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with +its exercise of rights under this Agreement, including but not +limited to the risks and costs of program errors, compliance with +applicable laws, damage to or loss of data, programs or equipment, +and unavailability or interruption of operations.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +6. DISCLAIMER OF LIABILITY</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +7. GENERAL</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and +enforceable.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If Recipient institutes patent litigation against a Contributor with +respect to a patent applicable to software (including a cross-claim +or counterclaim in a lawsuit), then any patent licenses granted by +that Contributor to such Recipient under this Agreement shall +terminate as of the date such litigation is filed. In addition, if +Recipient institutes patent litigation against any entity (including +a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or +hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any +licenses granted by Recipient relating to the Program shall continue +and survive.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions +(including revisions) of this Agreement from time to time. No one +other than the Agreement Steward has the right to modify this +Agreement. IBM is the initial Agreement Steward. IBM may assign the +responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) +may always be distributed subject to the version of the Agreement +under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except +as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly +granted under this Agreement are reserved.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No +party to this Agreement will bring a legal action under this +Agreement more than one year after the cause of action arose. Each +party waives its rights to a jury trial in any resulting litigation.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="Special_exception_for_LZMA_compression_module"></A> +Special exception for LZMA compression module</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Igor Pavlov and Amir Szekely, the authors of the LZMA compression +module for NSIS, expressly permit you to statically or dynamically +link your code (or bind by name) to the files from the LZMA +compression module for NSIS without subjecting your linked code to +the terms of the Common Public license version 1.0. Any modifications +or additions to files from the LZMA compression module for NSIS, +however, are subject to the terms of the Common Public License +version 1.0.</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12227_1300998327"></A><A NAME="2.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="4.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A> +GNU Lesser General Public License Version 3</H1> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">Copyright © 2007 Free Software Foundation, +Inc. <</SPAN><A HREF="http://fsf.org/">http://fsf.org/</A><SPAN LANG="en-US">></SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12229_1300998327"></A><A NAME="section0"></A> +0. Additional Definitions.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +As used herein, “this License” refers to version 3 of the +GNU Lesser General Public License, and the “GNU GPL” +refers to version 3 of the GNU General Public License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“The Library” refers to a covered work governed by this +License, other than an Application or a Combined Work as defined +below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +An “Application” is any work that makes use of an +interface provided by the Library, but which is not otherwise based +on the Library. Defining a subclass of a class defined by the Library +is deemed a mode of using an interface provided by the Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A “Combined Work” is a work produced by combining or +linking an Application with the Library. The particular version of +the Library with which the Combined Work was made is also called the +“Linked Version”.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The “Minimal Corresponding Source” for a Combined Work +means the Corresponding Source for the Combined Work, excluding any +source code for portions of the Combined Work that, considered in +isolation, are based on the Application, and not on the Linked +Version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The “Corresponding Application Code” for a Combined Work +means the object code and/or source code for the Application, +including any data and utility programs needed for reproducing the +Combined Work from the Application, but excluding the System +Libraries of the Combined Work.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12231_1300998327"></A><A NAME="section1"></A> +1. Exception to Section 3 of the GNU GPL.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12233_1300998327"></A><A NAME="section2"></A> +2. Conveying Modified Versions.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an +Application that uses the facility (other than as an argument passed +when the facility is invoked), then you may convey a copy of the +modified version:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs whatever + part of its purpose remains meaningful, or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy.</P> +</UL> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12235_1300998327"></A><A NAME="section3"></A> +3. Object Code Incorporating Material from Library Header Files.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and +templates (ten or fewer lines in length), you do both of the +following:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are covered + by this License.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) Accompany the object code with a copy of the GNU GPL and this + license document.</P> +</UL> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12237_1300998327"></A><A NAME="section4"></A> +4. Combined Works.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may convey a Combined Work under terms of your choice that, taken +together, effectively do not restrict modification of the portions of +the Library contained in the Combined Work and reverse engineering +for debugging such modifications, if you also do each of the +following:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) Accompany the Combined Work with a copy of the GNU GPL and this + license document.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among these + notices, as well as a reference directing the user to the copies of + the GNU GPL and this license document.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + d) Do one of the following:</P> + <UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form suitable + for, and under terms that permit, the user to recombine or relink + the Application with a modified version of the Linked Version to + produce a modified Combined Work, in the manner specified by + section 6 of the GNU GPL for conveying Corresponding Source.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time a + copy of the Library already present on the user's computer system, + and (b) will operate properly with a modified version of the + Library that is interface-compatible with the Linked Version.</P> + </UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the GNU + GPL, and only to the extent that such information is necessary to + install and execute a modified version of the Combined Work produced + by recombining or relinking the Application with a modified version + of the Linked Version. (If you use option 4d0, the Installation + Information must accompany the Minimal Corresponding Source and + Corresponding Application Code. If you use option 4d1, you must + provide the Installation Information in the manner specified by + section 6 of the GNU GPL for conveying Corresponding Source.)</P> +</UL> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12239_1300998327"></A><A NAME="section5"></A> +5. Combined Libraries.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may place library facilities that are a work based on the Library +side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work.</P> +</UL> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12241_1300998327"></A><A NAME="section6"></A> +6. Revised Versions of the GNU Lesser General Public License.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each version is given a distinguishing version number. If the Library +as you received it specifies that a certain numbered version of the +GNU Lesser General Public License “or any later version” +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software +Foundation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License +shall apply, that proxy's public statement of acceptance of any +version is permanent authorization for you to choose that version for +the Library.</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="10.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="10.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="10.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="7.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A><A NAME="5.GNU Lesser General Public License Version 2.1|outline"></A> +GNU Lesser General Public License Version 2.1</H1> +<PRE LANG="en-US" CLASS="western">Copyright (C) 1991, 1999 Free Software Foundation, Inc. +<SPAN LANG="en-US">51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</SPAN> +<SPAN LANG="en-US">Everyone is permitted to copy and distribute verbatim copies</SPAN> +<SPAN LANG="en-US">of this license document, but changing it is not allowed.</SPAN> + +<SPAN LANG="en-US">[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]</SPAN></PRE><H2 LANG="en-US" CLASS="western"> +Preamble</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public Licenses +are intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - -<br> - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. -<br> - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. -<br> - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. -<br> - - We protect your rights with a two-step method: (1) we copyright the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about +whether this license or the ordinary General Public License is the +better strategy to use in any particular case, based on the +explanations below.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and +charge for this service if you wish); that you receive source code or +can get it if you want it; that you can change the software and use +pieces of it in new free programs; and that you are informed that you +can do these things.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender +these rights. These restrictions translate to certain +responsibilities for you if you distribute copies of the library or +if you modify it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we +gave you. You must make sure that they, too, receive or can get the +source code. If you link other code with the library, you must +provide complete object files to the recipients, so that they can +relink them with the library after making changes to the library and +recompiling it. And you must show them these terms so they know their +rights.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. -<br> - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -<br> -<br> - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot +permission to copy, distribute and/or modify the library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To protect each distributor, we want to make it very clear that there +is no warranty for the free library. Also, if the library is modified +by someone else and passed on, the recipients should know that what +they have is not the original version, so that the original author's +reputation will not be affected by problems that might be introduced +by others.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that +restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. -<br> - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser +consistent with the full freedom of use specified in this license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use +is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those -libraries into non-free programs. -<br> - - When a program is linked with a library, whether statically or using +libraries into non-free programs.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary +combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General +entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with -the library. -<br> - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. -<br> - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this +the library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We call this license the "Lesser" General Public License +because it does Less to protect the user's freedom than the ordinary +General Public License. It also provides other free software +developers Less of an advantage over competing non-free programs. +These disadvantages are the reason we use the ordinary General Public +License for many libraries. However, the Lesser license provides +advantages in certain special circumstances.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. -<br> - - In other cases, permission to use a particular library in non-free +software only, so we use the Lesser General Public License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in +free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating -system. -<br> - - Although the Lesser General Public License is Less protective of the +system.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. -<br> - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -<br> -<br> - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -<br> - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - -<br> - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. -<br> - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) -<br> - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. -<br> - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. -<br> - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - -<br> - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. -<br> -<br> - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -<br> - a) The modified work must itself be a software library. - -<br> - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - -<br> - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - -<br> - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) -<br> - -These requirements apply to the modified work as a whole. If +that program using a modified version of the Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the +library". The former contains code derived from the library, +whereas the latter must be combined with the library in order to run.</P> +<H2 LANG="en-US" CLASS="western">TERMS AND CONDITIONS FOR COPYING, +DISTRIBUTION AND MODIFICATION</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>0.</STRONG> This License Agreement applies to any software +library or other program which contains a notice placed by the +copyright holder or other authorized party saying it may be +distributed under the terms of this Lesser General Public License +(also called "this License"). Each licensee is addressed as +"you".</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A "library" means a collection of software functions and/or +data prepared so as to be conveniently linked with application +programs (which use some of those functions and data) to form +executables.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The "Library", below, refers to any such software library +or work which has been distributed under these terms. A "work +based on the Library" means either the Library or any derivative +work under copyright law: that is to say, a work containing the +Library or a portion of it, either verbatim or with modifications +and/or translated straightforwardly into another language. +(Hereinafter, translation is included without limitation in the term +"modification".)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Source code" for a work means the preferred form of the +work for making modifications to it. For a library, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output +from such a program is covered only if its contents constitute a work +based on the Library (independent of the use of the Library in a tool +for writing it). Whether that is true depends on what the Library +does and what the program that uses the Library does.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>1.</STRONG> You may copy and distribute verbatim copies of +the Library's complete source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on each +copy an appropriate copyright notice and disclaimer of warranty; keep +intact all the notices that refer to this License and to the absence +of any warranty; and distribute a copy of this License along with the +Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>2.</STRONG> You may modify your copy or copies of the Library +or any portion of it, thus forming a work based on the Library, and +copy and distribute such modifications or work under the terms of +Section 1 above, provided that you also meet all of these conditions:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>a)</STRONG> The modified work must itself be a software + library.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>b)</STRONG> You must cause the files modified to carry + prominent notices stating that you changed the files and the date of + any change.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>c)</STRONG> You must cause the whole of the work to be + licensed at no charge to all third parties under the terms of this + License.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>d)</STRONG> If a facility in the modified Library refers to + a function or a table of data to be supplied by an application + program that uses the facility, other than as an argument passed + when the facility is invoked, then you must make a good faith effort + to ensure that, in the event an application does not supply such + function or table, the facility still operates, and performs + whatever part of its purpose remains meaningful.</P> + <P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + (For example, a function in a library to compute square roots has a + purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must be + optional: if the application does not supply it, the square root + function must still compute square roots.)</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you +sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote -it. - -<br> +it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or -collective works based on the Library. - -<br> -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -<br> - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -<br> -<br> - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - -<br> - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - -<br> - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - -<br> - If distribution of object code is made by offering access to copy +collective works based on the Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In addition, mere aggregation of another work not based on the +Library with the Library (or with a work based on the Library) on a +volume of a storage or distribution medium does not bring the other +work under the scope of this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>3.</STRONG> You may opt to apply the terms of the ordinary +GNU General Public License instead of this License to a given copy of +the Library. To do this, you must alter all the notices that refer to +this License, so that they refer to the ordinary GNU General Public +License, version 2, instead of to this License. (If a newer version +than version 2 of the ordinary GNU General Public License has +appeared, then you can specify that version instead if you wish.) Do +not make any other change in these notices.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Once this change is made in a given copy, it is irreversible for that +copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This option is useful when you wish to copy part of the code of the +Library into a program that is not a library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>4.</STRONG> You may copy and distribute the Library (or a +portion or derivative of it, under Section 2) in object code or +executable form under the terms of Sections 1 and 2 above provided +that you accompany it with the complete corresponding +machine-readable source code, which must be distributed under the +terms of Sections 1 and 2 above on a medium customarily used for +software interchange.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not -compelled to copy the source along with the object code. -<br> - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. -<br> - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. -<br> - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. -<br> - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) -<br> - - Otherwise, if the work is a derivative of the Library, you may +compelled to copy the source along with the object code.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>5.</STRONG> A program that contains no derivative of any +portion of the Library, but is designed to work with the Library by +being compiled or linked with it, is called a "work that uses +the Library". Such a work, in isolation, is not a derivative +work of the Library, and therefore falls outside the scope of this +License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +However, linking a "work that uses the Library" with the +Library creates an executable that is a derivative of the Library +(because it contains portions of the Library), rather than a "work +that uses the library". The executable is therefore covered by +this License. Section 6 states terms for distribution of such +executables.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When a "work that uses the Library" uses material from a +header file that is part of the Library, the object code for the work +may be a derivative work of the Library even though the source code +is not. Whether this is true is especially significant if the work +can be linked without the Library, or if the work is itself a +library. The threshold for this to be true is not precisely defined +by law.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If such an object file uses only numerical parameters, data structure +layouts and accessors, and small macros and small inline functions +(ten lines or less in length), then the use of the object file is +unrestricted, regardless of whether it is legally a derivative work. +(Executables containing this object code plus portions of the Library +will still fall under Section 6.)</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -<br> -<br> - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. -<br> - - You must give prominent notice with each copy of the work that the +whether or not they are linked directly with the Library itself.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>6.</STRONG> As an exception to the Sections above, you may +also combine or link a "work that uses the Library" with +the Library to produce a work containing portions of the Library, and +distribute that work under terms of your choice, provided that the +terms permit modification of the work for the customer's own use and +reverse engineering for debugging such modifications.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work +this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: -<br> - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) -<br> - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. -<br> - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. -<br> - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. -<br> - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. -<br> - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, +directing the user to the copy of this License. Also, you must do one +of these things:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>a)</STRONG> Accompany the work with the complete + corresponding machine-readable source code for the Library including + whatever changes were used in the work (which must be distributed + under Sections 1 and 2 above); and, if the work is an executable + linked with the Library, with the complete machine-readable "work + that uses the Library", as object code and/or source code, so + that the user can modify the Library and then relink to produce a + modified executable containing the modified Library. (It is + understood that the user who changes the contents of definitions + files in the Library will not necessarily be able to recompile the + application to use the modified definitions.)</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>b)</STRONG> Use a suitable shared library mechanism for + linking with the Library. A suitable mechanism is one that (1) uses + at run time a copy of the library already present on the user's + computer system, rather than copying library functions into the + executable, and (2) will operate properly with a modified version of + the library, if the user installs one, as long as the modified + version is interface-compatible with the version that the work was + made with.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>c)</STRONG> Accompany the work with a written offer, valid + for at least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more than the + cost of performing this distribution.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>d)</STRONG> If distribution of the work is made by offering + access to copy from a designated place, offer equivalent access to + copy the above specified materials from the same place.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>e)</STRONG> Verify that the user has already received a copy + of these materials or that you have already sent this user a copy.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies -the executable. -<br> - - It may happen that this requirement contradicts the license +the executable.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot +accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you -distribute. -<br> -<br> - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: -<br> - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. -<br> - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. -<br> - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. -<br> - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and +distribute.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>7.</STRONG> You may place library facilities that are a work +based on the Library side-by-side in a single library together with +other library facilities not covered by this License, and distribute +such a combined library, provided that the separate distribution of +the work based on the Library and of the other library facilities is +otherwise permitted, and provided that you do these two things:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>a)</STRONG> Accompany the combined library with a copy of + the same work based on the Library, uncombined with any other + library facilities. This must be distributed under the terms of the + Sections above.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + <STRONG>b)</STRONG> Give prominent notice with the combined library + of the fact that part of it is a work based on the Library, and + explaining where to find the accompanying uncombined form of the + same work.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>8.</STRONG> You may not copy, modify, sublicense, link with, +or distribute the Library except as expressly provided under this +License. Any attempt otherwise to copy, modify, sublicense, link +with, or distribute the Library is void, and will automatically +terminate your rights under this License. However, parties who have +received copies, or rights, from you under this License will not have +their licenses terminated so long as such parties remain in full +compliance.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>9.</STRONG> You are not required to accept this License, +since you have not signed it. However, nothing else grants you +permission to modify or distribute the Library or its derivative +works. These actions are prohibited by law if you do not accept this +License. Therefore, by modifying or distributing the Library (or any +work based on the Library), you indicate your acceptance of this +License to do so, and all its terms and conditions for copying, +distributing or modifying the Library or works based on it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>10.</STRONG> Each time you redistribute the Library (or any +work based on the Library), the recipient automatically receives a +license from the original licensor to copy, distribute, link with or +modify the Library subject to these terms and conditions. You may not +impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing +compliance by third parties with this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>11.</STRONG> If, as a consequence of a court judgment or +allegation of patent infringement or for any other reason (not +limited to patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the conditions +of this License, they do not excuse you from the conditions of this +License. If you cannot distribute so as to satisfy simultaneously +your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Library +at all. For example, if a patent license would not permit +royalty-free redistribution of the Library by all those who receive +copies directly or indirectly through you, then the only way you +could satisfy both it and this License would be to refrain entirely +from distribution of the Library.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended +to apply, and the section as a whole is intended to apply in other +circumstances.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is +willing to distribute software through any other system and a +licensee cannot impose that choice.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>12.</STRONG> If the distribution and/or use of the Library is +restricted in certain countries either by patents or by copyrighted +interfaces, the original copyright holder who places the Library +under this License may add an explicit geographical distribution +limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, +this License incorporates the limitation as if written in the body of +this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>13.</STRONG> The Free Software Foundation may publish revised +and/or new versions of the Lesser General Public License from time to +time. Such new versions will be similar in spirit to the present +version, but may differ in detail to address new problems or +concerns.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the +terms and conditions either of that version or of any later version +published by the Free Software Foundation. If the Library does not +specify a license version number, you may choose any version ever +published by the Free Software Foundation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>14.</STRONG> If you wish to incorporate parts of the Library +into other free programs whose distribution conditions are +incompatible with these, write to the author to ask for permission. +For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions +for this. Our decision will be guided by the two goals of preserving +the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>NO WARRANTY</STRONG></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>15.</STRONG> BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>16.</STRONG> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL +OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE +THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +END OF TERMS AND CONDITIONS</P> +<H2 LANG="en-US" CLASS="western">How to Apply These Terms to Your New +Libraries</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To apply these terms, attach the following notices to the library. It +is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where +the full notice is found.</P> +<PRE LANG="en-US" CLASS="western"><VAR>one line to give the library's name and an idea of what it does.</VAR> +<SPAN LANG="en-US">Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR></SPAN> + +<SPAN LANG="en-US">This library is free software; you can redistribute it and/or</SPAN> +<SPAN LANG="en-US">modify it under the terms of the GNU Lesser General Public</SPAN> +<SPAN LANG="en-US">License as published by the Free Software Foundation; either</SPAN> +<SPAN LANG="en-US">version 2.1 of the License, or (at your option) any later version.</SPAN> + +<SPAN LANG="en-US">This library is distributed in the hope that it will be useful,</SPAN> +<SPAN LANG="en-US">but WITHOUT ANY WARRANTY; without even the implied warranty of</SPAN> +<SPAN LANG="en-US">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</SPAN> +<SPAN LANG="en-US">Lesser General Public License for more details.</SPAN> + +<SPAN LANG="en-US">You should have received a copy of the GNU Lesser General Public</SPAN> +<SPAN LANG="en-US">License along with this library; if not, write to the Free Software</SPAN> +<SPAN LANG="en-US">Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Also add information on how to contact you by electronic and paper +mail.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for +the library, if necessary. Here is a sample; alter the names:</P> +<PRE LANG="en-US" CLASS="western">Yoyodyne, Inc., hereby disclaims all copyright interest in +<SPAN LANG="en-US">the library `Frob' (a library for tweaking knobs) written</SPAN> +<SPAN LANG="en-US">by James Random Hacker.</SPAN> + +<SPAN LANG="en-US"><VAR>signature of Ty Coon</VAR>, 1 April 1990</SPAN> +<SPAN LANG="en-US">Ty Coon, President of Vice</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +That's all there is to it!</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="4.GNU General Public License Version 3|outline"></A><A NAME="11.GNU General Public License Version 3|outline"></A><A NAME="4.GNU General Public License Version 3|outline"></A><A NAME="4.GNU General Public License Version 3|outline"></A><A NAME="4.GNU General Public License Version 3|outline"></A><A NAME="9.GNU General Public License Version 3|outline"></A> +<SPAN LANG="en-US">GNU General Public License </SPAN>Version 3</H1> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Copyright © 2007 Free Software Foundation, Inc. +<<A HREF="http://fsf.org/">http://fsf.org/</A>></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="preamble1"></A>Preamble</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The GNU General Public License is a free, copyleft license for +software and other kinds of works.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom +to share and change all versions of a program--to make sure it +remains free software for all its users. We, the Free Software +Foundation, use the GNU General Public License for most of our +software; it applies also to any other work released this way by its +authors. You can apply it to your programs, too.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge +for them if you wish), that you receive source code or can get it if +you want it, that you can change the software or use pieces of it in +new free programs, and that you know you can do these things.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the +software, or if you modify it: responsibilities to respect the +freedom of others.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, +receive or can get the source code. And you must show them these +terms so they know their rights.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those +domains in future versions of the GPL, as needed to protect the +freedom of users.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish +to avoid the special danger that patents applied to a free program +could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The precise terms and conditions for copying, distribution and +modification follow.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="terms1"></A>TERMS AND +CONDITIONS</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="section02"></A>0. +Definitions.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“This License” refers to version 3 of the GNU General +Public License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“Copyright” also means copyright-like laws that apply to +other kinds of works, such as semiconductor masks.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“The Program” refers to any copyrightable work licensed +under this License. Each licensee is addressed as “you”. +“Licensees” and “recipients” may be +individuals or organizations.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To “modify” a work means to copy from or adapt all or +part of the work in a fashion requiring copyright permission, other +than the making of an exact copy. The resulting work is called a +“modified version” of the earlier work or a work “based +on” the earlier work.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A “covered work” means either the unmodified Program or a +work based on the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To “propagate” a work means to do anything with it that, +without permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To “convey” a work means any kind of propagation that +enables other parties to make or receive copies. Mere interaction +with a user through a computer network, with no transfer of a copy, +is not conveying.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +An interactive user interface displays “Appropriate Legal +Notices” to the extent that it includes a convenient and +prominently visible feature that (1) displays an appropriate +copyright notice, and (2) tells the user that there is no warranty +for the work (except to the extent that warranties are provided), +that licensees may convey the work under this License, and how to +view a copy of this License. If the interface presents a list of user +commands or options, such as a menu, a prominent item in the list +meets this criterion.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section13"></A>1. Source +Code.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The “source code” for a work means the preferred form of +the work for making modifications to it. “Object code” +means any non-source form of a work.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A “Standard Interface” means an interface that either is +an official standard defined by a recognized standards body, or, in +the case of interfaces specified for a particular programming +language, one that is widely used among developers working in that +language.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The “System Libraries” of an executable work include +anything, other than the work as a whole, that (a) is included in the +normal form of packaging a Major Component, but which is not part of +that Major Component, and (b) serves only to enable use of the work +with that Major Component, or to implement a Standard Interface for +which an implementation is available to the public in source code +form. A “Major Component”, in this context, means a major +essential component (kernel, window system, and so on) of the +specific operating system (if any) on which the executable work runs, +or a compiler used to produce the work, or an object code interpreter +used to run it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The “Corresponding Source” for a work in object code form +means all the source code needed to generate, install, and (for an +executable work) run the object code and to modify the work, +including scripts to control those activities. However, it does not +include the work's System Libraries, or general-purpose tools or +generally available free programs which are used unmodified in +performing those activities but which are not part of the work. For +example, Corresponding Source includes interface definition files +associated with source files for the work, and the source code for +shared libraries and dynamically linked subprograms that the work is +specifically designed to require, such as by intimate data +communication or control flow between those subprograms and other +parts of the work.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding +Source.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Corresponding Source for a work in source code form is that same +work.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section22"></A>2. Basic +Permissions.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in +force. You may convey covered works to others for the sole purpose of +having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply +with the terms of this License in conveying all material for which +you do not control copyright. Those thus making or running the +covered works for you must do so exclusively on your behalf, under +your direction and control, on terms that prohibit them from making +any copies of your copyrighted material outside their relationship +with you.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section32"></A>3. +Protecting Users' Legal Rights From Anti-Circumvention Law.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License +with respect to the covered work, and you disclaim any intention to +limit operation or modification of the work as a means of enforcing, +against the work's users, your or third parties' legal rights to +forbid circumvention of technological measures.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section42"></A>4. Conveying +Verbatim Copies.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the +code; keep intact all notices of the absence of any warranty; and +give all recipients a copy of this License along with the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section52"></A>5. Conveying +Modified Source Versions.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) The work must carry prominent notices stating that it is released + under this License and any conditions added under section 7. This + requirement modifies the requirement in section 4 to “keep + intact all notices”.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + c) You must license the entire work, as a whole, under this License + to anyone who comes into possession of a copy. This License will + therefore apply, along with any applicable section 7 additional + terms, to the whole of the work, and all its parts, regardless of + how they are packaged. This License gives no permission to license + the work in any other way, but it does not invalidate such + permission if you have separately received it.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your work + need not make them do so.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +“aggregate” if the compilation and its resulting +copyright are not used to limit the access or legal rights of the +compilation's users beyond what the individual works permit. +Inclusion of a covered work in an aggregate does not cause this +License to apply to the other parts of the aggregate.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section62"></A>6. Conveying +Non-Source Forms.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium customarily + used for software interchange.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a written + offer, valid for at least three years and valid for as long as you + offer spare parts or customer support for that product model, to + give anyone who possesses the object code either (1) a copy of the + Corresponding Source for all the software in the product that is + covered by this License, on a durable physical medium customarily + used for software interchange, for a price no more than your + reasonable cost of physically performing this conveying of source, + or (2) access to copy the Corresponding Source from a network server + at no charge.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This alternative + is allowed only occasionally and noncommercially, and only if you + received the object code with such an offer, in accord with + subsection 6b.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + d) Convey the object code by offering access from a designated place + (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) that + supports equivalent copying facilities, provided you maintain clear + directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A “User Product” is either (1) a “consumer +product”, which means any tangible personal property which is +normally used for personal, family, or household purposes, or (2) +anything designed or sold for incorporation into a dwelling. In +determining whether a product is a consumer product, doubtful cases +shall be resolved in favor of coverage. For a particular product +received by a particular user, “normally used” refers to +a typical or common use of that class of product, regardless of the +status of the particular user or of the way in which the particular +user actually uses, or expects or is expected to use, the product. A +product is a consumer product regardless of whether the product has +substantial commercial, industrial or non-consumer uses, unless such +uses represent the only significant mode of use of the product.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“Installation Information” for a User Product means any +methods, procedures, authorization keys, or other information +required to install and execute modified versions of a covered work +in that User Product from a modified version of its Corresponding +Source. The information must suffice to ensure that the continued +functioning of the modified object code is in no case prevented or +interfered with solely because modification has been made.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The requirement to provide Installation Information does not include +a requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section71"></A>7. +Additional Terms.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +“Additional permissions” are terms that supplement the +terms of this License by making exceptions from one or more of its +conditions. Additional permissions that are applicable to the entire +Program shall be treated as though they were included in this +License, to the extent that they are valid under applicable law. If +additional permissions apply only to part of the Program, that part +may be used separately under those permissions, but the entire +Program remains governed by this License without regard to the +additional permissions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright +holders of that material) supplement the terms of this License with +terms:</P> +<UL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors.</P> +</UL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +All other non-permissive additional terms are considered “further +restrictions” within the meaning of section 10. If the Program +as you received it, or any part of it, contains a notice stating that +it is governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section81"></A>8. +Termination.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the +copyright holder fails to notify you of the violation by some +reasonable means prior to 60 days after the cessation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section91"></A>9. +Acceptance Not Required for Having Copies.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section101"></A>10. +Automatic Licensing of Downstream Recipients.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +An “entity transaction” is a transaction transferring +control of an organization, or substantially all assets of one, or +subdividing an organization, or merging organizations. If propagation +of a covered work results from an entity transaction, each party to +that transaction who receives a copy of the work also receives +whatever licenses to the work the party's predecessor in interest had +or could give under the previous paragraph, plus a right to +possession of the Corresponding Source of the work from the +predecessor in interest, if the predecessor has it or can get it with +reasonable efforts.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate +litigation (including a cross-claim or counterclaim in a lawsuit) +alleging that any patent claim is infringed by making, using, +selling, offering for sale, or importing the Program or any portion +of it.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section112"></A>11. +Patents.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A “contributor” is a copyright holder who authorizes use +under this License of the Program or a work on which the Program is +based. The work thus licensed is called the contributor's +“contributor version”.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A contributor's “essential patent claims” are all patent +claims owned or controlled by the contributor, whether already +acquired or hereafter acquired, that would be infringed by some +manner, permitted by this License, of making, using, or selling its +contributor version, but do not include claims that would be +infringed only as a consequence of further modification of the +contributor version. For purposes of this definition, “control” +includes the right to grant patent sublicenses in a manner consistent +with the requirements of this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In the following three paragraphs, a “patent license” is +any express agreement or commitment, however denominated, not to +enforce a patent (such as an express permission to practice a patent +or covenant not to sue for patent infringement). To “grant” +such a patent license to a party means to make such an agreement or +commitment not to enforce a patent against the party.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through +a publicly available network server or other readily accessible +means, then you must either (1) cause the Corresponding Source to be +so available, or (2) arrange to deprive yourself of the benefit of +the patent license for this particular work, or (3) arrange, in a +manner consistent with the requirements of this License, to extend +the patent license to downstream recipients. “Knowingly +relying” means you have actual knowledge that, but for the +patent license, your conveying the covered work in a country, or your +recipient's use of the covered work in a country, would infringe one +or more identifiable patents in that country that you have reason to +believe are valid.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent +license you grant is automatically extended to all recipients of the +covered work and works based on it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +A patent license is “discriminatory” if it does not +include within the scope of its coverage, prohibits the exercise of, +or is conditioned on the non-exercise of one or more of the rights +that are specifically granted under this License. You may not convey +a covered work if you are a party to an arrangement with a third +party that is in the business of distributing software, under which +you make payment to the third party based on the extent of your +activity of conveying the work, and under which the third party +grants, to any of the parties who would receive the covered work from +you, a discriminatory patent license (a) in connection with copies of +the covered work conveyed by you (or copies made from those copies), +or (b) primarily for and in connection with specific products or +compilations that contain the covered work, unless you entered into +that arrangement, or that patent license was granted, prior to 28 +March 2007.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section121"></A>12. No +Surrender of Others' Freedom.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If conditions are imposed on you (whether by court order, agreement +or otherwise) that contradict the conditions of this License, they do +not excuse you from the conditions of this License. If you cannot +convey a covered work so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, +then as a consequence you may not convey it at all. For example, if +you agree to terms that obligate you to collect a royalty for further +conveying from those to whom you convey the Program, the only way you +could satisfy both those terms and this License would be to refrain +entirely from conveying the Program.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section131"></A>13. Use +with the GNU Affero General Public License.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a +single combined work, and to convey the resulting work. The terms of +this License will continue to apply to the part which is the covered +work, but the special requirements of the GNU Affero General Public +License, section 13, concerning interaction through a network will +apply to the combination as such.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section14"></A>14. Revised +Versions of this License.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Free Software Foundation may publish revised and/or new versions +of the GNU General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU General Public +License “or any later version” applies to it, you have +the option of following the terms and conditions either of that +numbered version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number +of the GNU General Public License, you may choose any version ever +published by the Free Software Foundation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes +you to choose that version for the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section15"></A>15. +Disclaimer of Warranty.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section16"></A>16. +Limitation of Liability.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section17"></A>17. +Interpretation of Sections 15 and 16.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +END OF TERMS AND CONDITIONS</P> +<H2 LANG="en-US" CLASS="western"><A NAME="howto1"></A>How to Apply +These Terms to Your New Programs</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make +it free software which everyone can redistribute and change under +these terms.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the “copyright” line and a pointer to where the full +notice is found.</P> +<PRE LANG="en-US" CLASS="western"> <one line to give the program's name and a brief idea of what it does.> + <SPAN LANG="en-US">Copyright (C) <year> <name of author></SPAN> + + <SPAN LANG="en-US">This program is free software: you can redistribute it and/or modify</SPAN> + <SPAN LANG="en-US">it under the terms of the GNU General Public License as published by</SPAN> + <SPAN LANG="en-US">the Free Software Foundation, either version 3 of the License, or</SPAN> + <SPAN LANG="en-US">(at your option) any later version.</SPAN> + + <SPAN LANG="en-US">This program is distributed in the hope that it will be useful,</SPAN> + <SPAN LANG="en-US">but WITHOUT ANY WARRANTY; without even the implied warranty of</SPAN> + <SPAN LANG="en-US">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</SPAN> + <SPAN LANG="en-US">GNU General Public License for more details.</SPAN> + + <SPAN LANG="en-US">You should have received a copy of the GNU General Public License</SPAN> + <SPAN LANG="en-US">along with this program. If not, see <<A HREF="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</A>>.</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Also add information on how to contact you by electronic and paper +mail.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:</P> +<PRE LANG="en-US" CLASS="western"> <program> Copyright (C) <year> <name of author> + <SPAN LANG="en-US">This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</SPAN> + <SPAN LANG="en-US">This is free software, and you are welcome to redistribute it</SPAN> + <SPAN LANG="en-US">under certain conditions; type `show c' for details.</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an “about box”.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You should also get your employer (if you work as a programmer) or +school, if any, to sign a “copyright disclaimer” for the +program, if necessary. For more information on this, and how to apply +and follow the GNU GPL, see <<A HREF="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</A>>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking +proprietary applications with the library. If this is what you want +to do, use the GNU Lesser General Public License instead of this +License. But first, please read +<<A HREF="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</A>>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<BR><BR> +</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12243_1300998327"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="12.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="9.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A><A NAME="7.GNU General Public License Version 2|outline"></A> +GNU General Public License Version 2</H1> +<PRE LANG="en-US" CLASS="western">Copyright (C) 1989, 1991 Free Software Foundation, Inc. +<SPAN LANG="en-US">51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</SPAN> +<SPAN LANG="en-US">Everyone is permitted to copy and distribute verbatim copies</SPAN> +<SPAN LANG="en-US">of this license document, but changing it is not allowed.</SPAN></PRE><H2 LANG="en-US" CLASS="western"> +<A NAME="__RefHeading__12245_1300998327"></A><A NAME="preamble"></A>Preamble</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License +is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit +to using it. (Some other Free Software Foundation software is covered +by the GNU Lesser General Public License instead.) You can apply it +to your programs, too.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge +for this service if you wish), that you receive source code or can +get it if you want it, that you can change the software or use pieces +of it in new free programs; and that you know you can do these +things.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the software, or if you modify it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +We protect your rights with two steps: (1) copyright the software, +and (2) offer you this license which gives you legal permission to +copy, distribute and/or modify the software.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, +we want its recipients to know that what they have is not the +original, so that any problems introduced by others will not reflect +on the original authors' reputations.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making +the program proprietary. To prevent this, we have made it clear that +any patent must be licensed for everyone's free use or not licensed +at all.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The precise terms and conditions for copying, distribution and +modification follow.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12247_1300998327"></A><A NAME="terms"></A> +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section01"></A> +<STRONG><SPAN LANG="en-US">0.</SPAN></STRONG><SPAN LANG="en-US"> This +License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the +terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the +Program" means either the Program or any derivative work under +copyright law: that is to say, a work containing the Program or a +portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is +included without limitation in the term "modification".) +Each licensee is addressed as "you".</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the +Program is covered only if its contents constitute a work based on +the Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section11"></A> +<STRONG><SPAN LANG="en-US">1.</SPAN></STRONG><SPAN LANG="en-US"> You +may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section21"></A> +<STRONG><SPAN LANG="en-US">2.</SPAN></STRONG><SPAN LANG="en-US"> You +may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, +provided that you also meet all of these conditions:</SPAN></P> +<DL> + <DD LANG="en-US" CLASS="western"><STRONG><SPAN LANG="en-US">a)</SPAN></STRONG><SPAN LANG="en-US"> + You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change.</SPAN></DD><DD LANG="en-US" CLASS="western"> + <STRONG><SPAN LANG="en-US">b)</SPAN></STRONG><SPAN LANG="en-US"> You + must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, + to be licensed as a whole at no charge to all third parties under + the terms of this License.</SPAN></DD><DD LANG="en-US" CLASS="western"> + <STRONG><SPAN LANG="en-US">c)</SPAN></STRONG><SPAN LANG="en-US"> If + the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in + the most ordinary way, to print or display an announcement including + an appropriate copyright notice and a notice that there is no + warranty (or else, saying that you provide a warranty) and that + users may redistribute the program under these conditions, and + telling the user how to view a copy of this License. (Exception: if + the Program itself is interactive but does not normally print such + an announcement, your work based on the Program is not required to + print an announcement.)</SPAN></DD></DL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +In addition, mere aggregation of another work not based on the +Program with the Program (or with a work based on the Program) on a +volume of a storage or distribution medium does not bring the other +work under the scope of this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section31"></A> +<STRONG><SPAN LANG="en-US">3.</SPAN></STRONG><SPAN LANG="en-US"> You +may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the +following:</SPAN></P> +<DL> + <DD LANG="en-US" CLASS="western"><STRONG><SPAN LANG="en-US">a)</SPAN></STRONG><SPAN LANG="en-US"> + Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 + above on a medium customarily used for software interchange; or,</SPAN></DD><DD LANG="en-US" CLASS="western"> + <STRONG><SPAN LANG="en-US">b)</SPAN></STRONG><SPAN LANG="en-US"> + Accompany it with a written offer, valid for at least three years, + to give any third party, for a charge no more than your cost of + physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or,</SPAN></DD><DD LANG="en-US" CLASS="western"> + <STRONG><SPAN LANG="en-US">c)</SPAN></STRONG><SPAN LANG="en-US"> + Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed + only for noncommercial distribution and only if you received the + program in object code or executable form with such an offer, in + accord with Subsection b above.)</SPAN></DD></DL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section41"></A> +<STRONG><SPAN LANG="en-US">4.</SPAN></STRONG><SPAN LANG="en-US"> You +may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section51"></A> +<STRONG><SPAN LANG="en-US">5.</SPAN></STRONG><SPAN LANG="en-US"> You +are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying -the Library or works based on it. -<br> - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -<br> -<br> - 11. If, as a consequence of a court judgment or allegation of patent +the Program or works based on it.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section61"></A> +<STRONG><SPAN LANG="en-US">6.</SPAN></STRONG><SPAN LANG="en-US"> Each +time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on +the recipients' exercise of the rights granted herein. You are not +responsible for enforcing compliance by third parties to this +License.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section7"></A> +<STRONG><SPAN LANG="en-US">7.</SPAN></STRONG><SPAN LANG="en-US"> If, +as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. -<br> - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. -<br> - +otherwise) that contradict the conditions of this License, they do +not excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For example, +if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly +through you, then the only way you could satisfy both it and this +License would be to refrain entirely from distribution of the +Program.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended +to apply and the section as a whole is intended to apply in other +circumstances.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. -<br> - +system; it is up to the author/donor to decide if he or she is +willing to distribute software through any other system and a +licensee cannot impose that choice.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. -<br> - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. -<br> - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. -<br> - -Each version is given a distinguishing version number. If the Library +be a consequence of the rest of this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section8"></A> +<STRONG><SPAN LANG="en-US">8.</SPAN></STRONG><SPAN LANG="en-US"> If +the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section9"></A> +<STRONG><SPAN LANG="en-US">9.</SPAN></STRONG><SPAN LANG="en-US"> The +Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail +to address new problems or concerns.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -<br> -<br> - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. -<br> -<br> - - NO WARRANTY - -<br> - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +"any later version", you have the option of following the +terms and conditions either of that version or of any later version +published by the Free Software Foundation. If the Program does not +specify a version number of this License, you may choose any version +ever published by the Free Software Foundation.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section10"></A> +<STRONG><SPAN LANG="en-US">10.</SPAN></STRONG><SPAN LANG="en-US"> If +you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to +ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by +the two goals of preserving the free status of all derivatives of our +free software and of promoting the sharing and reuse of software +generally.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section111"></A> +<STRONG><SPAN LANG="en-US">NO WARRANTY</SPAN></STRONG></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG><SPAN LANG="en-US">11.</SPAN></STRONG><SPAN LANG="en-US"> +BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT +WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER +PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -<br> - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. -<br> - - END OF TERMS AND CONDITIONS -<br> - - -</body> -</html> - <html> -<head> -</head> -<body> -<hr style="width: 100%; height: 2px;"> -<h2>LaTeX3 Project<br> -</h2> -<h3>The LaTeX Project Public License<br> -</h3> - -<body> -<a name="lppl">The LaTeX Project Public License</a> -<pre> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -LPPL Version 1.3c 2006-05-20 - -Copyright 1999 2002-2006 LaTeX3 Project - Everyone is allowed to distribute verbatim copies of this - license document, but modification of it is not allowed. - - -PREAMBLE -======== - -The LaTeX Project Public License (LPPL) is the primary license under -which the the LaTeX kernel and the base LaTeX packages are distributed. - -You may use this license for any work of which you hold the copyright -and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -it is written in such a way that you can use it even if your work is -unrelated to TeX. - -The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', -below, gives instructions, examples, and recommendations for authors -who are considering distributing their works under this license. - -This license gives conditions under which a work may be distributed -and modified, as well as conditions under which modified versions of -that work may be distributed. - -We, the LaTeX3 Project, believe that the conditions below give you -the freedom to make and distribute modified versions of your work -that conform with whatever technical specifications you wish while -maintaining the availability, integrity, and reliability of -that work. If you do not see how to achieve your goal while -meeting these conditions, then read the document `cfgguide.tex' -and `modguide.tex' in the base LaTeX distribution for suggestions. - - -DEFINITIONS -=========== - -In this license document the following terms are used: - - `Work' - Any work being distributed under this License. +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section12"></A> +<STRONG><SPAN LANG="en-US">12.</SPAN></STRONG><SPAN LANG="en-US"> IN +NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR +DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE +OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="__RefHeading__12249_1300998327"></A> +END OF TERMS AND CONDITIONS</P> +<H2 LANG="en-US" CLASS="western"><A NAME="__RefHeading__12251_1300998327"></A><A NAME="howto"></A> +How to Apply These Terms to Your New Programs</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make +it free software which everyone can redistribute and change under +these terms.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice +is found.</P> +<PRE LANG="en-US" CLASS="western"><VAR><SPAN LANG="en-US">one line to give the program's name and an idea of what it does.</SPAN></VAR> +<SPAN LANG="en-US"><SPAN LANG="en-US">Copyright (C) </SPAN><VAR><SPAN LANG="en-US">yyyy</SPAN></VAR><SPAN LANG="en-US"> </SPAN><VAR><SPAN LANG="en-US">name of author</SPAN></VAR></SPAN> + +<SPAN LANG="en-US">This program is free software; you can redistribute it and/or</SPAN> +<SPAN LANG="en-US">modify it under the terms of the GNU General Public License</SPAN> +<SPAN LANG="en-US">as published by the Free Software Foundation; either version 2</SPAN> +<SPAN LANG="en-US">of the License, or (at your option) any later version.</SPAN> + +<SPAN LANG="en-US">This program is distributed in the hope that it will be useful,</SPAN> +<SPAN LANG="en-US">but WITHOUT ANY WARRANTY; without even the implied warranty of</SPAN> +<SPAN LANG="en-US">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</SPAN> +<SPAN LANG="en-US">GNU General Public License for more details.</SPAN> + +<SPAN LANG="en-US">You should have received a copy of the GNU General Public License</SPAN> +<SPAN LANG="en-US">along with this program; if not, write to the Free Software</SPAN> +<SPAN LANG="en-US">Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Also add information on how to contact you by electronic and paper +mail.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If the program is interactive, make it output a short notice like +this when it starts in an interactive mode:</P> +<PRE LANG="en-US" CLASS="western"><SPAN LANG="en-US">Gnomovision version 69, Copyright (C) </SPAN><VAR><SPAN LANG="en-US">year</SPAN></VAR><SPAN LANG="en-US"> </SPAN><VAR><SPAN LANG="en-US">name of author</SPAN></VAR> +<SPAN LANG="en-US">Gnomovision comes with ABSOLUTELY NO WARRANTY; for details</SPAN> +<SPAN LANG="en-US">type `show w'. This is free software, and you are welcome</SPAN> +<SPAN LANG="en-US">to redistribute it under certain conditions; type `show c'</SPAN> +<SPAN LANG="en-US">for details.</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">The hypothetical commands </SPAN><SAMP CLASS="western"><SPAN LANG="en-US">`show +w'</SPAN></SAMP><SPAN LANG="en-US"> and </SPAN><SAMP CLASS="western"><SPAN LANG="en-US">`show +c'</SPAN></SAMP><SPAN LANG="en-US"> should show the appropriate parts +of the General Public License. Of course, the commands you use may be +called something other than </SPAN><SAMP CLASS="western"><SPAN LANG="en-US">`show +w'</SPAN></SAMP><SPAN LANG="en-US"> and </SPAN><SAMP CLASS="western"><SPAN LANG="en-US">`show +c'</SPAN></SAMP><SPAN LANG="en-US">; they could even be mouse-clicks +or menu items--whatever suits your program.</SPAN></P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for +the program, if necessary. Here is a sample; alter the names:</P> +<PRE LANG="en-US" CLASS="western">Yoyodyne, Inc., hereby disclaims all copyright +<SPAN LANG="en-US">interest in the program `Gnomovision'</SPAN> +<SPAN LANG="en-US">(which makes passes at compilers) written</SPAN> +<SPAN LANG="en-US">by James Hacker.</SPAN> + +<SPAN LANG="en-US"><VAR><SPAN LANG="en-US">signature of Ty Coon</SPAN></VAR><SPAN LANG="en-US">, 1 April 1989</SPAN></SPAN> +<SPAN LANG="en-US">Ty Coon, President of Vice</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<SPAN LANG="en-US">This General Public License does not permit +incorporating your program into proprietary programs. If your program +is a subroutine library, you may consider it more useful to permit +linking proprietary applications with the library. If this is what +you want to do, use the </SPAN><A HREF="#2.GNU Lesser General Public License Version 3|outline">GNU +Lesser General Public License</A><SPAN LANG="en-US"> instead of this +License.</SPAN></P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="13.Mozilla Public License Version 1.1|outline"></A><A NAME="13.Mozilla Public License Version 1.1|outline"></A><A NAME="13.Mozilla Public License Version 1.1|outline"></A><A NAME="10.Mozilla Public License Version 1.1|outline"></A><A NAME="10.Mozilla Public License Version 1.1|outline"></A><A NAME="10.Mozilla Public License Version 1.1|outline"></A><A NAME="10.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A><A NAME="8.Mozilla Public License Version 1.1|outline"></A> +Mozilla Public License Version 1.1</H1> +<H2 LANG="en-US" CLASS="western"><A NAME="section-1"></A>1. +Definitions.</H2> +<DL> + <DT LANG="en-US" CLASS="western"><A NAME="section-1.0.1"></A>1.0.1. + "Commercial Use"</DT><DD LANG="en-US" CLASS="western"> + means distribution or otherwise making the Covered Code available to + a third party.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.1"></A>1.1. "Contributor"</DT><DD LANG="en-US" CLASS="western"> + means each entity that creates or contributes to the creation of + Modifications.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.2"></A>1.2. "Contributor Version"</DT><DD LANG="en-US" CLASS="western"> + means the combination of the Original Code, prior Modifications used + by a Contributor, and the Modifications made by that particular + Contributor.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.3"></A>1.3. "Covered Code"</DT><DD LANG="en-US" CLASS="western"> + means the Original Code or Modifications or the combination of the + Original Code and Modifications, in each case including portions + thereof.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.4"></A>1.4. "Electronic Distribution + Mechanism"</DT><DD LANG="en-US" CLASS="western"> + means a mechanism generally accepted in the software development + community for the electronic transfer of data.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.5"></A>1.5. "Executable"</DT><DD LANG="en-US" CLASS="western"> + means Covered Code in any form other than Source Code.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.6"></A>1.6. "Initial Developer"</DT><DD LANG="en-US" CLASS="western"> + means the individual or entity identified as the Initial Developer + in the Source Code notice required by Exhibit A.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.7"></A>1.7. "Larger Work"</DT><DD LANG="en-US" CLASS="western"> + means a work which combines Covered Code or portions thereof with + code not governed by the terms of this License.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.8"></A>1.8. "License"</DT><DD LANG="en-US" CLASS="western"> + means this document.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.8.1"></A>1.8.1. "Licensable"</DT><DD LANG="en-US" CLASS="western"> + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently acquired, + any and all of the rights conveyed herein.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.9"></A>1.9. "Modifications"</DT><DD LANG="en-US" CLASS="western"> + means any addition to or deletion from the substance or structure of + either the Original Code or any previous Modifications. When Covered + Code is released as a series of files, a Modification is:</DD></DL> +<OL TYPE=a> + <LI><DD LANG="en-US" CLASS="western" STYLE="margin-bottom: 0cm"> + <A NAME="section-1.9-a"></A>Any addition to or deletion from the + contents of a file containing Original Code or previous + Modifications.</DD><LI><DD LANG="en-US" CLASS="western" STYLE="margin-bottom: 0cm"> + <A NAME="section-1.9-b"></A>Any new file that contains any part of + the Original Code or previous Modifications.</DD></OL> +<DL> + <DT LANG="en-US" CLASS="western"><A NAME="section-1.10"></A>1.10. + "Original Code"</DT><DD LANG="en-US" CLASS="western"> + means Source Code of computer software code which is described in + the Source Code notice required by Exhibit A as Original Code, and + which, at the time of its release under this License is not already + Covered Code governed by this License.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.10.1"></A>1.10.1. "Patent Claims"</DT><DD LANG="en-US" CLASS="western"> + means any patent claim(s), now owned or hereafter acquired, + including without limitation, method, process, and apparatus claims, + in any patent Licensable by grantor.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.11"></A>1.11. "Source Code"</DT><DD LANG="en-US" CLASS="western"> + means the preferred form of the Covered Code for making + modifications to it, including all modules it contains, plus any + associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely + available for no charge.</DD><DT LANG="en-US" CLASS="western"> + <A NAME="section-1.12"></A>1.12. "You" (or "Your")</DT><DD LANG="en-US" CLASS="western"> + means an individual or a legal entity exercising rights under, and + complying with all of the terms of, this License or a future version + of this License issued under Section 6.1. For legal entities, "You" + includes any entity which controls, is controlled by, or is under + common control with You. For purposes of this definition, "control" + means (a) the power, direct or indirect, to cause the direction or + management of such entity, whether by contract or otherwise, or (b) + ownership of more than fifty percent (50%) of the outstanding shares + or beneficial ownership of such entity.</DD></DL> +<H2 LANG="en-US" CLASS="western"> +<A NAME="section-2"></A>2. Source Code License.</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="section-2.1"></A>2.1. The +Initial Developer Grant.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Initial Developer hereby grants You a world-wide, royalty-free, +non-exclusive license, subject to third party intellectual property +claims:</P> +<OL TYPE=a> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.1-a"></A> + under intellectual property rights (other than patent or trademark) + Licensable by Initial Developer to use, reproduce, modify, display, + perform, sublicense and distribute the Original Code (or portions + thereof) with or without Modifications, and/or as part of a Larger + Work; and</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.1-b"></A> + under Patents Claims infringed by the making, using or selling of + Original Code, to make, have made, use, practice, sell, and offer + for sale, and/or otherwise dispose of the Original Code (or portions + thereof).</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.1-c"></A> + the licenses granted in this Section 2.1 (a) and (b) are effective + on the date Initial Developer first distributes Original Code under + the terms of this License.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.1-d"></A> + Notwithstanding Section 2.1 (b) above, no patent license is granted: + 1) for code that You delete from the Original Code; 2) separate from + the Original Code; or 3) for infringements caused by: i) the + modification of the Original Code or ii) the combination of the + Original Code with other software or devices.</P> +</OL> +<H3 LANG="en-US" CLASS="western"><A NAME="section-2.2"></A>2.2. +Contributor Grant.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Subject to third party intellectual property claims, each Contributor +hereby grants You a world-wide, royalty-free, non-exclusive license</P> +<OL TYPE=a> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.2-a"></A> + under intellectual property rights (other than patent or trademark) + Licensable by Contributor, to use, reproduce, modify, display, + perform, sublicense and distribute the Modifications created by such + Contributor (or portions thereof) either on an unmodified basis, + with other Modifications, as Covered Code and/or as part of a Larger + Work; and</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.2-b"></A> + under Patent Claims infringed by the making, using, or selling of + Modifications made by that Contributor either alone and/or in + combination with its Contributor Version (or portions of such + combination), to make, use, sell, offer for sale, have made, and/or + otherwise dispose of: 1) Modifications made by that Contributor (or + portions thereof); and 2) the combination of Modifications made by + that Contributor with its Contributor Version (or portions of such + combination).</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.2-c"></A> + the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective + on the date Contributor first makes Commercial Use of the Covered + Code.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-2.2-d"></A> + Notwithstanding Section 2.2 (b) above, no patent license is granted: + 1) for any code that Contributor has deleted from the Contributor + Version; 2) separate from the Contributor Version; 3) for + infringements caused by: i) third party modifications of Contributor + Version or ii) the combination of Modifications made by that + Contributor with other software (except as part of the Contributor + Version) or other devices; or 4) under Patent Claims infringed by + Covered Code in the absence of Modifications made by that + Contributor.</P> +</OL> +<H2 LANG="en-US" CLASS="western"><A NAME="section-3"></A>3. +Distribution Obligations.</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.1"></A>3.1. +Application of License.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Modifications which You create or to which You contribute are +governed by the terms of this License, including without limitation +Section 2.2. The Source Code version of Covered Code may be +distributed only under the terms of this License or a future version +of this License released under Section 6.1, and You must include a +copy of this License with every copy of the Source Code You +distribute. You may not offer or impose any terms on any Source Code +version that alters or restricts the applicable version of this +License or the recipients' rights hereunder. However, You may include +an additional document offering the additional rights described in +Section 3.5.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.2"></A>3.2. +Availability of Source Code.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Any Modification which You create or to which You contribute must be +made available in Source Code form under the terms of this License +either on the same media as an Executable version or via an accepted +Electronic Distribution Mechanism to anyone to whom you made an +Executable version available; and if made available via Electronic +Distribution Mechanism, must remain available for at least twelve +(12) months after the date it initially became available, or at least +six (6) months after a subsequent version of that particular +Modification has been made available to such recipients. You are +responsible for ensuring that the Source Code version remains +available even if the Electronic Distribution Mechanism is maintained +by a third party.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.3"></A>3.3. +Description of Modifications.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You must cause all Covered Code to which You contribute to contain a +file documenting the changes You made to create that Covered Code and +the date of any change. You must include a prominent statement that +the Modification is derived, directly or indirectly, from Original +Code provided by the Initial Developer and including the name of the +Initial Developer in (a) the Source Code, and (b) in any notice in an +Executable version or related documentation in which You describe the +origin or ownership of the Covered Code.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.4"></A>3.4. +Intellectual Property Matters</H3> +<H4 LANG="en-US" CLASS="western"><A NAME="section-3.4-a"></A>(a) +Third Party Claims</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If Contributor has knowledge that a license under a third party's +intellectual property rights is required to exercise the rights +granted by such Contributor under Sections 2.1 or 2.2, Contributor +must include a text file with the Source Code distribution titled +"LEGAL" which describes the claim and the party making the +claim in sufficient detail that a recipient will know whom to +contact. If Contributor obtains such knowledge after the Modification +is made available as described in Section 3.2, Contributor shall +promptly modify the LEGAL file in all copies Contributor makes +available thereafter and shall take other steps (such as notifying +appropriate mailing lists or newsgroups) reasonably calculated to +inform those who received the Covered Code that new knowledge has +been obtained.</P> +<H4 LANG="en-US" CLASS="western"><A NAME="section-3.4-b"></A>(b) +Contributor APIs</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If Contributor's Modifications include an application programming +interface and Contributor has knowledge of patent licenses which are +reasonably necessary to implement that API, Contributor must also +include this information in the <STRONG>legal</STRONG> file.</P> +<H4 LANG="en-US" CLASS="western"><A NAME="section-3.4-c"></A>(c) +Representations.</H4> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Contributor represents that, except as disclosed pursuant to Section +3.4 (a) above, Contributor believes that Contributor's Modifications +are Contributor's original creation(s) and/or Contributor has +sufficient rights to grant the rights conveyed by this License.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.5"></A>3.5. +Required Notices.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You must duplicate the notice in Exhibit A in each file of the Source +Code. If it is not possible to put such notice in a particular Source +Code file due to its structure, then You must include such notice in +a location (such as a relevant directory) where a user would be +likely to look for such a notice. If You created one or more +Modification(s) You may add your name as a Contributor to the notice +described in Exhibit A. You must also duplicate this License in any +documentation for the Source Code where You describe recipients' +rights or ownership rights relating to Covered Code. You may choose +to offer, and to charge a fee for, warranty, support, indemnity or +liability obligations to one or more recipients of Covered Code. +However, You may do so only on Your own behalf, and not on behalf of +the Initial Developer or any Contributor. You must make it absolutely +clear than any such warranty, support, indemnity or liability +obligation is offered by You alone, and You hereby agree to indemnify +the Initial Developer and every Contributor for any liability +incurred by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.6"></A>3.6. +Distribution of Executable Versions.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may distribute Covered Code in Executable form only if the +requirements of Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for +that Covered Code, and if You include a notice stating that the +Source Code version of the Covered Code is available under the terms +of this License, including a description of how and where You have +fulfilled the obligations of Section 3.2. The notice must be +conspicuously included in any notice in an Executable version, +related documentation or collateral in which You describe recipients' +rights relating to the Covered Code. You may distribute the +Executable version of Covered Code or ownership rights under a +license of Your choice, which may contain terms different from this +License, provided that You are in compliance with the terms of this +License and that the license for the Executable version does not +attempt to limit or alter the recipient's rights in the Source Code +version from the rights set forth in this License. If You distribute +the Executable version under a different license You must make it +absolutely clear that any terms which differ from this License are +offered by You alone, not by the Initial Developer or any +Contributor. You hereby agree to indemnify the Initial Developer and +every Contributor for any liability incurred by the Initial Developer +or such Contributor as a result of any such terms You offer.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-3.7"></A>3.7. +Larger Works.</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +You may create a Larger Work by combining Covered Code with other +code not governed by the terms of this License and distribute the +Larger Work as a single product. In such a case, You must make sure +the requirements of this License are fulfilled for the Covered Code.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-4"></A>4. Inability +to Comply Due to Statute or Regulation.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Code due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description +must be included in the <STRONG>legal</STRONG> file described in +Section 3.4 and must be included with all distributions of the Source +Code. Except to the extent prohibited by statute or regulation, such +description must be sufficiently detailed for a recipient of ordinary +skill to be able to understand it.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-5"></A>5. +Application of this License.</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This License applies to code to which the Initial Developer has +attached the notice in Exhibit A and to related Covered Code.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-6"></A>6. Versions +of the License.</H2> +<H3 LANG="en-US" CLASS="western"><A NAME="section-6.1"></A>6.1. New +Versions</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Netscape Communications Corporation ("Netscape") may +publish revised and/or new versions of the License from time to time. +Each version will be given a distinguishing version number.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-6.2"></A>6.2. +Effect of New Versions</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Once Covered Code has been published under a particular version of +the License, You may always continue to use it under the terms of +that version. You may also choose to use such Covered Code under the +terms of any subsequent version of the License published by Netscape. +No one other than Netscape has the right to modify the terms +applicable to Covered Code created under this License.</P> +<H3 LANG="en-US" CLASS="western"><A NAME="section-6.3"></A>6.3. +Derivative Works</H3> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +If You create or use a modified version of this License (which you +may only do in order to apply it to code which is not already Covered +Code governed by this License), You must (a) rename Your license so +that the phrases "Mozilla", "MOZILLAPL", "MOZPL", +"Netscape", "MPL", "NPL" or any +confusingly similar phrase do not appear in your license (except to +note that your license differs from this License) and (b) otherwise +make it clear that Your version of the license contains terms which +differ from the Mozilla Public License and Netscape Public License. +(Filling in the name of the Initial Developer, Original Code or +Contributor in the notice described in Exhibit A shall not of +themselves be deemed to be modifications of this License.)</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-7"></A>7. +<STRONG>Disclaimer of warranty</STRONG></H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>Covered code is provided under this license on an "as +is" basis, without warranty of any kind, either expressed or +implied, including, without limitation, warranties that the covered +code is free of defects, merchantable, fit for a particular purpose +or non-infringing. The entire risk as to the quality and performance +of the covered code is with you. Should any covered code prove +defective in any respect, you (not the initial developer or any other +contributor) assume the cost of any necessary servicing, repair or +correction. This disclaimer of warranty constitutes an essential part +of this license. No use of any covered code is authorized hereunder +except under this disclaimer.</STRONG></P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-8"></A>8. +Termination</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.1"></A> +8.1. This License and the rights granted hereunder will terminate +automatically if You fail to comply with terms herein and fail to +cure such breach within 30 days of becoming aware of the breach. All +sublicenses to the Covered Code which are properly granted shall +survive any termination of this License. Provisions which, by their +nature, must remain in effect beyond the termination of this License +shall survive.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.2"></A> +8.2. If You initiate litigation by asserting a patent infringement +claim (excluding declaratory judgment actions) against Initial +Developer or a Contributor (the Initial Developer or Contributor +against whom You file such action is referred to as "Participant") +alleging that:</P> +<OL TYPE=a> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.2-a"></A> + such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation + claim is not withdrawn, the rights granted by Participant to You + under Sections 2.1 and/or 2.2 automatically terminate at the + expiration of the 60 day notice period specified above.</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.2-b"></A> + any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, + then any rights granted to You by such Participant under Sections + 2.1(b) and 2.2(b) are revoked effective as of the date You first + made, used, sold, distributed, or had made, Modifications made by + that Participant.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.3"></A> +8.3. If You assert a patent infringement claim against Participant +alleging that such Participant's Contributor Version directly or +indirectly infringes any patent where such claim is resolved (such as +by license or settlement) prior to the initiation of patent +infringement litigation, then the reasonable value of the licenses +granted by such Participant under Sections 2.1 or 2.2 shall be taken +into account in determining the amount or value of any payment or +license.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="section-8.4"></A> +8.4. In the event of termination under Sections 8.1 or 8.2 above, all +end user license agreements (excluding distributors and resellers) +which have been validly granted by You or any distributor hereunder +prior to termination shall survive termination.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-9"></A>9. +<STRONG>Limitation of liability</STRONG></H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +<STRONG>Under no circumstances and under no legal theory, whether +tort (including negligence), contract, or otherwise, shall you, the +initial developer, any other contributor, or any distributor of +covered code, or any supplier of any of such parties, be liable to +any person for any indirect, special, incidental, or consequential +damages of any character including, without limitation, damages for +loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses, even if such party +shall have been informed of the possibility of such damages. This +limitation of liability shall not apply to liability for death or +personal injury resulting from such party's negligence to the extent +applicable law prohibits such limitation. Some jurisdictions do not +allow the exclusion or limitation of incidental or consequential +damages, so this exclusion and limitation may not apply to you.</STRONG></P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-10"></A>10. U.S. +government end users</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +The Covered Code is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" and "commercial computer software +documentation," as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. +227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End +Users acquire Covered Code with only those rights set forth herein.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-11"></A>11. +Miscellaneous</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. This License shall be governed by +California law provisions (except to the extent applicable law, if +any, provides otherwise), excluding its conflict-of-law provisions. +With respect to disputes in which at least one party is a citizen of, +or an entity chartered or registered to do business in the United +States of America, any litigation relating to this License shall be +subject to the jurisdiction of the Federal Courts of the Northern +District of California, with venue lying in Santa Clara County, +California, with the losing party responsible for costs, including +without limitation, court costs and reasonable attorneys' fees and +expenses. The application of the United Nations Convention on +Contracts for the International Sale of Goods is expressly excluded. +Any law or regulation which provides that the language of a contract +shall be construed against the drafter shall not apply to this +License.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-12"></A>12. +Responsibility for claims</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or indirectly, +out of its utilization of rights under this License and You agree to +work with Initial Developer and Contributors to distribute such +responsibility on an equitable basis. Nothing herein is intended or +shall be deemed to constitute any admission of liability.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="section-13"></A>13. +Multiple-licensed code</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Initial Developer may designate portions of the Covered Code as +"Multiple-Licensed". "Multiple-Licensed" means +that the Initial Developer permits you to utilize portions of the +Covered Code under Your choice of the MPL or the alternative +licenses, if any, specified by the Initial Developer in the file +described in Exhibit A.</P> +<H2 LANG="en-US" CLASS="western"><A NAME="exhibit-a"></A>Exhibit A - +Mozilla Public License.</H2> +<PRE LANG="en-US" CLASS="western">"The contents of this file are subject to the Mozilla Public License +<SPAN LANG="en-US">Version 1.1 (the "License"); you may not use this file except in</SPAN> +<SPAN LANG="en-US">compliance with the License. You may obtain a copy of the License at</SPAN> +<SPAN LANG="en-US"><A HREF="http://www.mozilla.org/MPL/">http://www.mozilla.org/MPL/</A></SPAN> + +<SPAN LANG="en-US">Software distributed under the License is distributed on an "AS IS"</SPAN> +<SPAN LANG="en-US">basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the</SPAN> +<SPAN LANG="en-US">License for the specific language governing rights and limitations</SPAN> +<SPAN LANG="en-US">under the License.</SPAN> + +<SPAN LANG="en-US">The Original Code is ______________________________________.</SPAN> + +<SPAN LANG="en-US">The Initial Developer of the Original Code is ________________________.</SPAN> +<SPAN LANG="en-US">Portions created by ______________________ are Copyright (C) ______</SPAN> +<SPAN LANG="en-US">_______________________. All Rights Reserved.</SPAN> + +<SPAN LANG="en-US">Contributor(s): ______________________________________.</SPAN> + +<SPAN LANG="en-US">Alternatively, the contents of this file may be used under the terms</SPAN> +<SPAN LANG="en-US">of the _____ license (the "[___] License"), in which case the</SPAN> +<SPAN LANG="en-US">provisions of [______] License are applicable instead of those</SPAN> +<SPAN LANG="en-US">above. If you wish to allow use of your version of this file only</SPAN> +<SPAN LANG="en-US">under the terms of the [____] License and not to allow others to use</SPAN> +<SPAN LANG="en-US">your version of this file under the MPL, indicate your decision by</SPAN> +<SPAN LANG="en-US">deleting the provisions above and replace them with the notice and</SPAN> +<SPAN LANG="en-US">other provisions required by the [___] License. If you do not delete</SPAN> +<SPAN LANG="en-US">the provisions above, a recipient may use your version of this file</SPAN> +<SPAN LANG="en-US">under either the MPL or the [___] License."</SPAN></PRE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +NOTE: The text of this Exhibit A may differ slightly from the text of +the notices in the Source Code files of the Original Code. You should +use the text of this Exhibit A rather than the text found in the +Original Code Source Code for Your Modifications.</P> +<H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="11.Apache License|outline"></A><A NAME="11.Apache License|outline"></A><A NAME="11.Apache License|outline"></A><A NAME="11.Apache License|outline"></A><A NAME="11.Apache License|outline"></A><A NAME="9.Apache License|outline"></A><A NAME="11.Apache License|outline"></A><A NAME="11.Apache License|outline"></A> +Apache License</H1> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +Version 2.0, January 2004</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="definitions"></A> +<STRONG>1. Definitions</STRONG>.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"License" shall mean the terms and conditions for use, +reproduction, and distribution as defined by Sections 1 through 9 of +this document.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Licensor" shall mean the copyright owner or entity +authorized by the copyright owner that is granting the License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Legal Entity" shall mean the union of the acting entity +and all other entities that control, are controlled by, or are under +common control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause +the direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"You" (or "Your") shall mean an individual or +Legal Entity exercising permissions granted by this License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Source" form shall mean the preferred form for making +modifications, including but not limited to software source code, +documentation source, and configuration files.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but not +limited to compiled object code, generated documentation, and +conversions to other media types.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Work" shall mean the work of authorship, whether in Source +or Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work (an +example is provided in the Appendix below).</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Derivative Works" shall mean any work, whether in Source +or Object form, that is based on (or derived from) the Work and for +which the editorial revisions, annotations, elaborations, or other +modifications represent, as a whole, an original work of authorship. +For the purposes of this License, Derivative Works shall not include +works that remain separable from, or merely link (or bind by name) to +the interfaces of, the Work and Derivative Works thereof.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright +owner or by an individual or Legal Entity authorized to submit on +behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or +written communication sent to the Licensor or its representatives, +including but not limited to communication on electronic mailing +lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of +discussing and improving the Work, but excluding communication that +is conspicuously marked or otherwise designated in writing by the +copyright owner as "Not a Contribution."</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +"Contributor" shall mean Licensor and any individual or +Legal Entity on behalf of whom a Contribution has been received by +Licensor and subsequently incorporated within the Work.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="copyright"></A> +<STRONG>2. Grant of Copyright License</STRONG>. Subject to the terms +and conditions of this License, each Contributor hereby grants to You +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works +of, publicly display, publicly perform, sublicense, and distribute +the Work and such Derivative Works in Source or Object form.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="patent"></A> +<STRONG>3. Grant of Patent License</STRONG>. Subject to the terms and +conditions of this License, each Contributor hereby grants to You a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to +make, have made, use, offer to sell, sell, import, and otherwise +transfer the Work, where such license applies only to those patent +claims licensable by such Contributor that are necessarily infringed +by their Contribution(s) alone or by combination of their +Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that +the Work or a Contribution incorporated within the Work constitutes +direct or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate as of +the date such litigation is filed.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="redistribution"></A> +<STRONG>4. Redistribution</STRONG>. You may reproduce and distribute +copies of the Work or Derivative Works thereof in any medium, with or +without modifications, and in Source or Object form, provided that +You meet the following conditions:</P> +<OL> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + You must give any other recipients of the Work or Derivative Works a + copy of this License; and</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + You must cause any modified files to carry prominent notices stating + that You changed the files; and</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + You must retain, in the Source form of any Derivative Works that You + distribute, all copyright, patent, trademark, and attribution + notices from the Source form of the Work, excluding those notices + that do not pertain to any part of the Derivative Works; and</P> + <LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> + If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained within + such NOTICE file, excluding those notices that do not pertain to any + part of the Derivative Works, in at least one of the following + places: within a NOTICE text file distributed as part of the + Derivative Works; within the Source form or documentation, if + provided along with the Derivative Works; or, within a display + generated by the Derivative Works, if and wherever such third-party + notices normally appear. The contents of the NOTICE file are for + informational purposes only and do not modify the License. You may + add Your own attribution notices within Derivative Works that You + distribute, alongside or as an addendum to the NOTICE text from the + Work, provided that such additional attribution notices cannot be + construed as modifying the License. You may add Your own copyright + statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of the + Work otherwise complies with the conditions stated in this License.</P> +</OL> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="contributions"></A> +<STRONG>5. Submission of Contributions</STRONG>. Unless You +explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the +terms and conditions of this License, without any additional terms or +conditions. Notwithstanding the above, nothing herein shall supersede +or modify the terms of any separate license agreement you may have +executed with Licensor regarding such Contributions.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="trademarks"></A> +<STRONG>6. Trademarks</STRONG>. This License does not grant +permission to use the trade names, trademarks, service marks, or +product names of the Licensor, except as required for reasonable and +customary use in describing the origin of the Work and reproducing +the content of the NOTICE file.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="no-warranty"></A> +<STRONG>7. Disclaimer of Warranty</STRONG>. Unless required by +applicable law or agreed to in writing, Licensor provides the Work +(and each Contributor provides its Contributions) on an "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied, including, without limitation, any warranties or +conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS +FOR A PARTICULAR PURPOSE. You are solely responsible for determining +the appropriateness of using or redistributing the Work and assume +any risks associated with Your exercise of permissions under this +License.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="no-liability"></A> +<STRONG>8. Limitation of Liability</STRONG>. In no event and under no +legal theory, whether in tort (including negligence), contract, or +otherwise, unless required by applicable law (such as deliberate and +grossly negligent acts) or agreed to in writing, shall any +Contributor be liable to You for damages, including any direct, +indirect, special, incidental, or consequential damages of any +character arising as a result of this License or out of the use or +inability to use the Work (including but not limited to damages for +loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such +Contributor has been advised of the possibility of such damages.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A NAME="additional"></A> +<STRONG>9. Accepting Warranty or Additional Liability</STRONG>. While +redistributing the Work or Derivative Works thereof, You may choose +to offer, and charge a fee for, acceptance of support, warranty, +indemnity, or other liability obligations and/or rights consistent +with this License. However, in accepting such obligations, You may +act only on Your own behalf and on Your sole responsibility, not on +behalf of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability incurred +by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability.</P> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +END OF TERMS AND CONDITIONS</P> +<H2 LANG="en-US" CLASS="western"><A NAME="apply"></A>APPENDIX: How to +apply the Apache License to your work</H2> +<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include the +brackets!) The text should be enclosed in the appropriate comment +syntax for the file format. We also recommend that a file or class +name and description of purpose be included on the same "printed +page" as the copyright notice for easier identification within +third-party archives.</P> +<PRE LANG="en-US" CLASS="western"> Copyright [yyyy] [name of copyright owner] + + <SPAN LANG="en-US">Licensed under the Apache License, Version 2.0 (the "License");</SPAN> + <SPAN LANG="en-US">you may not use this file except in compliance with the License.</SPAN> + <SPAN LANG="en-US">You may obtain a copy of the License at</SPAN> + + <SPAN LANG="en-US"><A HREF="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A></SPAN> + + <SPAN LANG="en-US">Unless required by applicable law or agreed to in writing, software</SPAN> + <SPAN LANG="en-US">distributed under the License is distributed on an "AS IS" BASIS,</SPAN> + <SPAN LANG="en-US">WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</SPAN> + <SPAN LANG="en-US">See the License for the specific language governing permissions and</SPAN> + <SPAN LANG="en-US">limitations under the License.</SPAN></PRE><H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"> +<A NAME="15.The LaTeX Project Public License|outline"></A><A NAME="15.The LaTeX Project Public License|outline"></A><A NAME="15.The LaTeX Project Public License|outline"></A><A NAME="15.The LaTeX Project Public License|outline"></A> +The LaTeX Project Public License</H1> +<PRE LANG="en-US" CLASS="western"> +<SPAN LANG="en-US">LPPL Version 1.3c 2008-05-04</SPAN> + +<SPAN LANG="en-US">Copyright 1999 2002-2008 LaTeX3 Project</SPAN> + <SPAN LANG="en-US">Everyone is allowed to distribute verbatim copies of this</SPAN> + <SPAN LANG="en-US">license document, but modification of it is not allowed.</SPAN> + + +<SPAN LANG="en-US">PREAMBLE</SPAN> +<SPAN LANG="en-US">========</SPAN> + +<SPAN LANG="en-US">The LaTeX Project Public License (LPPL) is the primary license under</SPAN> +<SPAN LANG="en-US">which the LaTeX kernel and the base LaTeX packages are distributed.</SPAN> + +<SPAN LANG="en-US">You may use this license for any work of which you hold the copyright</SPAN> +<SPAN LANG="en-US">and which you wish to distribute. This license may be particularly</SPAN> +<SPAN LANG="en-US">suitable if your work is TeX-related (such as a LaTeX package), but </SPAN> +<SPAN LANG="en-US">it is written in such a way that you can use it even if your work is </SPAN> +<SPAN LANG="en-US">unrelated to TeX.</SPAN> + +<SPAN LANG="en-US">The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',</SPAN> +<SPAN LANG="en-US">below, gives instructions, examples, and recommendations for authors</SPAN> +<SPAN LANG="en-US">who are considering distributing their works under this license.</SPAN> + +<SPAN LANG="en-US">This license gives conditions under which a work may be distributed</SPAN> +<SPAN LANG="en-US">and modified, as well as conditions under which modified versions of</SPAN> +<SPAN LANG="en-US">that work may be distributed.</SPAN> + +<SPAN LANG="en-US">We, the LaTeX3 Project, believe that the conditions below give you</SPAN> +<SPAN LANG="en-US">the freedom to make and distribute modified versions of your work</SPAN> +<SPAN LANG="en-US">that conform with whatever technical specifications you wish while</SPAN> +<SPAN LANG="en-US">maintaining the availability, integrity, and reliability of</SPAN> +<SPAN LANG="en-US">that work. If you do not see how to achieve your goal while</SPAN> +<SPAN LANG="en-US">meeting these conditions, then read the document `cfgguide.tex'</SPAN> +<SPAN LANG="en-US">and `modguide.tex' in the base LaTeX distribution for suggestions.</SPAN> + + +<SPAN LANG="en-US">DEFINITIONS</SPAN> +<SPAN LANG="en-US">===========</SPAN> + +<SPAN LANG="en-US">In this license document the following terms are used:</SPAN> + + <SPAN LANG="en-US">`Work'</SPAN> + <SPAN LANG="en-US">Any work being distributed under this License.</SPAN> - `Derived Work' - Any work that under any applicable law is derived from the Work. - - `Modification' - Any procedure that produces a Derived Work under any applicable - law -- for example, the production of a file containing an - original file associated with the Work or a significant portion of - such a file, either verbatim or with modifications and/or - translated into another language. - - `Modify' - To apply any procedure that produces a Derived Work under any - applicable law. + <SPAN LANG="en-US">`Derived Work'</SPAN> + <SPAN LANG="en-US">Any work that under any applicable law is derived from the Work.</SPAN> + + <SPAN LANG="en-US">`Modification' </SPAN> + <SPAN LANG="en-US">Any procedure that produces a Derived Work under any applicable</SPAN> + <SPAN LANG="en-US">law -- for example, the production of a file containing an</SPAN> + <SPAN LANG="en-US">original file associated with the Work or a significant portion of</SPAN> + <SPAN LANG="en-US">such a file, either verbatim or with modifications and/or</SPAN> + <SPAN LANG="en-US">translated into another language.</SPAN> + + <SPAN LANG="en-US">`Modify'</SPAN> + <SPAN LANG="en-US">To apply any procedure that produces a Derived Work under any</SPAN> + <SPAN LANG="en-US">applicable law.</SPAN> - `Distribution' - Making copies of the Work available from one person to another, in - whole or in part. Distribution includes (but is not limited to) - making any electronic components of the Work accessible by - file transfer protocols such as FTP or HTTP or by shared file - systems such as Sun's Network File System (NFS). - - `Compiled Work' - A version of the Work that has been processed into a form where it - is directly usable on a computer system. This processing may - include using installation facilities provided by the Work, - transformations of the Work, copying of components of the Work, or - other activities. Note that modification of any installation - facilities provided by the Work constitutes modification of the Work. - - `Current Maintainer' - A person or persons nominated as such within the Work. If there is - no such explicit nomination then it is the `Copyright Holder' under - any applicable law. - - `Base Interpreter' - A program or process that is normally needed for running or - interpreting a part or the whole of the Work. - - A Base Interpreter may depend on external components but these - are not considered part of the Base Interpreter provided that each - external component clearly identifies itself whenever it is used - interactively. Unless explicitly specified when applying the - license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the - `LaTeX-format' a program implementing the `TeX language'. - - - -CONDITIONS ON DISTRIBUTION AND MODIFICATION -=========================================== - -1. Activities other than distribution and/or modification of the Work -are not covered by this license; they are outside its scope. In -particular, the act of running the Work is not restricted and no -requirements are made concerning any offers of support for the Work. - -2. You may distribute a complete, unmodified copy of the Work as you -received it. Distribution of only part of the Work is considered -modification of the Work, and no right to distribute such a Derived -Work may be assumed under the terms of this clause. - -3. You may distribute a Compiled Work that has been generated from a -complete, unmodified copy of the Work as distributed under Clause 2 -above, as long as that Compiled Work is distributed in such a way that -the recipients may install the Compiled Work on their system exactly -as it would have been installed if they generated a Compiled Work -directly from the Work. - -4. If you are the Current Maintainer of the Work, you may, without -restriction, modify the Work, thus creating a Derived Work. You may -also distribute the Derived Work without restriction, including -Compiled Works generated from the Derived Work. Derived Works -distributed in this manner by the Current Maintainer are considered to -be updated versions of the Work. - -5. If you are not the Current Maintainer of the Work, you may modify -your copy of the Work, thus creating a Derived Work based on the Work, -and compile this Derived Work, thus creating a Compiled Work based on -the Derived Work. - -6. If you are not the Current Maintainer of the Work, you may -distribute a Derived Work provided the following conditions are met -for every component of the Work unless that component clearly states -in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. - - a. If a component of this Derived Work can be a direct replacement - for a component of the Work when that component is used with the - Base Interpreter, then, wherever this component of the Work - identifies itself to the user when used interactively with that - Base Interpreter, the replacement component of this Derived Work - clearly and unambiguously identifies itself as a modified version - of this component to the user when used interactively with that - Base Interpreter. + <SPAN LANG="en-US">`Distribution'</SPAN> + <SPAN LANG="en-US">Making copies of the Work available from one person to another, in</SPAN> + <SPAN LANG="en-US">whole or in part. Distribution includes (but is not limited to)</SPAN> + <SPAN LANG="en-US">making any electronic components of the Work accessible by</SPAN> + <SPAN LANG="en-US">file transfer protocols such as FTP or HTTP or by shared file</SPAN> + <SPAN LANG="en-US">systems such as Sun's Network File System (NFS).</SPAN> + + <SPAN LANG="en-US">`Compiled Work'</SPAN> + <SPAN LANG="en-US">A version of the Work that has been processed into a form where it</SPAN> + <SPAN LANG="en-US">is directly usable on a computer system. This processing may</SPAN> + <SPAN LANG="en-US">include using installation facilities provided by the Work,</SPAN> + <SPAN LANG="en-US">transformations of the Work, copying of components of the Work, or</SPAN> + <SPAN LANG="en-US">other activities. Note that modification of any installation</SPAN> + <SPAN LANG="en-US">facilities provided by the Work constitutes modification of the Work.</SPAN> + + <SPAN LANG="en-US">`Current Maintainer'</SPAN> + <SPAN LANG="en-US">A person or persons nominated as such within the Work. If there is</SPAN> + <SPAN LANG="en-US">no such explicit nomination then it is the `Copyright Holder' under</SPAN> + <SPAN LANG="en-US">any applicable law.</SPAN> + + <SPAN LANG="en-US">`Base Interpreter' </SPAN> + <SPAN LANG="en-US">A program or process that is normally needed for running or</SPAN> + <SPAN LANG="en-US">interpreting a part or the whole of the Work. </SPAN> + + <SPAN LANG="en-US">A Base Interpreter may depend on external components but these</SPAN> + <SPAN LANG="en-US">are not considered part of the Base Interpreter provided that each</SPAN> + <SPAN LANG="en-US">external component clearly identifies itself whenever it is used</SPAN> + <SPAN LANG="en-US">interactively. Unless explicitly specified when applying the</SPAN> + <SPAN LANG="en-US">license to the Work, the only applicable Base Interpreter is a</SPAN> + <SPAN LANG="en-US">`LaTeX-Format' or in the case of files belonging to the </SPAN> + <SPAN LANG="en-US">`LaTeX-format' a program implementing the `TeX language'.</SPAN> + + + +<SPAN LANG="en-US">CONDITIONS ON DISTRIBUTION AND MODIFICATION</SPAN> +<SPAN LANG="en-US">===========================================</SPAN> + +<SPAN LANG="en-US">1. Activities other than distribution and/or modification of the Work</SPAN> +<SPAN LANG="en-US">are not covered by this license; they are outside its scope. In</SPAN> +<SPAN LANG="en-US">particular, the act of running the Work is not restricted and no</SPAN> +<SPAN LANG="en-US">requirements are made concerning any offers of support for the Work.</SPAN> + +<SPAN LANG="en-US">2. You may distribute a complete, unmodified copy of the Work as you</SPAN> +<SPAN LANG="en-US">received it. Distribution of only part of the Work is considered</SPAN> +<SPAN LANG="en-US">modification of the Work, and no right to distribute such a Derived</SPAN> +<SPAN LANG="en-US">Work may be assumed under the terms of this clause.</SPAN> + +<SPAN LANG="en-US">3. You may distribute a Compiled Work that has been generated from a</SPAN> +<SPAN LANG="en-US">complete, unmodified copy of the Work as distributed under Clause 2</SPAN> +<SPAN LANG="en-US">above, as long as that Compiled Work is distributed in such a way that</SPAN> +<SPAN LANG="en-US">the recipients may install the Compiled Work on their system exactly</SPAN> +<SPAN LANG="en-US">as it would have been installed if they generated a Compiled Work</SPAN> +<SPAN LANG="en-US">directly from the Work.</SPAN> + +<SPAN LANG="en-US">4. If you are the Current Maintainer of the Work, you may, without</SPAN> +<SPAN LANG="en-US">restriction, modify the Work, thus creating a Derived Work. You may</SPAN> +<SPAN LANG="en-US">also distribute the Derived Work without restriction, including</SPAN> +<SPAN LANG="en-US">Compiled Works generated from the Derived Work. Derived Works</SPAN> +<SPAN LANG="en-US">distributed in this manner by the Current Maintainer are considered to</SPAN> +<SPAN LANG="en-US">be updated versions of the Work.</SPAN> + +<SPAN LANG="en-US">5. If you are not the Current Maintainer of the Work, you may modify</SPAN> +<SPAN LANG="en-US">your copy of the Work, thus creating a Derived Work based on the Work,</SPAN> +<SPAN LANG="en-US">and compile this Derived Work, thus creating a Compiled Work based on</SPAN> +<SPAN LANG="en-US">the Derived Work.</SPAN> + +<SPAN LANG="en-US">6. If you are not the Current Maintainer of the Work, you may</SPAN> +<SPAN LANG="en-US">distribute a Derived Work provided the following conditions are met</SPAN> +<SPAN LANG="en-US">for every component of the Work unless that component clearly states</SPAN> +<SPAN LANG="en-US">in the copyright notice that it is exempt from that condition. Only</SPAN> +<SPAN LANG="en-US">the Current Maintainer is allowed to add such statements of exemption </SPAN> +<SPAN LANG="en-US">to a component of the Work. </SPAN> + + <SPAN LANG="en-US">a. If a component of this Derived Work can be a direct replacement</SPAN> + <SPAN LANG="en-US">for a component of the Work when that component is used with the</SPAN> + <SPAN LANG="en-US">Base Interpreter, then, wherever this component of the Work</SPAN> + <SPAN LANG="en-US">identifies itself to the user when used interactively with that</SPAN> + <SPAN LANG="en-US">Base Interpreter, the replacement component of this Derived Work</SPAN> + <SPAN LANG="en-US">clearly and unambiguously identifies itself as a modified version</SPAN> + <SPAN LANG="en-US">of this component to the user when used interactively with that</SPAN> + <SPAN LANG="en-US">Base Interpreter.</SPAN> - b. Every component of the Derived Work contains prominent notices - detailing the nature of the changes to that component, or a - prominent reference to another file that is distributed as part - of the Derived Work and that contains a complete and accurate log - of the changes. + <SPAN LANG="en-US">b. Every component of the Derived Work contains prominent notices</SPAN> + <SPAN LANG="en-US">detailing the nature of the changes to that component, or a</SPAN> + <SPAN LANG="en-US">prominent reference to another file that is distributed as part</SPAN> + <SPAN LANG="en-US">of the Derived Work and that contains a complete and accurate log</SPAN> + <SPAN LANG="en-US">of the changes.</SPAN> - c. No information in the Derived Work implies that any persons, - including (but not limited to) the authors of the original version - of the Work, provide any support, including (but not limited to) - the reporting and handling of errors, to recipients of the - Derived Work unless those persons have stated explicitly that - they do provide such support for the Derived Work. - - d. You distribute at least one of the following with the Derived Work: - - 1. A complete, unmodified copy of the Work; - if your distribution of a modified component is made by - offering access to copy the modified component from a - designated place, then offering equivalent access to copy - the Work from the same or some similar place meets this - condition, even though third parties are not compelled to - copy the Work along with the modified component; - - 2. Information that is sufficient to obtain a complete, - unmodified copy of the Work. - -7. If you are not the Current Maintainer of the Work, you may -distribute a Compiled Work generated from a Derived Work, as long as -the Derived Work is distributed to all recipients of the Compiled -Work, and as long as the conditions of Clause 6, above, are met with -regard to the Derived Work. - -8. The conditions above are not intended to prohibit, and hence do not -apply to, the modification, by any method, of any component so that it -becomes identical to an updated version of that component of the Work as -it is distributed by the Current Maintainer under Clause 4, above. - -9. Distribution of the Work or any Derived Work in an alternative -format, where the Work or that Derived Work (in whole or in part) is -then produced by applying some process to that format, does not relax or -nullify any sections of this license as they pertain to the results of -applying that process. + <SPAN LANG="en-US">c. No information in the Derived Work implies that any persons,</SPAN> + <SPAN LANG="en-US">including (but not limited to) the authors of the original version</SPAN> + <SPAN LANG="en-US">of the Work, provide any support, including (but not limited to)</SPAN> + <SPAN LANG="en-US">the reporting and handling of errors, to recipients of the</SPAN> + <SPAN LANG="en-US">Derived Work unless those persons have stated explicitly that</SPAN> + <SPAN LANG="en-US">they do provide such support for the Derived Work.</SPAN> + + <SPAN LANG="en-US">d. You distribute at least one of the following with the Derived Work:</SPAN> + + <SPAN LANG="en-US">1. A complete, unmodified copy of the Work; </SPAN> + <SPAN LANG="en-US">if your distribution of a modified component is made by</SPAN> + <SPAN LANG="en-US">offering access to copy the modified component from a</SPAN> + <SPAN LANG="en-US">designated place, then offering equivalent access to copy</SPAN> + <SPAN LANG="en-US">the Work from the same or some similar place meets this</SPAN> + <SPAN LANG="en-US">condition, even though third parties are not compelled to</SPAN> + <SPAN LANG="en-US">copy the Work along with the modified component;</SPAN> + + <SPAN LANG="en-US">2. Information that is sufficient to obtain a complete,</SPAN> + <SPAN LANG="en-US">unmodified copy of the Work.</SPAN> + +<SPAN LANG="en-US">7. If you are not the Current Maintainer of the Work, you may</SPAN> +<SPAN LANG="en-US">distribute a Compiled Work generated from a Derived Work, as long as</SPAN> +<SPAN LANG="en-US">the Derived Work is distributed to all recipients of the Compiled</SPAN> +<SPAN LANG="en-US">Work, and as long as the conditions of Clause 6, above, are met with</SPAN> +<SPAN LANG="en-US">regard to the Derived Work.</SPAN> + +<SPAN LANG="en-US">8. The conditions above are not intended to prohibit, and hence do not</SPAN> +<SPAN LANG="en-US">apply to, the modification, by any method, of any component so that it</SPAN> +<SPAN LANG="en-US">becomes identical to an updated version of that component of the Work as</SPAN> +<SPAN LANG="en-US">it is distributed by the Current Maintainer under Clause 4, above.</SPAN> + +<SPAN LANG="en-US">9. Distribution of the Work or any Derived Work in an alternative</SPAN> +<SPAN LANG="en-US">format, where the Work or that Derived Work (in whole or in part) is</SPAN> +<SPAN LANG="en-US">then produced by applying some process to that format, does not relax or</SPAN> +<SPAN LANG="en-US">nullify any sections of this license as they pertain to the results of</SPAN> +<SPAN LANG="en-US">applying that process.</SPAN> -10. a. A Derived Work may be distributed under a different license - provided that license itself honors the conditions listed in - Clause 6 above, in regard to the Work, though it does not have - to honor the rest of the conditions in this license. +<SPAN LANG="en-US">10. a. A Derived Work may be distributed under a different license</SPAN> + <SPAN LANG="en-US">provided that license itself honors the conditions listed in</SPAN> + <SPAN LANG="en-US">Clause 6 above, in regard to the Work, though it does not have</SPAN> + <SPAN LANG="en-US">to honor the rest of the conditions in this license.</SPAN> - b. If a Derived Work is distributed under a different license, that - Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the - restrictions in Clause 6 above, concerning changes from the Work. - -11. This license places no restrictions on works that are unrelated to -the Work, nor does this license place any restrictions on aggregating -such works with the Work by any means. - -12. Nothing in this license is intended to, or may be used to, prevent -complete compliance by all parties with all applicable laws. - - -NO WARRANTY -=========== - -There is no warranty for the Work. Except when otherwise stated in -writing, the Copyright Holder provides the Work `as is', without -warranty of any kind, either expressed or implied, including, but not -limited to, the implied warranties of merchantability and fitness for a -particular purpose. The entire risk as to the quality and performance -of the Work is with you. Should the Work prove defective, you assume -the cost of all necessary servicing, repair, or correction. - -In no event unless required by applicable law or agreed to in writing -will The Copyright Holder, or any author named in the components of the -Work, or any other party who may distribute and/or modify the Work as -permitted above, be liable to you for damages, including any general, -special, incidental or consequential damages arising out of any use of -the Work or out of inability to use the Work (including, but not limited -to, loss of data, data being rendered inaccurate, or losses sustained by -anyone as a result of any failure of the Work to operate with any other -programs), even if the Copyright Holder or said author or said other -party has been advised of the possibility of such damages. - - -MAINTENANCE OF THE WORK -======================= - -The Work has the status `author-maintained' if the Copyright Holder -explicitly and prominently states near the primary copyright notice in -the Work that the Work can only be maintained by the Copyright Holder -or simply that it is `author-maintained'. - -The Work has the status `maintained' if there is a Current Maintainer -who has indicated in the Work that they are willing to receive error -reports for the Work (for example, by supplying a valid e-mail -address). It is not required for the Current Maintainer to acknowledge -or act upon these error reports. - -The Work changes from status `maintained' to `unmaintained' if there -is no Current Maintainer, or the person stated to be Current -Maintainer of the work cannot be reached through the indicated means -of communication for a period of six months, and there are no other -significant signs of active maintenance. - -You can become the Current Maintainer of the Work by agreement with -any existing Current Maintainer to take over this role. - -If the Work is unmaintained, you can become the Current Maintainer of -the Work through the following steps: - - 1. Make a reasonable attempt to trace the Current Maintainer (and - the Copyright Holder, if the two differ) through the means of - an Internet or similar search. - - 2. If this search is successful, then enquire whether the Work - is still maintained. - - a. If it is being maintained, then ask the Current Maintainer - to update their communication data within one month. + <SPAN LANG="en-US">b. If a Derived Work is distributed under a different license, that</SPAN> + <SPAN LANG="en-US">Derived Work must provide sufficient documentation as part of</SPAN> + <SPAN LANG="en-US">itself to allow each recipient of that Derived Work to honor the </SPAN> + <SPAN LANG="en-US">restrictions in Clause 6 above, concerning changes from the Work.</SPAN> + +<SPAN LANG="en-US">11. This license places no restrictions on works that are unrelated to</SPAN> +<SPAN LANG="en-US">the Work, nor does this license place any restrictions on aggregating</SPAN> +<SPAN LANG="en-US">such works with the Work by any means.</SPAN> + +<SPAN LANG="en-US">12. Nothing in this license is intended to, or may be used to, prevent</SPAN> +<SPAN LANG="en-US">complete compliance by all parties with all applicable laws.</SPAN> + + +<SPAN LANG="en-US">NO WARRANTY</SPAN> +<SPAN LANG="en-US">===========</SPAN> + +<SPAN LANG="en-US">There is no warranty for the Work. Except when otherwise stated in</SPAN> +<SPAN LANG="en-US">writing, the Copyright Holder provides the Work `as is', without</SPAN> +<SPAN LANG="en-US">warranty of any kind, either expressed or implied, including, but not</SPAN> +<SPAN LANG="en-US">limited to, the implied warranties of merchantability and fitness for a</SPAN> +<SPAN LANG="en-US">particular purpose. The entire risk as to the quality and performance</SPAN> +<SPAN LANG="en-US">of the Work is with you. Should the Work prove defective, you assume</SPAN> +<SPAN LANG="en-US">the cost of all necessary servicing, repair, or correction.</SPAN> + +<SPAN LANG="en-US">In no event unless required by applicable law or agreed to in writing</SPAN> +<SPAN LANG="en-US">will The Copyright Holder, or any author named in the components of the</SPAN> +<SPAN LANG="en-US">Work, or any other party who may distribute and/or modify the Work as</SPAN> +<SPAN LANG="en-US">permitted above, be liable to you for damages, including any general,</SPAN> +<SPAN LANG="en-US">special, incidental or consequential damages arising out of any use of</SPAN> +<SPAN LANG="en-US">the Work or out of inability to use the Work (including, but not limited</SPAN> +<SPAN LANG="en-US">to, loss of data, data being rendered inaccurate, or losses sustained by</SPAN> +<SPAN LANG="en-US">anyone as a result of any failure of the Work to operate with any other</SPAN> +<SPAN LANG="en-US">programs), even if the Copyright Holder or said author or said other</SPAN> +<SPAN LANG="en-US">party has been advised of the possibility of such damages.</SPAN> + + +<SPAN LANG="en-US">MAINTENANCE OF THE WORK</SPAN> +<SPAN LANG="en-US">=======================</SPAN> + +<SPAN LANG="en-US">The Work has the status `author-maintained' if the Copyright Holder</SPAN> +<SPAN LANG="en-US">explicitly and prominently states near the primary copyright notice in</SPAN> +<SPAN LANG="en-US">the Work that the Work can only be maintained by the Copyright Holder</SPAN> +<SPAN LANG="en-US">or simply that it is `author-maintained'.</SPAN> + +<SPAN LANG="en-US">The Work has the status `maintained' if there is a Current Maintainer</SPAN> +<SPAN LANG="en-US">who has indicated in the Work that they are willing to receive error</SPAN> +<SPAN LANG="en-US">reports for the Work (for example, by supplying a valid e-mail</SPAN> +<SPAN LANG="en-US">address). It is not required for the Current Maintainer to acknowledge</SPAN> +<SPAN LANG="en-US">or act upon these error reports.</SPAN> + +<SPAN LANG="en-US">The Work changes from status `maintained' to `unmaintained' if there</SPAN> +<SPAN LANG="en-US">is no Current Maintainer, or the person stated to be Current</SPAN> +<SPAN LANG="en-US">Maintainer of the work cannot be reached through the indicated means</SPAN> +<SPAN LANG="en-US">of communication for a period of six months, and there are no other</SPAN> +<SPAN LANG="en-US">significant signs of active maintenance.</SPAN> + +<SPAN LANG="en-US">You can become the Current Maintainer of the Work by agreement with</SPAN> +<SPAN LANG="en-US">any existing Current Maintainer to take over this role.</SPAN> + +<SPAN LANG="en-US">If the Work is unmaintained, you can become the Current Maintainer of</SPAN> +<SPAN LANG="en-US">the Work through the following steps:</SPAN> + + <SPAN LANG="en-US">1. Make a reasonable attempt to trace the Current Maintainer (and</SPAN> + <SPAN LANG="en-US">the Copyright Holder, if the two differ) through the means of</SPAN> + <SPAN LANG="en-US">an Internet or similar search.</SPAN> + + <SPAN LANG="en-US">2. If this search is successful, then enquire whether the Work</SPAN> + <SPAN LANG="en-US">is still maintained.</SPAN> + + <SPAN LANG="en-US">a. If it is being maintained, then ask the Current Maintainer</SPAN> + <SPAN LANG="en-US">to update their communication data within one month.</SPAN> - b. If the search is unsuccessful or no action to resume active - maintenance is taken by the Current Maintainer, then announce - within the pertinent community your intention to take over - maintenance. (If the Work is a LaTeX work, this could be - done, for example, by posting to comp.text.tex.) - - 3a. If the Current Maintainer is reachable and agrees to pass - maintenance of the Work to you, then this takes effect - immediately upon announcement. + <SPAN LANG="en-US">b. If the search is unsuccessful or no action to resume active</SPAN> + <SPAN LANG="en-US">maintenance is taken by the Current Maintainer, then announce</SPAN> + <SPAN LANG="en-US">within the pertinent community your intention to take over</SPAN> + <SPAN LANG="en-US">maintenance. (If the Work is a LaTeX work, this could be</SPAN> + <SPAN LANG="en-US">done, for example, by posting to comp.text.tex.)</SPAN> + + <SPAN LANG="en-US">3a. If the Current Maintainer is reachable and agrees to pass</SPAN> + <SPAN LANG="en-US">maintenance of the Work to you, then this takes effect</SPAN> + <SPAN LANG="en-US">immediately upon announcement.</SPAN> - b. If the Current Maintainer is not reachable and the Copyright - Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. + <SPAN LANG="en-US">b. If the Current Maintainer is not reachable and the Copyright</SPAN> + <SPAN LANG="en-US">Holder agrees that maintenance of the Work be passed to you,</SPAN> + <SPAN LANG="en-US">then this takes effect immediately upon announcement. </SPAN> - 4. If you make an `intention announcement' as described in 2b. above - and after three months your intention is challenged neither by - the Current Maintainer nor by the Copyright Holder nor by other - people, then you may arrange for the Work to be changed so as - to name you as the (new) Current Maintainer. + <SPAN LANG="en-US">4. If you make an `intention announcement' as described in 2b. above</SPAN> + <SPAN LANG="en-US">and after three months your intention is challenged neither by</SPAN> + <SPAN LANG="en-US">the Current Maintainer nor by the Copyright Holder nor by other</SPAN> + <SPAN LANG="en-US">people, then you may arrange for the Work to be changed so as</SPAN> + <SPAN LANG="en-US">to name you as the (new) Current Maintainer.</SPAN> - 5. If the previously unreachable Current Maintainer becomes - reachable once more within three months of a change completed - under the terms of 3b) or 4), then that Current Maintainer must - become or remain the Current Maintainer upon request provided - they then update their communication data within one month. - -A change in the Current Maintainer does not, of itself, alter the fact -that the Work is distributed under the LPPL license. - -If you become the Current Maintainer of the Work, you should -immediately provide, within the Work, a prominent and unambiguous -statement of your status as Current Maintainer. You should also -announce your new status to the same pertinent community as -in 2b) above. - - -WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE -====================================================== - -This section contains important instructions, examples, and -recommendations for authors who are considering distributing their -works under this license. These authors are addressed as `you' in -this section. - -Choosing This License or Another License ----------------------------------------- - -If for any part of your work you want or need to use *distribution* -conditions that differ significantly from those in this license, then -do not refer to this license anywhere in your work but, instead, -distribute your work under a different license. You may use the text -of this license as a model for your own license, but your license -should not refer to the LPPL or otherwise give the impression that -your work is distributed under the LPPL. - -The document `modguide.tex' in the base LaTeX distribution explains -the motivation behind the conditions of this license. It explains, -for example, why distributing LaTeX under the GNU General Public -License (GPL) was considered inappropriate. Even if your work is -unrelated to LaTeX, the discussion in `modguide.tex' may still be -relevant, and authors intending to distribute their works under any -license are encouraged to read it. - -A Recommendation on Modification Without Distribution ------------------------------------------------------ - -It is wise never to modify a component of the Work, even for your own -personal use, without also meeting the above conditions for -distributing the modified component. While you might intend that such -modifications will never be distributed, often this will happen by -accident -- you may forget that you have modified that component; or -it may not occur to you when allowing others to access the modified -version that you are thus distributing it and violating the conditions -of this license in ways that could have legal implications and, worse, -cause problems for the community. It is therefore usually in your -best interest to keep your copy of the Work identical with the public -one. Many works provide ways to control the behavior of that work -without altering any of its licensed components. - -How to Use This License ------------------------ - -To use this license, place in each of the components of your work both -an explicit copyright notice including your name and the year the work -was authored and/or last substantially modified. Include also a -statement that the distribution and/or modification of that -component is constrained by the conditions in this license. - -Here is an example of such a notice and statement: - - %% pig.dtx - %% Copyright 2005 M. Y. Name - % - % This work may be distributed and/or modified under the - % conditions of the LaTeX Project Public License, either version 1.3 - % of this license or (at your option) any later version. - % The latest version of this license is in - % http://www.latex-project.org/lppl.txt - % and version 1.3 or later is part of all distributions of LaTeX - % version 2005/12/01 or later. - % - % This work has the LPPL maintenance status `maintained'. - % - % The Current Maintainer of this work is M. Y. Name. - % - % This work consists of the files pig.dtx and pig.ins - % and the derived file pig.sty. - -Given such a notice and statement in a file, the conditions -given in this license document would apply, with the `Work' referring -to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being -generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' -referring to any `LaTeX-Format', and both `Copyright Holder' and -`Current Maintainer' referring to the person `M. Y. Name'. - -If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. -However, we recommend that you use `maintained', as the Maintenance -section was added in order to ensure that your Work remains useful to -the community even when you can no longer maintain and support it -yourself. - -Derived Works That Are Not Replacements ---------------------------------------- - -Several clauses of the LPPL specify means to provide reliability and -stability for the user community. They therefore concern themselves -with the case that a Derived Work is intended to be used as a -(compatible or incompatible) replacement of the original Work. If -this is not the case (e.g., if a few lines of code are reused for a -completely different task), then clauses 6b and 6d shall not apply. - - -Important Recommendations -------------------------- - - Defining What Constitutes the Work - - The LPPL requires that distributions of the Work contain all the - files of the Work. It is therefore important that you provide a - way for the licensee to determine which files constitute the Work. - This could, for example, be achieved by explicitly listing all the - files of the Work near the copyright notice of each file or by - using a line such as: - - % This work consists of all files listed in manifest.txt. + <SPAN LANG="en-US">5. If the previously unreachable Current Maintainer becomes</SPAN> + <SPAN LANG="en-US">reachable once more within three months of a change completed</SPAN> + <SPAN LANG="en-US">under the terms of 3b) or 4), then that Current Maintainer must</SPAN> + <SPAN LANG="en-US">become or remain the Current Maintainer upon request provided</SPAN> + <SPAN LANG="en-US">they then update their communication data within one month.</SPAN> + +<SPAN LANG="en-US">A change in the Current Maintainer does not, of itself, alter the fact</SPAN> +<SPAN LANG="en-US">that the Work is distributed under the LPPL license.</SPAN> + +<SPAN LANG="en-US">If you become the Current Maintainer of the Work, you should</SPAN> +<SPAN LANG="en-US">immediately provide, within the Work, a prominent and unambiguous</SPAN> +<SPAN LANG="en-US">statement of your status as Current Maintainer. You should also</SPAN> +<SPAN LANG="en-US">announce your new status to the same pertinent community as</SPAN> +<SPAN LANG="en-US">in 2b) above.</SPAN> + + +<SPAN LANG="en-US">WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE</SPAN> +<SPAN LANG="en-US">======================================================</SPAN> + +<SPAN LANG="en-US">This section contains important instructions, examples, and</SPAN> +<SPAN LANG="en-US">recommendations for authors who are considering distributing their</SPAN> +<SPAN LANG="en-US">works under this license. These authors are addressed as `you' in</SPAN> +<SPAN LANG="en-US">this section.</SPAN> + +<SPAN LANG="en-US">Choosing This License or Another License</SPAN> +<SPAN LANG="en-US">----------------------------------------</SPAN> + +<SPAN LANG="en-US">If for any part of your work you want or need to use *distribution*</SPAN> +<SPAN LANG="en-US">conditions that differ significantly from those in this license, then</SPAN> +<SPAN LANG="en-US">do not refer to this license anywhere in your work but, instead,</SPAN> +<SPAN LANG="en-US">distribute your work under a different license. You may use the text</SPAN> +<SPAN LANG="en-US">of this license as a model for your own license, but your license</SPAN> +<SPAN LANG="en-US">should not refer to the LPPL or otherwise give the impression that</SPAN> +<SPAN LANG="en-US">your work is distributed under the LPPL.</SPAN> + +<SPAN LANG="en-US">The document `modguide.tex' in the base LaTeX distribution explains</SPAN> +<SPAN LANG="en-US">the motivation behind the conditions of this license. It explains,</SPAN> +<SPAN LANG="en-US">for example, why distributing LaTeX under the GNU General Public</SPAN> +<SPAN LANG="en-US">License (GPL) was considered inappropriate. Even if your work is</SPAN> +<SPAN LANG="en-US">unrelated to LaTeX, the discussion in `modguide.tex' may still be</SPAN> +<SPAN LANG="en-US">relevant, and authors intending to distribute their works under any</SPAN> +<SPAN LANG="en-US">license are encouraged to read it.</SPAN> + +<SPAN LANG="en-US">A Recommendation on Modification Without Distribution</SPAN> +<SPAN LANG="en-US">-----------------------------------------------------</SPAN> + +<SPAN LANG="en-US">It is wise never to modify a component of the Work, even for your own</SPAN> +<SPAN LANG="en-US">personal use, without also meeting the above conditions for</SPAN> +<SPAN LANG="en-US">distributing the modified component. While you might intend that such</SPAN> +<SPAN LANG="en-US">modifications will never be distributed, often this will happen by</SPAN> +<SPAN LANG="en-US">accident -- you may forget that you have modified that component; or</SPAN> +<SPAN LANG="en-US">it may not occur to you when allowing others to access the modified</SPAN> +<SPAN LANG="en-US">version that you are thus distributing it and violating the conditions</SPAN> +<SPAN LANG="en-US">of this license in ways that could have legal implications and, worse,</SPAN> +<SPAN LANG="en-US">cause problems for the community. It is therefore usually in your</SPAN> +<SPAN LANG="en-US">best interest to keep your copy of the Work identical with the public</SPAN> +<SPAN LANG="en-US">one. Many works provide ways to control the behavior of that work</SPAN> +<SPAN LANG="en-US">without altering any of its licensed components.</SPAN> + +<SPAN LANG="en-US">How to Use This License</SPAN> +<SPAN LANG="en-US">-----------------------</SPAN> + +<SPAN LANG="en-US">To use this license, place in each of the components of your work both</SPAN> +<SPAN LANG="en-US">an explicit copyright notice including your name and the year the work</SPAN> +<SPAN LANG="en-US">was authored and/or last substantially modified. Include also a</SPAN> +<SPAN LANG="en-US">statement that the distribution and/or modification of that</SPAN> +<SPAN LANG="en-US">component is constrained by the conditions in this license.</SPAN> + +<SPAN LANG="en-US">Here is an example of such a notice and statement:</SPAN> + + <SPAN LANG="en-US">%% pig.dtx</SPAN> + <SPAN LANG="en-US">%% Copyright 2005 M. Y. Name</SPAN> + <SPAN LANG="en-US">%</SPAN> + <SPAN LANG="en-US">% This work may be distributed and/or modified under the</SPAN> + <SPAN LANG="en-US">% conditions of the LaTeX Project Public License, either version 1.3</SPAN> + <SPAN LANG="en-US">% of this license or (at your option) any later version.</SPAN> + <SPAN LANG="en-US">% The latest version of this license is in</SPAN> + <SPAN LANG="en-US">% http://www.latex-project.org/lppl.txt</SPAN> + <SPAN LANG="en-US">% and version 1.3 or later is part of all distributions of LaTeX</SPAN> + <SPAN LANG="en-US">% version 2005/12/01 or later.</SPAN> + <SPAN LANG="en-US">%</SPAN> + <SPAN LANG="en-US">% This work has the LPPL maintenance status `maintained'.</SPAN> + <SPAN LANG="en-US">% </SPAN> + <SPAN LANG="en-US">% The Current Maintainer of this work is M. Y. Name.</SPAN> + <SPAN LANG="en-US">%</SPAN> + <SPAN LANG="en-US">% This work consists of the files pig.dtx and pig.ins</SPAN> + <SPAN LANG="en-US">% and the derived file pig.sty.</SPAN> + +<SPAN LANG="en-US">Given such a notice and statement in a file, the conditions</SPAN> +<SPAN LANG="en-US">given in this license document would apply, with the `Work' referring</SPAN> +<SPAN LANG="en-US">to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being</SPAN> +<SPAN LANG="en-US">generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'</SPAN> +<SPAN LANG="en-US">referring to any `LaTeX-Format', and both `Copyright Holder' and</SPAN> +<SPAN LANG="en-US">`Current Maintainer' referring to the person `M. Y. Name'.</SPAN> + +<SPAN LANG="en-US">If you do not want the Maintenance section of LPPL to apply to your</SPAN> +<SPAN LANG="en-US">Work, change `maintained' above into `author-maintained'. </SPAN> +<SPAN LANG="en-US">However, we recommend that you use `maintained', as the Maintenance</SPAN> +<SPAN LANG="en-US">section was added in order to ensure that your Work remains useful to</SPAN> +<SPAN LANG="en-US">the community even when you can no longer maintain and support it</SPAN> +<SPAN LANG="en-US">yourself.</SPAN> + +<SPAN LANG="en-US">Derived Works That Are Not Replacements</SPAN> +<SPAN LANG="en-US">---------------------------------------</SPAN> + +<SPAN LANG="en-US">Several clauses of the LPPL specify means to provide reliability and</SPAN> +<SPAN LANG="en-US">stability for the user community. They therefore concern themselves</SPAN> +<SPAN LANG="en-US">with the case that a Derived Work is intended to be used as a</SPAN> +<SPAN LANG="en-US">(compatible or incompatible) replacement of the original Work. If</SPAN> +<SPAN LANG="en-US">this is not the case (e.g., if a few lines of code are reused for a</SPAN> +<SPAN LANG="en-US">completely different task), then clauses 6b and 6d shall not apply.</SPAN> + + +<SPAN LANG="en-US">Important Recommendations</SPAN> +<SPAN LANG="en-US">-------------------------</SPAN> + + <SPAN LANG="en-US">Defining What Constitutes the Work</SPAN> + + <SPAN LANG="en-US">The LPPL requires that distributions of the Work contain all the</SPAN> + <SPAN LANG="en-US">files of the Work. It is therefore important that you provide a</SPAN> + <SPAN LANG="en-US">way for the licensee to determine which files constitute the Work.</SPAN> + <SPAN LANG="en-US">This could, for example, be achieved by explicitly listing all the</SPAN> + <SPAN LANG="en-US">files of the Work near the copyright notice of each file or by</SPAN> + <SPAN LANG="en-US">using a line such as:</SPAN> + + <SPAN LANG="en-US">% This work consists of all files listed in manifest.txt.</SPAN> - in that place. In the absence of an unequivocal list it might be - impossible for the licensee to determine what is considered by you - to comprise the Work and, in such a case, the licensee would be - entitled to make reasonable conjectures as to which files comprise - the Work. -<br> - -</pre> -</body> -</html> + <SPAN LANG="en-US">in that place. In the absence of an unequivocal list it might be</SPAN> + <SPAN LANG="en-US">impossible for the licensee to determine what is considered by you</SPAN> + <SPAN LANG="en-US">to comprise the Work and, in such a case, the licensee would be</SPAN> + <SPAN LANG="en-US">entitled to make reasonable conjectures as to which files comprise</SPAN> + <SPAN LANG="en-US">the Work.</SPAN></PRE> +</BODY> +</HTML>
\ No newline at end of file diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt Binary files differindex 13f3649d593d..c9cd5a2033a7 100644 --- a/readlicense_oo/odt/LICENSE.odt +++ b/readlicense_oo/odt/LICENSE.odt diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt index 491dc5885a50..2aa55542f367 100755 --- a/readlicense_oo/txt/license.txt +++ b/readlicense_oo/txt/license.txt @@ -1,4568 +1,7332 @@ -Licensing and Legal information -This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0.html + Licensing and Legal information -Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file, and can be found at the bottom of this document. + This product is made available subject to the terms of GNU Lesser + General Public License Version 3. A copy of the LGPL license can be + found below. -All trademarks and registered trademarks mentioned herein are the property of their respective owners. + See LGPL Version 3 below -Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights reserved. + Third Party Code Additional copyright notices and license terms + applicable to portions of the Software can be found below in this + document. -This product has been created by The Document Foundation, incorporating many modifications from different contributors, see http://www.libreoffice.org/ for more details. + All trademarks and registered trademarks mentioned herein are the + property of their respective owners. + Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights + reserved. -- DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT - + This product has been created by The Document Foundation, + incorporating many modifications from different contributors, see + http://www.libreoffice.org/ for more details. - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + Note: Do not translate or localize this document. Only English version + is legally binding. - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + Third Party Code Additional Copyright Notices and License Terms + Libraries - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. +Apache Commons - 0. Additional Definitions. + The following software may be included in this product: Apache Commons + (codec, httpclient, lang, logging). Use of any of this software is + governed by the terms of the license below: - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. + See Apache License Version 2.0 below - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. +Apache Jakarta Tomcat - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + The following software may be included in this product: Apache Jakarta + Tomcat. Use of any of this software is governed by the terms of the + license below: - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + See Apache License Version 2.0 below - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. +beanshell - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + The following software may be included in this product: beanshell. Use + of any of this software is governed by the terms of the license below: - 1. Exception to Section 3 of the GNU GPL. + This file is part of the BeanShell Java Scripting distribution. + Documentation and updates may be found at http://www.beanshell.org/ - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + Sun Public License Notice: - 2. Conveying Modified Versions. + The contents of this file are subject to the Sun Public License + Version 1.0 (the "License"); you may not use this file except in + compliance with the License. A copy of the License is available at + http://www.sun.com - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + The Original Code is BeanShell. The Initial Developer of the Original + Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright + (C) 2000. All Rights Reserved. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + GNU Public License Notice: - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + Alternatively, the contents of this file may be used under the terms + of the GNU Lesser General Public License (the "LGPL"), in which case + the provisions of LGPL are applicable instead of those above. If you + wish to allow use of your version of this file only under the terms of + the LGPL and not to allow others to use your version of this file + under the SPL, indicate your decision by deleting the provisions above + and replace them with the notice and other provisions required by the + LGPL. If you do not delete the provisions above, a recipient may use + your version of this file under either the SPL or the LGPL. - 3. Object Code Incorporating Material from Library Header Files. + Patrick Niemeyer (pat@pat.net) Author of Learning Java, O'Reilly & + Associates http://www.pat.net/~pat/ - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + See LGPL Version 3 below - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. +BerkeleyDB - b) Accompany the object code with a copy of the GNU GPL and this license - document. + The following software may be included in this product:BerkeleyDB. Use + of any of this software is governed by the terms of the license below: + + Copyright (c) 1990-2004 Sleepycat Software. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Redistributions in any form must be accompanied by information on + how to obtain complete source code for the DB software and any + accompanying software that uses the DB software. The source code + must either be included in the distribution or be available for no + more than the cost of distribution plus a nominal fee, and must be + freely redistributable under reasonable conditions. For an + executable file, complete source code means the source code for + all modules it contains. It does not include source code for + modules or files that typically accompany the major components of + the operating system on which the executable file runs. + + THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL + SLEEPYCAT SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of + California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of the University nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Copyright (c) 1995, 1996 The President and Fellows of Harvard + University. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of the University nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - 4. Combined Works. +C++ Boost Library - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + The following software may be included in this product: C++ Boost + Library. Use of any of this software is governed by the terms of the + license below: + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or + organization obtaining a copy of the software and accompanying + documentation covered by this license (the "Software") to use, + reproduce, display, distribute, execute, and transmit the Software, + and to prepare derivative works of the Software, and to permit + third-parties to whom the Software is furnished to do so, all subject + to the following: + + The copyright notices in the Software and this entire statement, + including the above license grant, this restriction and the following + disclaimer, must be included in all copies of the Software, in whole + or in part, and all derivative works of the Software, unless such + copies or derivative works are solely in the form of + machine-executable object code generated by a source language + processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE + DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER + LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT + OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +Cairo + + The following software may be included in this product: Cairo. Use of + any of this software is governed by the terms of the license below: + + Cairo is free software. + + Every source file in the implementation[*] of cairo is available to be + redistributed and/or modified under the terms of either the GNU Lesser + General Public License (LGPL) version 2.1 or the Mozilla Public + License (MPL) version 1.1. Some files are available under more liberal + terms, but we believe that in all cases, each file may be used under + either the LGPL or the MPL. + + See the following files in this directory for the precise terms and + conditions of either license: + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Please see each file in the implementation for copyright and licensing + information, (in the opening comment of each file). + + [*] The implementation of cairo is contained entirely within the "src" + and "pixman" directories of the cairo source distribution. There are + other components of the cairo source distribution (such as the "test" + and "perf") that are auxiliary to the library itself. None of the + source code in these directories contributes to a build of the cairo + library itself, (libcairo.so or cairo.dll or similar). + + These auxilary components are also free software, but may be under + different license terms than cairo itself. For example, most of the + test cases in the perf and test directories are made available under a + MIT license to simplify any use of this code for reference purposes in + using cairo itself. Other files might be available under the GNU + General Public License (GPL), for example. Again, please see the + opening comment of each file for copyright and licensing information. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. +expat XML Parser Toolkit - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + The following software may be included in this product: expat XML + Parser Toolkit. Use of any of this software is governed by the terms + of the license below: + + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + + Copyright (c) 2001, 2002, 2003 Expat maintainers. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Flute + + The following software may be included in this product: Flute. Use of + any of this software is governed by the terms of the license below: + + W3C IPR SOFTWARE NOTICE + + Copyright © 2002 World Wide Web Consortium, (Massachusetts Institute + of Technology, Institut National de Recherche en Informatique et en + Automatique, Keio University). All Rights Reserved. + + Note: The original version of the W3C Software Copyright Notice and + License could be found at + http://www.w3.org/Consortium/Legal/copyright-software-19980720 + + Copyright © 1994-2000 World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut National de + Recherche en Informatique et en Automatique, Keio University). All + Rights Reserved. http://www.w3.org/Consortium/Legal/ + + This W3C work (including software, documents, or other related items) + is being provided by the copyright holders under the following + license. By obtaining, using and/or copying this work, you (the + licensee) agree that you have read, understood, and will comply with + the following terms and conditions: + + Permission to use, copy, and modify this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include + the following on ALL copies of the software and documentation or + portions thereof, including modifications, that you make: + 1. The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the + following form (hypertext is preferred, text is permitted) should + be used within the body of any redistributed or derivative code: + "Copyright © 2002 World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut National + de Recherche en Informatique et en Automatique, Keio + University). All Rights Reserved. + http://www.w3.org/Consortium/Legal/" + 3. Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.) + + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, + written prior permission. Title to copyright in this software and any + associated documentation will at all times remain with copyright + holders. + + Freetype Library + + The following software may be included in this product: Freetype. Use + of any of this software is governed by the terms of the license below: + + 0. Definitions + + Throughout this license, the terms `package', `FreeType Project', and + `FreeType archive' refer to the set of files originally distributed by + the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the + `FreeType Project', be they named as alpha, beta or final release. + + `You' refers to the licensee, or person using the project, where + `using' is a generic term including compiling the project's source + code as well as linking it to form a `program' or `executable'. This + program is referred to as `a program using the FreeType engine'. + + This license applies to all files distributed in the original FreeType + Project, including all source code, binaries and documentation, unless + otherwise stated in the file in its original, unmodified form as + distributed in the original archive. If you are unsure whether or not + a particular file is covered by this license, you must contact us to + verify this. + + The FreeType Project is copyright (C) 1996-2000 by David Turner, + Robert Wilhelm, and Werner Lemberg. All rights reserved except as + specified below. + + 1. No Warranty + + THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT + WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES + CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. + + 2. Redistribution + + This license grants a worldwide, royalty-free, perpetual and + irrevocable right and license to use, execute, perform, compile, + display, copy, create derivative works of, distribute and sublicense + the FreeType Project (in both source and object code forms) and + derivative works thereof for any purpose; and to authorize others to + exercise some or all of the rights granted herein, subject to the + following conditions: + * Redistribution of source code must retain this license file + ('FTL.TXT') unaltered; any additions, deletions or changes to the + original files must be clearly indicated in accompanying + documentation. The copyright notices of the unaltered, original + files must be preserved in all copies of source files. + * Redistribution in binary form must provide a disclaimer that + states that the software is based in part of the work of the + FreeType Team, in the distribution documentation. We also + encourage you to put an URL to the FreeType web page in your + documentation, though this isn't mandatory. + + These conditions apply to any software derived from or based on the + FreeType Project, not just the unmodified files. If you use our work, + you must acknowledge us. However, no fee need be paid to us. + + 3. Advertising + + Neither the FreeType authors and contributors nor you shall use the + name of the other for commercial, advertising, or promotional purposes + without specific prior written permission. + + We suggest, but do not require, that you use one or more of the + following phrases to refer to this software in your documentation or + advertising materials: `FreeType Project', `FreeType Engine', + `FreeType library', or `FreeType Distribution'. + + As you have not signed this license, you are not required to accept + it. However, as the FreeType Project is copyrighted material, only + this license, or another one contracted with the authors, grants you + the right to use, distribute, and modify it. Therefore, by using, + distributing, or modifying the FreeType Project, you indicate that you + understand and accept all the terms of this license. + + 4. Contacts + + There are two mailing lists related to FreeType: + * freetype@freetype.org + + Discusses general use and applications of FreeType, as well as future + and wanted additions to the library and distribution. If you are + looking for support, start in this list if you haven't found anything + to help you in the documentation. + * devel@freetype.org + + Discusses bugs, as well as engine internals, design issues, specific + licenses, porting, etc. + * http://www.freetype.org + + Holds the current FreeType web page, which will allow you to download + our latest development version and read online documentation. + + You can also contact us individually at: + + David Turner + Robert Wilhelm + Werner Lemberg - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS +GNU ISO C++ Library - 0. Definitions. + The following software may be included in this product: GNU ISO C++ + Library. Use of any of this software is governed by the terms of the + license below: - "This License" refers to version 3 of the GNU General Public License. + © Free Software Foundation, Inc. - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. + See GPL Version 2 below - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. + Additional License(s) - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. +libstdc++: +// Explicit instantiation file. - A "covered work" means either the unmodified Program or a work based -on the Program. +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. +// This library 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 General Public License for more details. - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, +// USA. - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. +// As a special exception, you may use this file as part of a free +software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you +compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be +covered by +// the GNU General Public License. - 1. Source Code. +libgcc: +// +// ISO C++ 14882: +// - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. +/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Contributed by Jakub Jelinek . - 2. Basic Permissions. + This file is part of GNU CC. - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. + GNU CC is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + GNU CC 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 General Public License for more details. - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. + You should have received a copy of the GNU General Public License + along with GNU CC; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. +/* As a special exception, if you link this library with other files, + some of which are compiled with GCC, to produce an executable, + this library does not by itself cause the resulting executable + to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why + the executable file might be covered by the GNU General Public +License. */ - 4. Conveying Verbatim Copies. +/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF + segment and dl_iterate_phdr to avoid register/deregister calls at + DSO load/unload. */ - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. +Graphite2 - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. + The following software may be included in this product: Graphite2. Use + of any of this software is governed by the terms of the license below: - 5. Conveying Modified Source Versions. + Copyright 2010, SIL International All rights reserved. - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + License, or (at your option) any later version. - 6. Conveying Non-Source Forms. + This program 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 for more details. - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite + 330, Boston, MA 02111-1307, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. - 7. Additional Terms. + Alternatively, you may use this library under the terms of the Mozilla + Public License (http://mozilla.org/MPL) or under the GNU General + Public License, as published by the Free Sofware Foundation; either + version 2 of the license or (at your option) any later version. - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. + See LGPL Version 2.1 below - 8. Termination. + See MPL Version 1.1 below - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. +HSQLDB - 9. Acceptance Not Required for Having Copies. + The following software may be included in this product: HSQLDB. Use of + any of this software is governed by the terms of the license below: - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. + ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt") - 10. Automatic Licensing of Downstream Recipients. + For content, code, and products originally developed by Thomas Mueller + and the Hypersonic SQL Group: - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. + Copyright (c) 1995-2000 by the Hypersonic SQL Group. All rights + reserved. Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the following + conditions are met: - 11. Patents. + Redistribution of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - 12. No Surrender of Others' Freedom. + Neither the name of the Hypersonic SQL Group nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC + SQL GROUP, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. This software consists of voluntary contributions made by many + individuals on behalf of the Hypersonic SQL Group. - 13. Use with the GNU Affero General Public License. + For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt) - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. + Copyright (c) 2001-2004, The HSQL Development Group All rights + reserved. - 14. Revised Versions of this License. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. + Redistribution of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 15. Disclaimer of Warranty. + Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + Neither the name of the HSQL Development Group nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. - 16. Limitation of Liability. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HSQL + DEVELOPMENT GROUP, HSQLDB.ORG, OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. +Hunspell - 17. Interpretation of Sections 15 and 16. + The following software may be included in this product: Hunspell. Use + of any of this software is governed by the terms of the license below: - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. + GPL 2.0/LGPL 2.1/MPL 1.1 tri-license - END OF TERMS AND CONDITIONS + The contents of this software may be used under the terms of the GNU + General Public License Version 2 or later (the "GPL"), or the GNU + Lesser General Public License Version 2.1 or later (the "LGPL") or + (excepting the LGPLed GNU gettext library in the intl/ directory) the + Mozilla Public License Version 1.1 or later (the "MPL"). - How to Apply These Terms to Your New Programs + Software distributed under these licenses is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the licenses for the specific language governing rights and + limitations under the licenses. - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. + See GPL Version 2 below - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. + See LGPL Version 2.1 below - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> + See MPL Version 1.1 below - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +Hyphen - This program 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 General Public License for more details. + The following software may be included in this product: Hyphen. Use of + any of this software is governed by the terms of the license below: - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + GPL 2.0/LGPL 2.1/MPL 1.1 tri-license -Also add information on how to contact you by electronic and paper mail. + The contents of this software may be used under the terms of the GNU + General Public License Version 2 or later (the "GPL"), or the GNU + Lesser General Public License Version 2.1 or later (the "LGPL") or + (excepting the LGPLed GNU gettext library in the intl/ directory) the + Mozilla Public License Version 1.1 or later (the "MPL"). - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + The Plain TeX hyphenation tables "hyphen.tex" by Donald E. Knuth has a + non MPL/LGPL compatible license, but freely redistributable: + "Unlimited copying and redistribution of this file are permitted as + long as this file is not modified. Modifications are permitted, but + only if the resulting file is not named hyphen.tex." - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. + Software distributed under these licenses is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the licenses for the specific language governing rights and + limitations under the licenses. -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + See GPL Version 2 below - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. + See LGPL Version 2.1 below - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. + See MPL Version 1.1 below +ICU + The following software may be included in this product: ICU. Use of + any of this software is governed by the terms of the license below: -DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT + ICU License - ICU 1.8.1 and later -The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below: -Bitstream, Inc. -Bitstream Vera Fonts -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. + COPYRIGHT AND PERMISSION NOTICE -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fontsâ€ï¾) and associated documentation files (the “Font Softwareâ€ï¾), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + Copyright (c) 1995-2002 International Business Machines Corporation + and others All rights reserved. -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, and/or sell copies of the Software, and to permit persons + to whom the Software is furnished to do so, provided that the above + copyright notice(s) and this permission notice appear in all copies of + the Software and that both the above copyright notice(s) and this + permission notice appear in supporting documentation. -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “BitstreamÃ¢â‚¬ï¾ or the word “Veraâ€ï¾. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream VeraÃ¢â‚¬ï¾ names. + Except as contained in this notice, the name of a copyright holder + shall not be used in advertising or otherwise to promote the sale, use + or other dealings in this Software without prior written authorization + of the copyright holder. -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + All trademarks and registered trademarks mentioned herein are the + property of their respective owners. -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +IJG JPEG Library -Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. + The following software may be included in this product: IJG JPEG + Library. Use of any of this software is governed by the terms of the + license below: + + In plain English: + 1. We don't promise that this software works. (But if you find any + bugs, please let us know!) + 2. You can use this software for whatever you want. You don't have to + pay us. + 3. You may not pretend that you wrote this software. If you use it in + a program, you must acknowledge somewhere in your documentation + that you've used the IJG code. + + In legalese: + + The authors make NO WARRANTY or representation, either express or + implied, with respect to this software, its quality, accuracy, + merchantability, or fitness for a particular purpose. This software is + provided "AS IS", and you, its user, assume the entire risk as to its + quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. All Rights + Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject + to these conditions: (1) If any part of the source code for this + software is distributed, then this README file must be included, with + this copyright and no-warranty notice unaltered; and any additions, + deletions, or changes to the original files must be clearly indicated + in accompanying documentation. (2) If only executable code is + distributed, then the accompanying documentation must state that "this + software is based in part on the work of the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user + accepts full responsibility for any undesirable consequences; the + authors accept NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the + IJG code, not just to the unmodified library. If you use our work, you + ought to acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or + company name in advertising or publicity relating to this software or + products derived from it. This software may be referred to only as + "the Independent JPEG Group's software". + + We specifically permit and encourage the use of this software as the + basis of commercial products, provided that all warranty or liability + claims are assumed by the product vendor. + + ansi2knr.c is included in this distribution by permission of L. Peter + Deutsch, sole proprietor of its copyright holder, Aladdin Enterprises + of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright + and conditions, but instead by the usual distribution terms of the + Free Software Foundation; principally, that you must include source + code if you redistribute it. (See the file ansi2knr.c for full + details.) However, since ansi2knr.c is not needed as part of any + program generated from the IJG code, this does not limit you more than + the foregoing paragraphs do. + + The Unix configuration script "configure" was produced with GNU + Autoconf. It is copyright by the Free Software Foundation but is + freely distributable. The same holds for its supporting scripts + (config.guess, config.sub, ltconfig, ltmain.sh). Another support + script, install-sh, is copyright by M.I.T. but is also freely + distributable. + + It appears that the arithmetic coding option of the JPEG spec is + covered by patents owned by IBM, AT&T, and Mitsubishi. Hence + arithmetic coding cannot legally be used without obtaining one or more + licenses. For this reason, support for arithmetic coding has been + removed from the free JPEG software. (Since arithmetic coding provides + only a marginal gain over the unpatented Huffman mode, it is unlikely + that very many implementations will support it.) So far as we are + aware, there are no patent restrictions on the remaining code. + + The IJG distribution formerly included code to read and write GIF + files. To avoid entanglement with the Unisys LZW patent, GIF reading + support has been removed altogether, and the GIF writer has been + simplified to produce "uncompressed GIFs". This technique does not use + the LZW algorithm; the resulting GIF files are larger than usual, but + are readable by all standard GIF decoders. + + We are required to state that + + "The Graphics Interchange Format(c) is the Copyright property of + CompuServe Incorporated. GIF(sm) is a Service Mark property of + CompuServe Incorporated." -The following software may be included in this product:BerkeleyDB; Use of any of this software is governed by the terms of the license below: -Sleepycat Software -BerkeleyDB -> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -/* - * Copyright (c) 1990-2004 - * Sleepycat Software. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for the DB software and any - * accompanying software that uses the DB software. The source code - * must either be included in the distribution or be available for no - * more than the cost of distribution plus a nominal fee, and must be - * freely redistributable under reasonable conditions. For an - * executable file, complete source code means the source code for all - * modules it contains. It does not include source code for modules or - * files that typically accompany the major components of the operating - * system on which the executable file runs. - * - * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR - * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ -/* - * Copyright (c) 1990, 1993, 1994, 1995 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * Copyright (c) 1995, 1996 - * The President and Fellows of Harvard University. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - - - -The following software may be included in this product:Czech thesaurus database; Use of any of this software is governed by the terms of the license below: -Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University -Czech Thesaurus Database -Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University -Permission is hereby granted, free of charge, to any person obtaining a copy of this data (the "Data"), to deal in the Data without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. -THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. - -The following software may be included in this product:Generic Polygon Clipper (GPC); Use of any of this software is governed by the terms of the license below: -Alan Murta -GPC -Copyright: (C) 1997-1999, Advanced Interfaces Group, University of Manchester. -This software is free for non-commercial use. It may be copied, modified, and redistributed provided that this copyright notice is preserved on all copies. The intellectual property rights of the algorithms used reside with the University of Manchester Advanced Interfaces Group. -You may not use this software, in whole or in part, in support of any commercial product without the express consent of the author. -There is no warranty or other guarantee of fitness of this software for any purpose. It is provided solely "as is". - -The following software may be included in this product: LaTeX dictinary data; Use of any of this software is governed by the terms of the license below: -LaTeX3 Project -LPPL version 1.3b -The LaTeX Project Public License -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -LPPL Version 1.3b 2006-01-07 - -Copyright 1999 2002-2006 LaTeX3 Project -Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed. -PREAMBLE -======== -The LaTeX Project Public License (LPPL) is the primary license under which the the LaTeX kernel and the base LaTeX packages are distributed. -You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly suitable if your work is TeX-related (such as a LaTeX package), but you may use it with small modifications even if your work is unrelated to TeX. -The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', below, gives instructions, examples, and recommendations for authors who are considering distributing their works under this license. -This license gives conditions under which a work may be distributed and modified, as well as conditions under which modified versions of that work may be distributed. -We, the LaTeX3 Project, believe that the conditions below give you the freedom to make and distribute modified versions of your work that conform with whatever technical specifications you wish while maintaining the availability, integrity, and reliability of that work. If you do not see how to achieve your goal while meeting these conditions, then read the document `cfgguide.tex' and `modguide.tex' in the base LaTeX distribution for suggestions. - -DEFINITIONS -=========== - -In this license document the following terms are used: -`Work' Any work being distributed under this License. -`Derived Work' Any work that under any applicable law is derived from the Work. -`Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of such a file, either verbatim or with modifications and/or translated into another language. -`Modify' To apply any procedure that produces a Derived Work under any applicable law. -`Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) making any electronic components of the Work accessible by file transfer protocols such as FTP or HTTP or by shared file systems such as Sun's Network File System (NFS). -`Compiled Work' A version of the Work that has been processed into a form where it is directly usable on a computer system. This processing may include using installation facilities provided by the Work, transformations of the Work, copying of components of the Work, or other activities. Note that modification of any installation facilities provided by the Work constitutes modification of the Work. -`Current Maintainer' A person or persons nominated as such within the Work. If there is no such explicit nomination then it is the `Copyright Holder' under any applicable law. -`Base Interpreter' A program or process that is normally needed for running or interpreting a part or the whole of the Work. -A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. - -CONDITIONS ON DISTRIBUTION AND MODIFICATION -=========================================== - -1. Activities other than distribution and/or modification of the Work are not covered by this license; they are outside its scope. In particular, the act of running the Work is not restricted and no requirements are made concerning any offers of support for the Work. -2. You may distribute a complete, unmodified copy of the Work as you received it. Distribution of only part of the Work is considered modification of the Work, and no right to distribute such a Derived Work may be assumed under the terms of this clause. -3. You may distribute a Compiled Work that has been generated from a complete, unmodified copy of the Work as distributed under Clause 2 above, as long as that Compiled Work is distributed in such a way that the recipients may install the Compiled Work on their system exactly as it would have been installed if they generated a Compiled Work directly from the Work. -4. If you are the Current Maintainer of the Work, you may, without restriction, modify the Work, thus creating a Derived Work. You may also distribute the Derived Work without restriction, including Compiled Works generated from the Derived Work. Derived Works distributed in this manner by the Current Maintainer are considered to be updated versions of the Work. -5. If you are not the Current Maintainer of the Work, you may modify your copy of the Work, thus creating a Derived Work based on the Work, and compile this Derived Work, thus creating a Compiled Work based on the Derived Work. -6. If you are not the Current Maintainer of the Work, you may distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only the Current Maintainer is allowed to add such statements of exemption to a component of the Work. -a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the Base Interpreter, then, wherever this component of the Work identifies itself to the user when used interactively with that Base Interpreter, the replacement component of this Derived Work clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. -b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. -c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) the reporting and handling of errors, to recipients of the Derived Work unless those persons have stated explicitly that they do provide such support for the Derived Work. -d. You distribute at least one of the following with the Derived Work: -1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy the Work from the same or some similar place meets this condition, even though third parties are not compelled to copy the Work along with the modified component; -2. Information that is sufficient to obtain a complete, unmodified copy of the Work. -7. If you are not the Current Maintainer of the Work, you may distribute a Compiled Work generated from a Derived Work, as long as the Derived Work is distributed to all recipients of the Compiled Work, and as long as the conditions of Clause 6, above, are met with regard to the Derived Work. -8. The conditions above are not intended to prohibit, and hence do not apply to, the modification, by any method, of any component so that it becomes identical to an updated version of that component of the Work as it is distributed by the Current Maintainer under Clause 4, above. -9. Distribution of the Work or any Derived Work in an alternative format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. -10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. -b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. -11. This license places no restrictions on works that are unrelated to the Work, nor does this license place any restrictions on aggregating such works with the Work by any means. -12. Nothing in this license is intended to, or may be used to, prevent complete compliance by all parties with all applicable laws. -NO WARRANTY -=========== - -There is no warranty for the Work. Except when otherwise stated in writing, the Copyright Holder provides the Work `as is', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the Work is with you. Should the Work prove defective, you assume the cost of all necessary servicing, repair, or correction. -In no event unless required by applicable law or agreed to in writing will The Copyright Holder, or any author named in the components of the Work, or any other party who may distribute and/or modify the Work as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of any use of the Work or out of inability to use the Work (including, but not limited to, loss of data, data being rendered inaccurate, or losses sustained by anyone as a result of any failure of the Work to operate with any other programs), even if the Copyright Holder or said author or said other party has been advised of the possibility of such damages. - -MAINTENANCE OF THE WORK -======================= - -The Work has the status `author-maintained' if the Copyright Holder explicitly and prominently states near the primary copyright notice in the Work that the Work can only be maintained by the Copyright Holder or simply that it is `author-maintained'. -The Work has the status `maintained' if there is a Current Maintainer who has indicated in the Work that they are willing to receive error reports for the Work (for example, by supplying a valid e-mail address). It is not required for the Current Maintainer to acknowledge or act upon these error reports. -The Work changes from status `maintained' to `unmaintained' if there is no Current Maintainer, or the person stated to be Current Maintainer of the work cannot be reached through the indicated means of communication for a period of six months, and there are no other significant signs of active maintenance. -You can become the Current Maintainer of the Work by agreement with any existing Current Maintainer to take over this role. -If the Work is unmaintained, you can become the Current Maintainer of the Work through the following steps: -1. Make a reasonable attempt to trace the Current Maintainer (and the Copyright Holder, if the two differ) through the means of an Internet or similar search. -2. If this search is successful, then enquire whether the Work is still maintained. -a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. -b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over maintenance. (If the Work is a LaTeX work, this could be done, for example, by posting to comp.text.tex.) -3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. -b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, then this takes effect immediately upon announcement. -4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. -5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must become or remain the Current Maintainer upon request provided they then update their communication data within one month. -A change in the Current Maintainer does not, of itself, alter the fact that the Work is distributed under the LPPL license. -If you become the Current Maintainer of the Work, you should immediately provide, within the Work, a prominent and unambiguous statement of your status as Current Maintainer. You should also announce your new status to the same pertinent community as in 2b) above. - -WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE -====================================================== - -This section contains important instructions, examples, and recommendations for authors who are considering distributing their works under this license. These authors are addressed as `you' in this section. -Choosing This License or Another License ----------------------------------------- - -If for any part of your work you want or need to use *distribution* conditions that differ significantly from those in this license, then do not refer to this license anywhere in your work but, instead, distribute your work under a different license. You may use the text of this license as a model for your own license, but your license should not refer to the LPPL or otherwise give the impression that your work is distributed under the LPPL. -The document `modguide.tex' in the base LaTeX distribution explains the motivation behind the conditions of this license. It explains, for example, why distributing LaTeX under the GNU General Public License (GPL) was considered inappropriate. Even if your work is unrelated to LaTeX, the discussion in `modguide.tex' may still be relevant, and authors intending to distribute their works under any license are encouraged to read it. - -A Recommendation on Modification Without Distribution ------------------------------------------------------ - -It is wise never to modify a component of the Work, even for your own personal use, without also meeting the above conditions for distributing the modified component. While you might intend that such modifications will never be distributed, often this will happen by accident -- you may forget that you have modified that component; or it may not occur to you when allowing others to access the modified version that you are thus distributing it and violating the conditions of this license in ways that could have legal implications and, worse, cause problems for the community. It is therefore usually in your best interest to keep your copy of the Work identical with the public one. Many works provide ways to control the behavior of that work without altering any of its licensed components. - -How to Use This License ------------------------ - -To use this license, place in each of the components of your work both an explicit copyright notice including your name and the year the work was authored and/or last substantially modified. Include also a statement that the distribution and/or modification of that component is constrained by the conditions in this license. -Here is an example of such a notice and statement: -%% pig.dtx %% Copyright 2005 M. Y. Name % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins % and the derived file pig.sty. -Given such a notice and statement in a file, the conditions given in this license document would apply, with the `Work' referring to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. -If you do not want the Maintenance section of LPPL to apply to your Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it yourself. - -Derived Works That Are Not Replacements ---------------------------------------- - -Several clauses of the LPPL specify means to provide reliability and stability for the user community. They therefore concern themselves with the case that a Derived Work is intended to be used as a (compatible or incompatible) replacement of the original Work. If this is not the case (e.g., if a few lines of code are reused for a completely different task), then clauses 6b and 6d shall not apply. - -Important Recommendations -------------------------- - -Defining What Constitutes the Work -The LPPL requires that distributions of the Work contain all the files of the Work. It is therefore important that you provide a way for the licensee to determine which files constitute the Work. This could, for example, be achieved by explicitly listing all the files of the Work near the copyright notice of each file or by using a line such as: -% This work consists of all files listed in manifest.txt. -in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. - -The following software may be included in this product:MS Runtime Libraries; Use of any of this software is governed by the terms of the license below: -Microsoft Corporation -Runtime Libraries -Microsoft .NET Framework Redistributable EULA -SUPPLEMENTAL END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE -IMPORTANT: -READ CAREFULLY— -These Microsoft Corporation ("Microsoft") -operating system components, including any "online" or electronic -documentation ("OS Components") are subject to the terms and -conditions of the agreement under which you have licensed the -applicable Microsoft operating system product ("OS Product") -described below (each an "End User License Agreement" or "EULA") -and the terms and conditions of this Supplemental EULA. BY INSTALLING, -COPYING OR OTHERWISE USING THE OS COMPONENTS, YOU AGREE TO BE BOUND -BY THE TERMS AND CONDITIONS OF THE APPLICABLE OS PRODUCT EULA AND -THIS SUPPLEMENTAL EULA. IF YOU DO NOT AGREE TO THESE TERMS AND -CONDITIONS, DO NOT INSTALL, COPY OR USE THE OS COMPONENTS. -NOTE: IF YOU DO NOT HAVE A VALID EULA FOR ANY "OS PRODUCT" -(MICROSOFT WINDOWS 98, WINDOWS ME, WINDOWS NT 4.0 (DESKTOP -EDITION), WINDOWS 2000 OPERATING SYSTEM, WINDOWS XP PROFESSIONAL -AND/OR WINDOWS XP HOME EDITION), YOU ARE NOT AUTHORIZED TO INSTALL, -COPY OR OTHERWISE USE THE OS COMPONENTS AND YOU HAVE NO RIGHTS UNDER -THIS SUPPLEMENTAL EULA. -Capitalized terms used in this Supplemental EULA and not otherwise -defined herein shall have the meanings assigned to them in the -applicable OS Product EULA. -General. The OS Components are provided to you by Microsoft to update, -supplement, or replace existing functionality of the applicable OS -Product Microsoft grants you a license to use the OS Components -under the terms and conditions of the OS Product EULA for the applicable -OS Product (which are hereby incorporated by reference) and the terms -and conditions set forth in this Supplemental EULA, provided that you -comply with all such terms and conditions. To the extent that any terms -in this Supplemental EULA conflict with terms in the applicable OS -Product EULA, the terms of this Supplemental EULA control solely with -respect to the OS Components. -Additional Rights and Limitations. -*If you have multiple validly licensed copies of the applicable OS -Product(s), you may reproduce, install and use one copy of the OS -Components as part of such applicable OS Product(s) on all of your -computers running validly licensed copies of the OS Product(s) -provided that you use such additional copies of the OS Components -in accordance with the terms and conditions above. You may not -disclose the results of any benchmark test of the .NET Framework -component of the OS Components to any third party without Microsoft's -prior written approval. Microsoft retains all right, title and -interest in and to the OS Components. All rights not expressly granted -are reserved by Microsoft. -IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY MICROSOFT OR ANY -OF ITS WHOLLY OWNED SUBSIDIARIES, THE LIMITED WARRANTY (IF ANY) -INCLUDED IN THE APPLICABLE OS PRODUCT EULA APPLIES TO THE OS COMPONENTS -PROVIDED THE OS COMPONENTS HAVE BEEN LICENSED BY YOU WITHIN THE TERM OF -THE LIMITED WARRANTY IN THE APPLICABLE OS PRODUCT EULA. HOWEVER, THIS -SUPPLEMENTAL EULA DOES NOT EXTEND THE TIME PERIOD FOR WHICH THE LIMITED -WARRANTY IS PROVIDED. -IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY AN ENTITY OTHER THAN -MICROSOFT OR ANY OF ITS WHOLLY OWNED SUBSIDIARIES, MICROSOFT DISCLAIMS -ALL WARRANTIES WITH RESPECT TO THE OS COMPONENTS AS FOLLOWS: -DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE -LAW, MICROSOFT AND ITS SUPPLIERS PROVIDE TO YOU THE OS COMPONENTS, AND -ANY (IF ANY) SUPPORT SERVICES RELATED TO THE OS COMPONENTS ("SUPPORT -SERVICES") AS IS AND WITH ALL FAULTS; and Microsoft and its suppliers -hereby disclaim with respect to THE os COMPONENTS AND SUPPORT SERVICES -all warranties and conditions, whether express, implied or statutory, -including, but not limited to, any (if any) warranties or conditions -of OR RELATED TO: TITLE, NON-INFRINGEMENT, merchantability, fitness -for a particular purpose, lack of viruses, accuracy or completeness -of responses, results, lack of negligence or lack of workmanlike effort, -QUIET ENJOYMENT, QUIET POSSESSION, AND CORRESPONDENCE TO DESCRIPTION. -The entire risk arising out of use or performance of the OS Components -AND ANY SUPPORT SERVICES remains with you. -EXCLUSION OF INCIDENTAL, CONSEQUENTIAL AND CERTAIN OTHER DAMAGES. To -the maximum extent permitted by applicable law, in no event shall -Microsoft or its suppliers be liable for any special, incidental, -indirect, or consequential damages whatsoever (including, but not -limited to, damages for: loss of profits, LOSS OF confidential or -other information, business interruption, personal injury, loss of -privacy, failure to meet any duty (including of good faith or of -reasonable care), negligence, and any other pecuniary or other loss -whatsoever) arising out of or in any way related to the use of or -inability to use the OS Components OR THE SUPPORT SERVICES, OR the -provision of or failure to provide Support Services, or otherwise -under or in connection with any provision of this Supplemental EULA, -even if Microsoft or any supplier has been advised of the possibility -of such damages. -LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT -YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT -LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL -DAMAGES), THE ENTIRE LIABILITY OF MICROSOFT AND ANY OF ITS SUPPLIERS -UNDER ANY PROVISION OF THIS SUPPLEMENTAL EULA AND YOUR EXCLUSIVE -REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF -THE AMOUNT ACTUALLY PAID BY YOU FOR THE OS COMPONENTS OR U.S.$5.00. -THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY -FAILS ITS ESSENTIAL PURPOSE. - -Si vous avez acquis votre produit Microsoft au CANADA, le texte suivant -vous concerne : -SI LE PRODUIT OS APPLICABLE VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR -MICROSOFT OU PAR L'UNE QUELCONQUE DE SES FILIALES À 100%, LA GARANTIE -LIMITÉE (SI ELLE EXISTE) APPLICABLE EN VERTU DU CONTRAT DE LICENCE -UTILISATEUR FINAL (« CLUF ») RELATIF À CE PRODUIT OS S'APPLIQUE AUX -COMPOSANTS SYSTÈME D'EXPLOITATION DE MICROSOFT Y COMPRIS TOUTE -DOCUMENTATION « EN LIGNE » OU SOUS FORME ÉLECTRONIQUE (LES « -COMPOSANTS OS »), À CONDITION QUE CEUX-CI VOUS AIENT ÉTÉ CONCÉDÉS -SOUS LICENCE PENDANT LA DURÉE DE LA GARANTIE LIMITÉE DU CLUF RELATIF -AU PRODUIT OS APPLICABLE. LE PRÉSENT CLUF SUPPLÉMENTAIRE N'A PAS POUR -EFFET DE PROROGER LA DURÉE DE CETTE GARANTIE LIMITÉE. -SI LE PRODUIT OS VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR UNE ENTITÉ AUTRE -QUE MICROSOFT OU QUE L'UNE QUELCONQUE DE SES FILIALES À 100%, -MICROSOFT EXCLUT TOUTE GARANTIE RELATIVE AUX COMPOSANTS OS COMME -CELA EST STIPULÉ CI-APRÈS : -EXCLUSION DE GARANTIE. DANS TOUTE LA MESURE PERMISE PAR LE DROIT -APPLICABLE, MICROSOFT ET SES FOURNISSEURS VOUS FOURNISSENT LES -COMPOSANTS OS, AINSI QUE, LE CAS ÉCHÉANT, TOUT SERVICE D'ASSISTANCE -RELATIF À CES COMPOSANTS OS (LES "SERVICES D'ASSISTANCE"), « COMME -TELS ET AVEC TOUS LEURS DEFAUTS ». EN OUTRE, MICROSOFT ET SES -FOURNISSEURS EXCLUENT PAR LES PRÉSENTES TOUTE AUTRE GARANTIE LÉGALE, -EXPRESSE OU IMPLICITE, RELATIVE AUX COMPOSANTS OS ET AUX SERVICES -D'ASSISTANCE, NOTAMMENT (LE CAS ÉCHÉANT), TOUTE GARANTIE : DE PROPRIÉTÉ, -D'ABSENCE DE CONTREFAÇON, DE QUALITÉ, D'ADAPTATION À UN USAGE -PARTICULIER, D'ABSENCE DE VIRUS, DE PRÉCISION, D'EXHAUSTIVITÉ DES -RÉPONSES, DES RÉSULTATS OBTENUS, D'ABSENCE DE NÉGLIGENCE, OU DE -DÉFAUT DE FABRICATION, DE JOUISSANCE PAISIBLE, D'ABSENCE DE TROUBLE -DE POSSESSION ET DE CONFORMITÉ À LA DESCRIPTION. VOUS ASSUMEZ -L'ENSEMBLE DES RISQUES DÉCOULANT DE L'UTILISATION OU DU FONCTIONNEMENT -DES COMPOSANTS OS ET DES SERVICES D'ASSISTANCE. -EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES ACCESSOIRES, INDIRECTS -ET CERTAINS AUTRES TYPES DE DOMMAGES. DANS TOUTE LA MESURE PERMISE -PAR LE DROIT APPLICABLE, MICROSOFT OU SES FOURNISSEURS NE POURRONT EN -AUCUN CAS ÊTRE TENUS RESPONSABLES DE TOUT DOMMAGE SPÉCIAL, ACCESSOIRE, -INCIDENT OU INDIRECT DE QUELQUE NATURE QUE CE SOIT (Y COMPRIS, MAIS -NON DE FACON LIMITATIVE, LES PERTES DE BÉNÉFICES, PERTES D'INFORMATIONS -CONFIDENTIELLES OU AUTRES INFORMATIONS, INTERRUPTIONS D'ACTIVITÉ, -PRÉJUDICES CORPORELS, ATTEINTES À LA VIE PRIVÉE, MANQUEMENT À TOUTE -OBLIGATION (NOTAMMENT L'OBLIGATION DE BONNE FOI ET DE DILIGENCE), -NÉGLIGENCE, ET POUR TOUTE PERTE PÉCUNIAIRE OU AUTRE DE QUELQUE NATURE -QUE CE SOIT), RÉSULTANT DE, OU RELATIFS A, L'UTILISATION OU -L'IMPOSSIBILITÉ D'UTILISER LES COMPOSANTS OS OU LES SERVICES D'ASSISTANCE, -OU LA FOURNITURE OU LE DÉFAUT DE FOURNITURE DES SERVICES D'ASSISTANCE, OU -AUTREMENT EN VERTU DE, OU RELATIVEMENT A, TOUTE DISPOSITION DE CE CLUF -SUPPLÉMENTAIRE, MÊME SI LA SOCIÉTÉ MICROSOFT OU UN QUELCONQUE FOURNISSEUR -A ÉTÉ PRÉVENU DE L'ÉVENTUALITÉ DE TELS DOMMAGES. -LIMITATION DE RESPONSABILITÉ ET RECOURS. NONOBSTANT TOUT DOMMAGE QUE VOUS -POURRIEZ SUBIR POUR QUELQUE MOTIF QUE CE SOIT (NOTAMMENT TOUS LES DOMMAGES -ÉNUMÉRÉS CI-DESSUS ET TOUS LES DOMMAGES DIRECTS OU GÉNÉRAUX), L'ENTIÈRE -RESPONSABILITÉ DE MICROSOFT ET DE L'UN QUELCONQUE DE SES FOURNISSEURS AU -TITRE DE TOUTE STIPULATION DE CE CLUF SUPPLÉMENTAIRE ET VOTRE SEUL RECOURS -EN CE QUI CONCERNE TOUS LES DOMMAGES PRÉCITÉS NE SAURAIENT EXCÉDER LE -MONTANT QUE VOUS AVEZ EFFECTIVEMENT PAYÉ POUR LES COMPOSANTS OS OU 5 DOLLARS -US (US$ 5,00), SELON LE PLUS ÉLEVÉ DES DEUX MONTANTS. LES PRÉSENTES -LIMITATIONS ET EXCLUSIONS DEMEURERONT APPLICABLES DANS TOUTE LA MESURE -PERMISE PAR LE DROIT APPLICABLE QUAND BIEN MÊME UN QUELCONQUE REMÈDE À UN -QUELCONQUE MANQUEMENT NE PRODUIRAIT PAS D'EFFET. -La présente Convention est régie par les lois de la province d'Ontario, -Canada. Chacune des parties à la présente reconnaît irrévocablement la -compétence des tribunaux de la province d'Ontario et consent à instituer -tout litige qui pourrait découler de la présente auprès des tribunaux -situés dans le district judiciaire de York, province d'Ontario. -Au cas où vous auriez des questions concernant cette licence ou que vous -désiriez vous mettre en rapport avec Microsoft pour quelque raison que -ce soit, veuillez contacter la succursale Microsoft desservant votre -pays, ou écrire à : Microsoft Sales Information Center, One Microsoft -Way, Redmond, Washington 98052-6399. - -The following software may be included in this product: Ispell W?rterbuch igerman98; Use of any of this software is governed by the terms of the license below: -Bjoern Jacke -German Dictionaries igerman98 -OASIS distribution license agreement 0.1 from 2005-11-10 -Without any modifications this dictionary may be distributed with programs that support the OASIS Open Document Format for Office Applications and whose PRIMARY format for saving documents is the Open Document Format. -This requires that all licenses and copyright files are also distributed together with the package the dictionary is shipped with. -Any modifications of the dictionary files are not allowed for this agreement, modifications require the use of the GNU GENERAL PUBLIC LICENSE. -If you have questions or don't get along with this, send me your comments/questions/ideas to Bjoern Jacke - -The following software may be included in this product: WordNet Release 2.1; Use of any of this software is governed by the terms of the license below: -Princeton University -WordNet 2.1 -WordNet 2.1 Copyright 2005 by Princeton University. -This software and database is being provided to you, the LICENSEE, by Princeton University under the following license. By obtaining, using and/or copying this software and database, you agree that you have read, understood, and will comply with these terms and conditions.: -Permission to use, copy, modify and distribute this software and database and its documentation for any purpose and without fee or royalty is hereby granted, provided that you agree to comply with the following copyright notice and statements, including the disclaimer, and that the same appear on ALL copies of the software, database and documentation, including modifications that you make for internal use or for distribution. -WordNet 2.1 Copyright 2005 by Princeton University. All rights reserved. -THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. -The name of Princeton University or Princeton may not be used in advertising or publicity pertaining to distribution of the software and/or database. Title to copyright in this software, database and any associated documentation shall at all times remain with Princeton University and LICENSEE agrees to preserve same. - -The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below: -Bitstream, Inc. -Bitstream Vera Fonts -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fontsâ€ï¾) and associated documentation files (the “Font Softwareâ€ï¾), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “BitstreamÃ¢â‚¬ï¾ or the word “Veraâ€ï¾. - -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream VeraÃ¢â‚¬ï¾ names. - -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. -Arev Fonts Copyright -Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Tavmjong Bah" or the word "Arev". -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Tavmjong Bah Arev" names. -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. -Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. - -The following software may be included in this product: Liberation Fonts; Use of any of this software is governed by the terms of the license below: -RedHat, Inc. -Liberation Fonts -refer to GNU General Public License and the following terms: -LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE -This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this collective work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as our set forth in this End User License Agreement. -1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: -1) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -2) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. -2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. -3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. -5. Export Control. As required by U.S. law, Client represents and warrants that it: (a) understands that the Software is subject to export controls under the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); (c) will not export, re-export, or transfer the Software to any prohibited destination, entity, or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; (d) will not use or transfer the Software for use in any sensitive nuclear, chemical or biological weapons, or missile technology end-uses unless authorized by the U.S. Government by regulation or specific license; (e) understands and agrees that if it is in the United States and exports or transfers the Software to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and address (including country) of each transferee; and (f) understands that countries other than the United States may restrict the import, use, or export of encryption products and that it shall be solely responsible for compliance with any such import, use, or export restrictions. -6. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. -Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. - -The following software may be included in this product: MathML DTD; Use of any of this software is governed by the terms of the license below: -World Wide Web Consortium (W3C) -MathML DTD -W3C® SOFTWARE NOTICE AND LICENSE -Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/ -This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions: -Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make: -1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. -2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" -3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. -The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders. - - -The following software may be included in this product: NSIS; Use of any of this software is governed by the terms of the license below: -Nullsoft, Inc. -NSIS -Copyright (C) 1999-2003 Nullsoft, Inc. -This license applies to everything in the NSIS package, except where otherwise noted. -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below: -Adobe -PostScript(R) AFM files - -Adobe Core 35 AFM Files with 314 Glyph Entries -This file and the 35 PostScript(R) AFM files it accompanies may be used, copied, and distributed for any purpose and without charge, with or without modification, provided that all copyright notices are retained; that the AFM files are not distributed without this file; that all modifications to this file or any of the AFM files are prominently noted in the modified file(s); and that this paragraph is not modified. Adobe Systems has no responsibility or obligation to support the use of the AFM files. - -The following software may be included in this product: Antigrain; Use of any of this software is governed by the terms of the license below: -Axim Shemanarev -Antigrain - -Anti-Grain Geometry - Version 2.0 -Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) -Permission to copy, use, modify, sell and distribute this software is granted provided this copyright notice appears in all copies. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. - -The following software may be included in this product: beanshell; Use of any of this software is governed by the terms of the license below: -Pat Niemeyer -beanshell -jump to LGPL - -/***************************************************************************** - * * - * This file is part of the BeanShell Java Scripting distribution. * - * Documentation and updates may be found at http://www.beanshell.org/ * - * * - * Sun Public License Notice: * - * * - * The contents of this file are subject to the Sun Public License Version * - * 1.0 (the "License"); you may not use this file except in compliance with * - * the License. A copy of the License is available at http://www.sun.com * - * * - * The Original Code is BeanShell. The Initial Developer of the Original * - * Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright * - * (C) 2000. All Rights Reserved. * - * * - * GNU Public License Notice: * - * * - * Alternatively, the contents of this file may be used under the terms of * - * the GNU Lesser General Public License (the "LGPL"), in which case the * - * provisions of LGPL are applicable instead of those above. If you wish to * - * allow use of your version of this file only under the terms of the LGPL * - * and not to allow others to use your version of this file under the SPL, * - * indicate your decision by deleting the provisions above and replace * - * them with the notice and other provisions required by the LGPL. If you * - * do not delete the provisions above, a recipient may use your version of * - * this file under either the SPL or the LGPL. * - * * - * Patrick Niemeyer (pat@pat.net) * - * Author of Learning Java, O'Reilly & Associates * - * http://www.pat.net/~pat/ * - * * - *****************************************************************************/ - -The following software may be included in this product: C++ Boost Library; Use of any of this software is governed by the terms of the license below: -Boost.org -C++ Boost Library -Boost Software License - Version 1.0 - August 17th, 2003 -Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: -The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The following software may be included in this product: Cairo; Use of any of this software is governed by the terms of the license below: -Cairographics.org -Cairo (B) -jump to MPL 1.1 - -The following software may be included in this product:Charis SIL v4; Use of any of this software is governed by the terms of the license below: -SIL International -Charis SIL v.4 - -This Font Software is Copyright (c) 1997-2006, SIL International (http://scripts.sil.org/). -All Rights Reserved. -"Charis SIL" is a Reserved Font Name for this Font Software. -"SIL" is a Reserved Font Name for this Font Software. -This Font Software is licensed under the SIL Open Font License, Version 1.0. -No modification of the license is permitted, only verbatim copy is allowed. -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005 ------------------------------------------------------------ -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font projects, to support the font creation efforts of academic and linguistic communities, and to provide an open framework in which fonts may be shared and improved in partnership with others. -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and sold with any software provided that the font names of derivative works are changed. The fonts and derivatives, however, cannot be released under any other type of license. -DEFINITIONS -"Font Software" refers to any and all of the following: -- font files -- data files -- source code -- build scripts -- documentation -"Reserved Font Name" refers to the Font Software name as seen by users and any other names as specified after the copyright statement. -"Standard Version" refers to the collection of Font Software components as distributed by the Copyright Holder. -"Modified Version" refers to any derivative font software made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Standard Version, by changing formats or by porting the Font Software to a new environment. -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: -1) Neither the Font Software nor any of its individual components, in Standard or Modified Versions, may be sold by itself. -2) Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. -3) No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole, unless explicit written permission is granted by the Copyright Holder. This restriction applies to all references stored in the Font Software, such as the font menu name and other font description fields, which are used to differentiate the font from others. -4) The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or with their explicit written permission. -5) The Font Software, modified or unmodified, in part or in whole, must be distributed using this license, and may not be distributed under any other license. -TERMINATION -This license becomes null and void if any of the above conditions are not met. -DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -The following software may be included in this product:KDE Crystal theme icons; Use of any of this software is governed by the terms of the license below: -KDE Artists: -KDE Crystal theme icons -KDE Crystal theme icons. -Copyright (C) 2002 and following years KDE Artists This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 2.1 of the License. -License - -The Crystal Project are released under LGPL. - -GNU General Public License. - - 0. - - This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other authorized party -saying it may be distributed under the terms of this Lesser General Public -License (also called "this License"). Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data prepared -so as to be conveniently linked with application programs (which use some of -those functions and data) to form executables. - - The "Library", below, refers to any such software library or work which -has been distributed under these terms. A "work based on the Library" means -either the Library or any derivative work under copyright law: that is to say, a -work containing the Library or a portion of it, either verbatim or with -modifications and/or translated straightforwardly into another language. -(Hereinafter, translation is included without limitation in the term -"modification".) - - "Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the source -code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of running a -program using the Library is not restricted, and output from such a program is -covered only if its contents constitute a work based on the Library (independent -of the use of the Library in a tool for writing it). Whether that is true -depends on what the Library does and what the program that uses the Library does. - 1. - - You may copy and distribute verbatim copies of the Library's complete -source code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and distribute a copy of this License along -with the Library. - - You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. - 2. - - You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - 1. The modified work must itself be a software library. - 2. You must cause the files modified to carry prominent notices stating -that you changed the files and the date of any change. - 3. You must cause the whole of the work to be licensed at no charge to -all third parties under the terms of this License. - 4. If a facility in the modified Library refers to a function or a -table of data to be supplied by an application program that uses the facility, -other than as an argument passed when the facility is invoked, then you must -make a good faith effort to ensure that, in the event an application does not -supply such function or table, the facility still operates, and performs -whatever part of its purpose remains meaningful. - - (For example, a function in a library to compute square roots has a -purpose that is entirely well-defined independent of the application. Therefore, -Subsection 2d requires that any application-supplied function or table used by -this function must be optional: if the application does not supply it, the -square root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Library. - - In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of a storage -or distribution medium does not bring the other work under the scope of this -License. - 3. - - You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. (If -a newer version than version 2 of the ordinary GNU General Public License has -appeared, then you can specify that version instead if you wish.) Do not make -any other change in these notices. - - Once this change is made in a given copy, it is irreversible for that -copy, so the ordinary GNU General Public License applies to all subsequent -copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of the -Library into a program that is not a library. - 4. - - You may copy and distribute the Library (or a portion or derivative of it, -under Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source code from -the same place satisfies the requirement to distribute the source code, even -though third parties are not compelled to copy the source along with the object -code. - 5. - - A program that contains no derivative of any portion of the Library, but -is designed to work with the Library by being compiled or linked with it, is -called a "work that uses the Library". Such a work, in isolation, is not a -derivative work of the Library, and therefore falls outside the scope of this -License. - However, linking a "work that uses the Library" with the Library creates -an executable that is a derivative of the Library (because it contains portions -of the Library), rather than a "work that uses the library". The executable is -therefore covered by this License. Section 6 states terms for distribution of -such executables. - - When a "work that uses the Library" uses material from a header file that -is part of the Library, the object code for the work may be a derivative work of -the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if the -work is itself a library. The threshold for this to be true is not precisely -defined by law. - - If such an object file uses only numerical parameters, data structure -layouts and accessors, and small macros and small inline functions (ten lines or -less in length), then the use of the object file is unrestricted, regardless of -whether it is legally a derivative work. (Executables containing this object -code plus portions of the Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may distribute -the object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - 6. - - As an exception to the Sections above, you may also combine or link a -"work that uses the Library" with the Library to produce a work containing -portions of the Library, and distribute that work under terms of your choice, -provided that the terms permit modification of the work for the customer's own -use and reverse engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the Library -is used in it and that the Library and its use are covered by this License. You -must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - 1. Accompany the work with the complete corresponding machine-readable -source code for the Library including whatever changes were used in the work -(which must be distributed under Sections 1 and 2 above); and, if the work is an -executable linked with the Library, with the complete machine-readable "work -that uses the Library", as object code and/or source code, so that the user can -modify the Library and then relink to produce a modified executable containing -the modified Library. (It is understood that the user who changes the contents -of definitions files in the Library will not necessarily be able to recompile -the application to use the modified definitions.) . - 2. Use a suitable shared library mechanism for linking with the -Library. A suitable mechanism is one that (1) uses at run time a copy of the -library already present on the user's computer system, rather than copying -library functions into the executable, and (2) will operate properly with a -modified version of the library, if the user installs one, as long as the -modified version is interface-compatible with the version that the work was made -with. - 3. Accompany the work with a written offer, valid for at least three -years, to give the same user the materials specified in Subsection 6a, above, -for a charge no more than the cost of performing this distribution. - 4. If distribution of the work is made by offering access to copy from -a designated place, offer equivalent access to copy the above specified -materials from the same place. - 5. Verify that the user has already received a copy of these materials -or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the Library" -must include any data and utility programs needed for reproducing the executable -from it. However, as a special exception, the materials to be distributed need -not include anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the operating -system on which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license restrictions -of other proprietary libraries that do not normally accompany the operating -system. Such a contradiction means you cannot use both them and the Library -together in an executable that you distribute. - 7. - - You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities not -covered by this License, and distribute such a combined library, provided that -the separate distribution of the work based on the Library and of the other -library facilities is otherwise permitted, and provided that you do these two -things: - 1. - - Accompany the combined library with a copy of the same work based on -the Library, uncombined with any other library facilities. This must be -distributed under the terms of the Sections above. - 2. - - Give prominent notice with the combined library of the fact that -part of it is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - 8. - - You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense, link with, or distribute the Library is void, and will -automatically terminate your rights under this License. However, parties who -have received copies, or rights, from you under this License will not have their -licenses terminated so long as such parties remain in full compliance. - 9. - - You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Library -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Library (or any -work based on the Library), you indicate your acceptance of this License to do -so, and all its terms and conditions for copying, distributing or modifying the -Library or works based on it. - 10. - - Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor to -copy, distribute, link with or modify the Library subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties with this License. - 11. - - If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Library at all. -For example, if a patent license would not permit royalty-free redistribution of -the Library by all those who receive copies directly or indirectly through you, -then the only way you could satisfy both it and this License would be to refrain -entirely from distribution of the Library. - - If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, and -the section as a whole is intended to apply in other circumstances. - - It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any such -claims; this section has the sole purpose of protecting the integrity of the -free software distribution system which is implemented by public license -practices. Many people have made generous contributions to the wide range of -software distributed through that system in reliance on consistent application -of that system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot impose -that choice. - - This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - 12. - - If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Library under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - 13. - - The Free Software Foundation may publish revised and/or new versions of -the Lesser General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - - Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Library does not specify a license version number, you may choose any -version ever published by the Free Software Foundation. - 14. - - If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make exceptions -for this. Our decision will be guided by the two goals of preserving the free -status of all derivatives of our free software and of promoting the sharing and -reuse of software generally. - -No Warranty - - 15. - - Because the library is licensed free of charge, there is no warranty for -the library, to the extent permitted by applicable law. Except when otherwise -stated in writing the copyright holders and/or other parties provide the library -"as is" without warranty of any kind, either expressed or implied, including, -but not limited to, the implied warranties of merchantability and fitness for a -particular purpose. The entire risk as to the quality and performance of the -library is with you. Should the library prove defective, you assume the cost of -all necessary servicing, repair or correction. - 16. - - In no event unless required by applicable law or agreed to in writing will -any copyright holder, or any other party who may modify and/or redistribute the -library as permitted above, be liable to you for damages, including any general, -special, incidental or consequential damages arising out of the use or inability -to use the library (including but not limited to loss of data or data being -rendered inaccurate or losses sustained by you or third parties or a failure of -the library to operate with any other software), even if such holder or other -party has been advised of the possibility of such damages. +JDOM + The following software may be included in this product: JDOM. Use of + any of this software is governed by the terms of the license below: + Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights + reserved. -The following software may be included in this product: libcurl; Use of any of this software is governed by the terms of the license below: -Daniel Stenberg -libcurl -Copyright (C) 1998-2001, Daniel Stenberg, , et al. -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -In order to be useful for every potential user, the curl and libcurl are dual-licensed under the MPL and the MIT/X-derivate licenses. -You may opt to use, copy, modify, merge, publish, distribute and/or sell copies of the Software, and permit persons to whom the Software is furnished to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the license texts. -As a courtesy to the open-source and free software community, we ask you to dual-license any modifications that you make as well, under the terms of this document. -Please remember to always keep the licensing information included in individual source files up-to-date, so as to avoid misleading anyone as to the status of these files. -I will use a submission policy according to which I will only enter contributions into the CVS tree if the contributor agrees to both licenses and this dual-license approach. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: -The following software may be included in this product: Afrikaans dictionary; Use of any of this software is governed by the terms of the license below: -Friedel Wolff -Afrikaans dictionary + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. -Jump to LGPL + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions, and the disclaimer that follows these + conditions in the documentation and/or other materials provided with + the distribution. -The following software may be included in this product: Stavekontrolden (Danish Spellchecker); Use of any of this software is governed by the terms of the license below: -Finn Gruwier Larsen -Stavekontrolden (Danish Spellchecker) (LGPL v2.1) + 3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. -jump to GNU Lesser General Public License + 4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission from + the JDOM Project Management <request_AT_jdom_DOT_org>. -The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below: -Jaak Pruulmann -Estonian dictionaries + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the + software itself an acknowledgement equivalent to the following: -Gnu Lesser General Public License + "This product includes software developed by the JDOM Project + (http://www.jdom.org/)." -The following software may be included in this product: French dictionary; Use of any of this software is governed by the terms of the license below: -dico.savant@free.fr -French dictionary + Alternatively, the acknowledgment may be graphical using the logos + available at http://www.jdom.org/images/logos. -jump to Mozilla Public License + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -The following software may be included in this product: Italian dictionary; Use of any of this software is governed by the terms of the license below: -Davide Prina -Italian dictionary + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally created + by Jason Hunter <jhunter_AT_jdom_DOT_org> and Brett McLaughlin + <brett_AT_jdom_DOT_org>. For more information on the JDOM Project, + please see http://www.jdom.org/. -Jump to GPL +libcurl -The following software may be included in this product: MySpell-ku (Kurdish Spellchecker); Use of any of this software is governed by the terms of the license below: -Erdal Ronahi -MySpell-ku (Kurdish Spellchecker) (LGPL v2.1) + The following software may be included in this product: libcurl. Use + of any of this software is governed by the terms of the license below: -jump to GNU Lesser General Public License + Copyright (c) 1996 - 2009, Daniel Stenberg, <daniel@haxx.se>. -The following software may be included in this product: Lithuanian spelling dictionary; Use of any of this software is governed by the terms of the license below: -Albertas Agejevas -Lithuaninian spelling dictionary + All rights reserved. -Copyright (c) Albertas Agejevas , 2000, 2001 -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the Albertas Agejevas nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. -The following software may be included in this product: 'Nepali dictionares; Use of any of this software is governed by the terms of the license below: -Madan Puraskar Pustkalaya -Nepali dictionaries + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -jump to GNU Lesser General Public License + Except as contained in this notice, the name of a copyright holder + shall not be used in advertising or otherwise to promote the sale, use + or other dealings in this Software without prior written authorization + of the copyright holder. -The following software may be included in this product: Polish spelling dictionary; Use of any of this software is governed by the terms of the license below: -Marek Futrega -Polish spelling dictionary +libtextcat -jump to Mozilla Public License + The following software may be included in this product: libtextcat. + Use of any of this software is governed by the terms of the license + below: -The following software may be included in this product: Slovak dictionary; Use of any of this software is governed by the terms of the license below: -Zdenko Podobny -Slovak dictionary + Copyright (c) 2003, WiseGuys Internet B.V. -jump to Mozilla Public License + All rights reserved. -The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below: -Ales Kosir -Slovenian spellcheck dictionary + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: -Gnu Lesser General Public License + - Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -The following software may be included in this product: dictionaries for South African English; Use of any of this software is governed by the terms of the license below: -David Bartlett and Andrew Brown -dictionaries for South African English + - Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -jump to GNU Lesser General Public License + - Neither the name of the WiseGuys Internet B.V. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -The following software may be included in this product: Swedish dictionary; Use of any of this software is governed by the terms of the license below: -Göran Anderson -Swedish dictionary + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -jump to GNU Lesser General Public License +libwpd -The following software may be included in this product: expat XML Parser Toolkit; Use of any of this software is governed by the terms of the license below: -James Clark -expat XML Parser Toolkit -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001, 2002, 2003 Expat maintainers. -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The following software may be included in this product: Freetype; Use of any of this software is governed by the terms of the license below: -Freetype Project -Freetype Library - -Legal Terms -=========== - -0. Definitions --------------- -Throughout this license, the terms `package', `FreeType Project', and `FreeType archive' refer to the set of files originally distributed by the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the `FreeType Project', be they named as alpha, beta or final release. -`You' refers to the licensee, or person using the project, where `using' is a generic term including compiling the project's source code as well as linking it to form a `program' or `executable'. This program is referred to as `a program using the FreeType engine'. -This license applies to all files distributed in the original FreeType Project, including all source code, binaries and documentation, unless otherwise stated in the file in its original, unmodified form as distributed in the original archive. If you are unsure whether or not a particular file is covered by this license, you must contact us to verify this. -The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved except as specified below. - -1. No Warranty --------------- -THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. - -2. Redistribution ------------------ -This license grants a worldwide, royalty-free, perpetual and irrevocable right and license to use, execute, perform, compile, display, copy, create derivative works of, distribute and sublicense the FreeType Project (in both source and object code forms) and derivative works thereof for any purpose; and to authorize others to exercise some or all of the rights granted herein, subject to the following conditions: -o Redistribution of source code must retain this license file (`FTL.TXT') unaltered; any additions, deletions or changes to the original files must be clearly indicated in accompanying documentation. The copyright notices of the unaltered, original files must be preserved in all copies of source files. -o Redistribution in binary form must provide a disclaimer that states that the software is based in part of the work of the FreeType Team, in the distribution documentation. We also encourage you to put an URL to the FreeType web page in your documentation, though this isn't mandatory. - -These conditions apply to any software derived from or based on the FreeType Project, not just the unmodified files. If you use our work, you must acknowledge us. However, no fee need be paid to us. - -3. Advertising --------------- -Neither the FreeType authors and contributors nor you shall use the name of the other for commercial, advertising, or promotional purposes without specific prior written permission. -We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or advertising materials: `FreeType Project', `FreeType Engine', `FreeType library', or `FreeType Distribution'. -As you have not signed this license, you are not required to accept it. However, as the FreeType Project is copyrighted material, only this license, or another one contracted with the authors, grants you the right to use, distribute, and modify it. Therefore, by using, distributing, or modifying the FreeType Project, you indicate that you understand and accept all the terms of this license. - -4. Contacts ------------ -There are two mailing lists related to FreeType: -o freetype@freetype.org -Discusses general use and applications of FreeType, as well as future and wanted additions to the library and distribution. If you are looking for support, start in this list if you haven't found anything to help you in the documentation. -o devel@freetype.org -Discusses bugs, as well as engine internals, design issues, specific licenses, porting, etc. -o http://www.freetype.org -Holds the current FreeType web page, which will allow you to download our latest development version and read online documentation. - -You can also contact us individually at: - -David Turner -Robert Wilhelm -Werner Lemberg - -The following software may be included in this product: GTK+ (The Gimp Toolkit); Use of any of this software is governed by the terms of the license below: -gimp.org -The Gimp Toolkit (GTK+) -jump to LGPL + The following software may be included in this product: libwpd. Use of + any of this software is governed by the terms of the license below: -The following software may be included in this product:HSQL Database Engine; Use of any of this software is governed by the terms of the license below: -Thomas Mueller and the Hypersonic SQL Group: -HSQLDB + See LGPL Version 2.1 below -ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt") -For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group: - -Copyright (c) 1995-2000 by the Hypersonic SQL Group. -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -Neither the name of the Hypersonic SQL Group nor the names of its -contributors may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -This software consists of voluntary contributions made by many individuals on behalf of the -Hypersonic SQL Group. -For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt): -Copyright (c) 2001-2004, The HSQL Development Group -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -Neither the name of the HSQL Development Group nor the names of its -contributors may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below: -Bence Nagy -Hungarian hyphenation dictionary - -Lesser Gnu Library License - -The following software may be included in this product: Lithuanian pattern for hyphenation; Use of any of this software is governed by the terms of the license below: -n/a -Lithuanian pattern for hyphenation - -jump to the LaTeX Project Public License - -The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below: -Adam Polaczynski -Polish hyphenation dictionary - -Lesser Gnu Library License - -The following software may be included in this product: Slovenian pattern for hyphenation; Use of any of this software is governed by the terms of the license below: -Matjaz Vrecko -Slovenian pattern for hyphenation - -Lesser Gnu Library License - -The following software may be included in this product: Zulu hyphenation dictionary; Use of any of this software is governed by the terms of the license below: -Friedel Wolff -Zulu hyphenation dictionary - -Lesser Gnu Library License - -The following software may be included in this product: ICU; Use of any of this software is governed by the terms of the license below: -International Business Machine Corporation (IBM) -ICU -ICU License - ICU 1.8.1 and later -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1995-2002 International Business Machines Corporation and others -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. - --------------------------------------------------------------------------------- -All trademarks and registered trademarks mentioned herein are the property of their respective owners. - -The following software may be included in this product: JDOM; Use of any of this software is governed by the terms of the license below: -Jason Hunter, Brett McLaughlin -JDOM -Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. -3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact . -4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . -In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: -"This product includes software developed by the JDOM Project (http://www.jdom.org/)." -Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see . - -The following software may be included in this product: IJG JPEG Library; Use of any of this software is governed by the terms of the license below: -Independent JPEG Group (IJG) -IJG JPEG Library -LEGAL ISSUES -============ - -In plain English: - -1. We don't promise that this software works. (But if you find any bugs, - please let us know!) -2. You can use this software for whatever you want. You don't have to pay us. -3. You may not pretend that you wrote this software. If you use it in a - program, you must acknowledge somewhere in your documentation that - you've used the IJG code. - -In legalese: - -The authors make NO WARRANTY or representation, either express or implied, -with respect to this software, its quality, accuracy, merchantability, or -fitness for a particular purpose. This software is provided "AS IS", and you, -its user, assume the entire risk as to its quality and accuracy. - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -Permission is hereby granted to use, copy, modify, and distribute this -software (or portions thereof) for any purpose, without fee, subject to these -conditions: -(1) If any part of the source code for this software is distributed, then this -README file must be included, with this copyright and no-warranty notice -unaltered; and any additions, deletions, or changes to the original files -must be clearly indicated in accompanying documentation. -(2) If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the work of -the Independent JPEG Group". -(3) Permission for use of this software is granted only if the user accepts -full responsibility for any undesirable consequences; the authors accept -NO LIABILITY for damages of any kind. - -These conditions apply to any software derived from or based on the IJG code, -not just to the unmodified library. If you use our work, you ought to -acknowledge us. - -Permission is NOT granted for the use of any IJG author's name or company name -in advertising or publicity relating to this software or products derived from -it. This software may be referred to only as "the Independent JPEG Group's -software". - -We specifically permit and encourage the use of this software as the basis of -commercial products, provided that all warranty or liability claims are -assumed by the product vendor. - - -ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, -sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. -ansi2knr.c is NOT covered by the above copyright and conditions, but instead -by the usual distribution terms of the Free Software Foundation; principally, -that you must include source code if you redistribute it. (See the file -ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part -of any program generated from the IJG code, this does not limit you more than -the foregoing paragraphs do. - -The Unix configuration script "configure" was produced with GNU Autoconf. -It is copyright by the Free Software Foundation but is freely distributable. -The same holds for its supporting scripts (config.guess, config.sub, -ltconfig, ltmain.sh). Another support script, install-sh, is copyright -by M.I.T. but is also freely distributable. - -It appears that the arithmetic coding option of the JPEG spec is covered by -patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot -legally be used without obtaining one or more licenses. For this reason, -support for arithmetic coding has been removed from the free JPEG software. -(Since arithmetic coding provides only a marginal gain over the unpatented -Huffman mode, it is unlikely that very many implementations will support it.) -So far as we are aware, there are no patent restrictions on the remaining -code. - -The IJG distribution formerly included code to read and write GIF files. -To avoid entanglement with the Unisys LZW patent, GIF reading support has -been removed altogether, and the GIF writer has been simplified to produce -"uncompressed GIFs". This technique does not use the LZW algorithm; the -resulting GIF files are larger than usual, but are readable by all standard -GIF decoders. - -We are required to state that - "The Graphics Interchange Format(c) is the Copyright property of - CompuServe Incorporated. GIF(sm) is a Service Mark property of - CompuServe Incorporated." - - -The following software may be included in this product: libegg; Use of any of this software is governed by the terms of the license below: -Anders Carlson -libegg -jump to LGPL - -The following software may be included in this product: libmspack; Use of any of this software is governed by the terms of the license below: -Stuart Caie -libmspack -jump to LGPL - -The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below: -Dave Beckett -librdf -jump to LGPL - -The following software may be included in this product: GNU ISO C++ Library; Use of any of this software is governed by the terms of the license below: -Free Software Foundation, Inc. -GNU ISO C++ Library +libwpg -Jump to GPL -GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - -Additional License(s) + The following software may be included in this product: libwpg. Use of + any of this software is governed by the terms of the license below: -libstdc++: -// Explicit instantiation file. + See LGPL Version 2.1 below -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 -// Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. +libwps -// This library 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 General Public License for more details. + The following software may be included in this product: libwps. Use of + any of this software is governed by the terms of the license below: -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, -// USA. + See LGPL Version 2.1 below -// As a special exception, you may use this file as part of a free -software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you -compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be -covered by -// the GNU General Public License. +libxml2 -libgcc: -// -// ISO C++ 14882: -// + The following software may be included in this product: libxml2. Use + of any of this software is governed by the terms of the license below: -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. - Contributed by Jakub Jelinek . + Except where otherwise noted in the source code (e.g. the files + hash.c, list.c and the trio files, which are covered by a similar + license but with different Copyright notices) all the files are: - This file is part of GNU CC. + Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. - GNU CC is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: - GNU CC 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 General Public License for more details. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - You should have received a copy of the GNU General Public License - along with GNU CC; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR + ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/* As a special exception, if you link this library with other files, - some of which are compiled with GCC, to produce an executable, - this library does not by itself cause the resulting executable - to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why - the executable file might be covered by the GNU General Public -License. */ + Except as contained in this notice, the name of Daniel Veillard shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from him. -/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF - segment and dl_iterate_phdr to avoid register/deregister calls at - DSO load/unload. */ +libxslt + The following software may be included in this product: libxslt. Use + of any of this software is governed by the terms of the license below: + + License for libxslt except libexslt + + Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR + ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of Daniel Veillard shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from him. + + License for libexslt + + Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel + Veillard. All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of the authors shall not + be used in advertising or otherwise to promote the sale, use or other + dealings in this Software without prior written authorization from + him. -The following software may be included in this product: libtextcat; Use of any of this software is governed by the terms of the license below: -WiseGuys Internet B.V. -libtextcat +lpsolve -Copyright (c) 2003, WiseGuys Internet B.V. -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the WiseGuys Internet B.V. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + The following software may be included in this product: lpsolve. Use + of any of this software is governed by the terms of the license below: -The following software may be included in this product: libwpd; Use of any of this software is governed by the terms of the license below: -William LaChance -libwpd -jump to LGPL -Except where otherwise noted in the source code (trio files, hash.c and list.c) + See LGPL Version 2.1 below -The following software may be included in this product: libxml2; Use of any of this software is governed by the terms of the license below: -Daniel Veillard -libxml2 -Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. +Lucene -The following software may be included in this product: XML Security Library; Use of any of this software is governed by the terms of the license below: -Aleksey Sanin -XML Security Library + The following software may be included in this product: Lucene. Use of + any of this software is governed by the terms of the license below: -XML Security Library + Apache Lucene + Copyright 2006 The Apache Software Foundation -Use of any of this software is governed by the terms of the license below: + This product includes software developed by The Apache Software + Foundation (http://www.apache.org/). -Please note: We do not use all libraries of the project, but only: -- xmlsec-core; License: MIT -- xmlsec-nss; License: GPL + MPL + The snowball stemmers in contrib/snowball/src/java/net/sf/snowball + were developed by Martin Porter and Richard Boulton. The full snowball + package is available from http://snowball.tartarus.org/ -------------------------------------------------- -The MIT License + See Apache License Version 2.0 below -Copyright (c) +mdds -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: + The following software may be included in this product: mdds. Use of + any of this software is governed by the terms of the license below: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + Copyright (c) 2010 Kohei Yoshida -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -The GNU General Public License (GPL) -Version 2, June 1991 + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Preamble +Microsoft Visual C++ 2008 Runtime Libraries -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most -of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you can -do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show them -these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually -obtain patent licenses, in effect making the program proprietary. To prevent -this, we have made it clear that any patent must be licensed for everyone's free -use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. + The following software may be included in this product: Microsoft + Visual C++ 2008 Runtime Libraries. Use of any of this software is + governed by the terms of the license below: -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + MICROSOFT SOFTWARE LICENSE TERMS -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program or -work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included without -limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of any -warranty; and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating that -you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or -in part contains or is derived from the Program or any part thereof, to be -licensed as a whole at no charge to all third parties under the terms of this -License. - - c) If the modified program normally reads commands interactively when run, -you must cause it, when started running for such interactive use in the most -ordinary way, to print or display an announcement including an appropriate -copyright notice and a notice that there is no warranty (or else, saying that -you provide a warranty) and that users may redistribute the program under these -conditions, and telling the user how to view a copy of this License. (Exception: -if the Program itself is interactive but does not normally print such an -announcement, your work based on the Program is not required to print an -announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section -2) in object code or executable form under the terms of Sections 1 and 2 above -provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to -give any third party, for a charge no more than your cost of physically -performing source distribution, a complete machine-readable copy of the -corresponding source code, to be distributed under the terms of Sections 1 and 2 -above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to -distribute corresponding source code. (This alternative is allowed only for -noncommercial distribution and only if you received the program in object code -or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code distributed -need not include anything that is normally distributed (in either source or -binary form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component itself -accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source code -from the same place counts as distribution of the source code, even though third -parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or any -work based on the Program), you indicate your acceptance of this License to do -so, and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by third -parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed -on you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your -obligations under this License and any other pertinent obligations, then as a -consequence you may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by all those -who receive copies directly or indirectly through you, then the only way you -could satisfy both it and this License would be to refrain entirely from -distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and the -section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the -Program does not specify a version number of this License, you may choose any -version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. + MICROSOFT VISUAL C++ 2008 RUNTIME LIBRARIES (X86, IA64 AND X64), + SERVICE PACK 1 -NO WARRANTY + These license terms are an agreement between Microsoft Corporation (or + based on where you live, one of its affiliates) and you. Please read + them. They apply to the software named above, which includes the media + on which you received it, if any. The terms also apply to any + Microsoft -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE -PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED -IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS -IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT -NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY -TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF -THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS + o updates, -How to Apply These Terms to Your New Programs + o supplements, -If you develop a new program, and you want it to be of the greatest possible use -to the public, the best way to achieve this is to make it free software which -everyone can redistribute and change under these terms. + o Internet-based services, and -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. + o support services - one line to give the program's name and a brief idea of what it does. - Copyright (C) + for this software, unless other terms accompany those items. If so, + those terms apply. - This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) any -later version. + BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT + THEM, DO NOT USE THE SOFTWARE. - This program 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 General Public License for more details. + If you comply with these license terms, you have the rights below. - You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA + 1. INSTALLATION AND USE RIGHTS. You may install and use any number of + copies of the software on your devices. -Also add information on how to contact you by electronic and paper mail. + 2. SCOPE OF LICENSE. The software is licensed, not sold. This + agreement only gives you some rights to use the software. Microsoft + reserves all other rights. Unless applicable law gives you more rights + despite this limitation, you may use the software only as expressly + permitted in this agreement. In doing so, you must comply with any + technical limitations in the software that only allow you to use it in + certain ways. You may not -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: + o disclose the results of any benchmark tests of the software to any + third party without Microsoft's prior written approval; - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes -with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, -and you are welcome to redistribute it under certain conditions; type `show c' -for details. + o work around any technical limitations in the software; -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. + o reverse engineer, decompile or disassemble the software, except and + only to the extent that applicable law expressly permits, despite this + limitation; -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here is -a sample; alter the names: + o make more copies of the software than specified in this agreement or + allowed by applicable law, despite this limitation; - Yoyodyne, Inc., hereby disclaims all copyright interest - in the program `Gnomovision' (which makes passes at compilers) - written by James Hacker. + o publish the software for others to copy; - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice + o rent, lease or lend the software; -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may consider -it more useful to permit linking proprietary applications with the library. If -this is what you want to do, use the GNU Library General Public License instead -of this License. ----------------------------------------------------------- -Mozilla Public License Version 1.0 + o transfer the software or this agreement to any third party; or -1. Definitions. + o use the software for commercial software hosting services. - 1.1. "Contributor" means each entity that creates or contributes to the -creation of Modifications. + 3. BACKUP COPY. You may make one backup copy of the software. You may + use it only to reinstall the software. - 1.2. "Contributor Version" means the combination of the Original Code, -prior Modifications used by a Contributor, and the Modifications made by that -particular Contributor. + 4. DOCUMENTATION. Any person that has valid access to your computer or + internal network may copy and use the documentation for your internal, + reference purposes. - 1.3. "Covered Code" means the Original Code or Modifications or the -combination of the Original Code and Modifications, in each case including -portions thereof. + 5. EXPORT RESTRICTIONS. The software is subject to United States + export laws and regulations. You must comply with all domestic and + international export laws and regulations that apply to the software. + These laws include restrictions on destinations, end users and end + use. For additional information, see www.microsoft.com/exporting. - 1.4. "Electronic Distribution Mechanism" means a mechanism generally -accepted in the software development community for the electronic transfer of data. + 6. SUPPORT SERVICES. Because this software is "as is," we may not + provide support services for it. - 1.5. "Executable" means Covered Code in any form other than Source Code. + 7. ENTIRE AGREEMENT. This agreement, and the terms for supplements, + updates, Internet-based services and support services that you use, + are the entire agreement for the software and support services. - 1.6. "Initial Developer" means the individual or entity identified as the -Initial Developer in the Source Code notice required by Exhibit A. + 8. APPLICABLE LAW. - 1.7. "Larger Work" means a work which combines Covered Code or portions -thereof with code not governed by the terms of this License. + a. United States. If you acquired the software in the United States, + Washington state law governs the interpretation of this agreement and + applies to claims for breach of it, regardless of conflict of laws + principles. The laws of the state where you live govern all other + claims, including claims under state consumer protection laws, unfair + competition laws, and in tort. - 1.8. "License" means this document. + b. Outside the United States. If you acquired the software in any + other country, the laws of that country apply. - 1.9. "Modifications" means any addition to or deletion from the substance -or structure of either the Original Code or any previous Modifications. When -Covered Code is released as a series of files, a Modification is: + 9. LEGAL EFFECT. This agreement describes certain legal rights. You + may have other rights under the laws of your country. You may also + have rights with respect to the party from whom you acquired the + software. This agreement does not change your rights under the laws of + your country if the laws of your country do not permit it to do so. - A. Any addition to or deletion from the contents of a file -containing Original Code or previous Modifications. + 10. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED "AS-IS." YOU BEAR + THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, + GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS + UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE + EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. - B. Any new file that contains any part of the Original Code or -previous Modifications. + 11. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN + RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO + U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING + CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES. - 1.10. "Original Code" means Source Code of computer software code which is -described in the Source Code notice required by Exhibit A as Original Code, and -which, at the time of its release under this License is not already Covered Code -governed by this License. + This limitation applies to - 1.11. "Source Code" means the preferred form of the Covered Code for -making modifications to it, including all modules it contains, plus any -associated interface definition files, scripts used to control compilation and -installation of an Executable, or a list of source code differential comparisons -against either the Original Code or another well known, available Covered Code -of the Contributor's choice. The Source Code can be in a compressed or archival -form, provided the appropriate decompression or de-archiving software is widely -available for no charge. + o anything related to the software, services, content (including code) + on third party Internet sites, or third party programs; and - 1.12. "You" means an individual or a legal entity exercising rights under, -and complying with all of the terms of, this License or a future version of this -License issued under Section 6.1. For legal entities, "You" includes any entity -which controls, is controlled by, or is under common control with You. For -purposes of this definition, "control" means (a) the power, direct or indirect, -to cause the direction or management of such entity, whether by contract or -otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding -shares or beneficial ownership of such entity. + o claims for breach of contract, breach of warranty, guarantee or + condition, strict liability, negligence, or other tort to the extent + permitted by applicable law. -2. Source Code License. + It also applies even if Microsoft knew or should have known about the + possibility of the damages. The above limitation or exclusion may not + apply to you because your country may not allow the exclusion or + limitation of incidental, consequential or other damages. - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: +Mozilla - (a) to use, reproduce, modify, display, perform, sublicense and -distribute the Original Code (or portions thereof) with or without -Modifications, or as part of a Larger Work; and + The following software may be included in this product: Mozilla, + Mozilla Address Book, NP SDK. Use of any of this software is governed + by the terms of the license below: - (b) under patents now or hereafter owned or controlled by Initial -Developer, to make, have made, use and sell ("Utilize") the Original Code (or -portions thereof), but solely to the extent that any such patent is reasonably -necessary to enable You to Utilize the Original Code (or portions thereof) and -not to any greater extent that may be necessary to Utilize further Modifications -or combinations. + See MPL 1.1 below - 2.2. Contributor Grant. - Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: +MySQL Connector/C++ - (a) to use, reproduce, modify, display, perform, sublicense and -distribute the Modifications created by such Contributor (or portions thereof) -either on an unmodified basis, with other Modifications, as Covered Code or as -part of a Larger Work; and + The following software may be included in this product: + MySQL Connector/C++. Use of any of this software is governed by the + terms of the license below: - (b) under patents now or hereafter owned or controlled by -Contributor, to Utilize the Contributor Version (or portions thereof), but -solely to the extent that any such patent is reasonably necessary to enable You -to Utilize the Contributor Version (or portions thereof), and not to any greater -extent that may be necessary to Utilize further Modifications or combinations. + Copyright 2007-2008 MySQL AB, 2008-2009 Sun Microsystems Inc. -3. Distribution Obligations. + See GPL Version 2 below - 3.1. Application of License. - The Modifications which You create or to which You contribute are governed -by the terms of this License, including without limitation Section 2.2. The -Source Code version of Covered Code may be distributed only under the terms of -this License or a future version of this License released under Section 6.1, and -You must include a copy of this License with every copy of the Source Code You -distribute. You may not offer or impose any terms on any Source Code version -that alters or restricts the applicable version of this License or the -recipients' rights hereunder. However, You may include an additional document -offering the additional rights described in Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be made -available in Source Code form under the terms of this License either on the same -media as an Executable version or via an accepted Electronic Distribution -Mechanism to anyone to whom you made an Executable version available; and if -made available via Electronic Distribution Mechanism, must remain available for -at least twelve (12) months after the date it initially became available, or at -least six (6) months after a subsequent version of that particular Modification -has been made available to such recipients. You are responsible for ensuring -that the Source Code version remains available even if the Electronic -Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which you contribute to contain a file -documenting the changes You made to create that Covered Code and the date of any -change. You must include a prominent statement that the Modification is derived, -directly or indirectly, from Original Code provided by the Initial Developer and -including the name of the Initial Developer in (a) the Source Code, and (b) in -any notice in an Executable version or related documentation in which You -describe the origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - - (a) Third Party Claims. - If You have knowledge that a party claims an intellectual property -right in particular functionality or code (or its utilization under this -License), you must include a text file with the source code distribution titled -"LEGAL" which describes the claim and the party making the claim in sufficient -detail that a recipient will know whom to contact. If you obtain such knowledge -after You make Your Modification available as described in Section 3.2, You -shall promptly modify the LEGAL file in all copies You make available thereafter -and shall take other steps (such as notifying appropriate mailing lists or -newsgroups) reasonably calculated to inform those who received the Covered Code -that new knowledge has been obtained. - - (b) Contributor APIs. - If Your Modification is an application programming interface and You -own or control patents which are reasonably necessary to implement that API, you -must also include this information in the LEGAL file. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source -Code, and this License in any documentation for the Source Code, where You -describe recipients' rights relating to Covered Code. If You created one or more -Modification(s), You may add your name as a Contributor to the notice described -in Exhibit A. If it is not possible to put such notice in a particular Source -Code file due to its structure, then you must include such notice in a location -(such as a relevant directory file) where a user would be likely to look for -such a notice. You may choose to offer, and to charge a fee for, warranty, -support, indemnity or liability obligations to one or more recipients of Covered -Code. However, You may do so only on Your own behalf, and not on behalf of the -Initial Developer or any Contributor. You must make it absolutely clear than any -such warranty, support, indemnity or liability obligation is offered by You -alone, and You hereby agree to indemnify the Initial Developer and every -Contributor for any liability incurred by the Initial Developer or such -Contributor as a result of warranty, support, indemnity or liability terms You -offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the -requirements of Section 3.1-3.5 have been met for that Covered Code, and if You -include a notice stating that the Source Code version of the Covered Code is -available under the terms of this License, including a description of how and -where You have fulfilled the obligations of Section 3.2. The notice must be -conspicuously included in any notice in an Executable version, related -documentation or collateral in which You describe recipients' rights relating to -the Covered Code. You may distribute the Executable version of Covered Code -under a license of Your choice, which may contain terms different from this -License, provided that You are in compliance with the terms of this License and -that the license for the Executable version does not attempt to limit or alter -the recipient's rights in the Source Code version from the rights set forth in -this License. If You distribute the Executable version under a different license -You must make it absolutely clear that any terms which differ from this License -are offered by You alone, not by the Initial Developer or any Contributor. You -hereby agree to indemnify the Initial Developer and every Contributor for any -liability incurred by the Initial Developer or such Contributor as a result of -any such terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code not -governed by the terms of this License and distribute the Larger Work as a single -product. In such a case, You must make sure the requirements of this License are -fulfilled for the Covered Code. +MyThes -4. Inability to Comply Due to Statute or Regulation. + The following software may be included in this product: MyThes. Use of + any of this software is governed by the terms of the license below: - If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Code due to statute or -regulation then You must: (a) comply with the terms of this License to the -maximum extent possible; and (b) describe the limitations and the code they -affect. Such description must be included in the LEGAL file described in Section -3.4 and must be included with all distributions of the Source Code. Except to -the extent prohibited by statute or regulation, such description must be -sufficiently detailed for a recipient of ordinary skill to be able to understand -it. + Copyright 2003 Kevin B. Hendricks, Stratford, Ontario, Canada And + Contributors. All rights reserved. -5. Application of this License. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: - This License applies to code to which the Initial Developer has attached -the notice in Exhibit A, and to related Covered Code. + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -6. Versions of the License. + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised -and/or new versions of the License from time to time. Each version will be given -a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the -License, You may always continue to use it under the terms of that version. You -may also choose to use such Covered Code under the terms of any subsequent -version of the License published by Netscape. No one other than Netscape has the -right to modify the terms applicable to Covered Code created under this License. - - 6.3. Derivative Works. - If you create or use a modified version of this License (which you may -only do in order to apply it to code which is not already Covered Code governed -by this License), you must (a) rename Your license so that the phrases -"Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar -phrase do not appear anywhere in your license and (b) otherwise make it clear -that your version of the license contains terms which differ from the Mozilla -Public License and Netscape Public License. (Filling in the name of the Initial -Developer, Original Code or Contributor in the notice described in Exhibit A -shall not of themselves be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, -FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE -QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. -THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO -USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - This License and the rights granted hereunder will terminate automatically -if You fail to comply with terms herein and fail to cure such breach within 30 -days of becoming aware of the breach. All sublicenses to the Covered Code which -are properly granted shall survive any termination of this License. Provisions -which, by their nature, must remain in effect beyond the termination of this -License shall survive. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER -CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH -PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR -MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH -PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS -LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL -INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW -PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR -LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND -LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in 48 -C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and -"commercial computer software documentation," as such terms are used in 48 -C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. -227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire -Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject matter -hereof. If any provision of this License is held to be unenforceable, such -provision shall be reformed only to the extent necessary to make it enforceable. -This License shall be governed by California law provisions (except to the -extent applicable law, if any, provides otherwise), excluding its -conflict-of-law provisions. With respect to disputes in which at least one party -is a citizen of, or an entity chartered or registered to do business in, the -United States of America: (a) unless otherwise agreed in writing, all disputes -relating to this License (excepting any dispute relating to intellectual -property rights) shall be subject to final and binding arbitration, with the -losing party paying all costs of arbitration; (b) any arbitration relating to -this Agreement shall be held in Santa Clara County, California, under the -auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement -shall be subject to the jurisdiction of the Federal Courts of the Northern -District of California, with venue lying in Santa Clara County, California, with -the losing party responsible for costs, including without limitation, court -costs and reasonable attorneys fees and expenses. The application of the United -Nations Convention on Contracts for the International Sale of Goods is expressly -excluded. Any law or regulation which provides that the language of a contract -shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. - - Except in cases where another Contributor has failed to comply with -Section 3.4, You are responsible for damages arising, directly or indirectly, -out of Your utilization of rights under this License, based on the number of -copies of Covered Code you made available, the revenues you received from -utilizing such rights, and other relevant factors. You agree to work with -affected parties to distribute responsibility on an equitable basis. - -EXHIBIT A. - - "The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the -specific language governing rights and limitations under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. -Portions created by ______________________ are Copyright (C) ______ -_______________________. All Rights Reserved. + 3. All modifications to the source code must be clearly marked as + such. Binary redistribution based on modified source code must be + clearly marked as modified versions in the documentation and/or other + materials provided with the distribution. - Contributor(s): ______________________________________." + THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS ``AS + IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEVIN B. + HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. +neon -The following software may be included in this product: libxslt; Use of any of this software is governed by the terms of the license below: -www.xmlsoft.org -libxslt -Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. - -The following software may be included in this product: lpsolve; Use of any of this software is governed by the terms of the license below: -Kjell Eikland and Peter Notebaert -lpsolve -jump to LGPL + The following software may be included in this product: neon. Use of + any of this software is governed by the terms of the license below: -The following software may be included in this product: Network Audio System; Use of any of this software is governed by the terms of the license below: -Network Computer Devices, Inc. -Network Audio System (NAS) -Copyright 1995 Network Computing Devices, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name Network Computing Devices, Inc. not be used in advertising or publicity pertaining to distribution of this software without specific, written prior permission. + neon is Copyright (C) 1999-2007 Joe Orton <joe@manyfish.co.uk> + Portions are: + Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi> + Copyright (C) 1999-2000 Peter Boos <pedib@colorfullife.com> + Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org> + Copyright (C) 2004 Jiang Lei <tristone@deluxe.ocn.ne.jp> + Copyright (C) 2004-2005 Vladimir Berezniker @ + http://public.xdi.org/=vmpn -THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + See LGPL Version 2.1 below -The following software may be included in this product: NeoLight 1.1.x; Use of any of this software is governed by the terms of the license below: -Planamesa, Inc. -NeoLight +Network Security Services (NSS) -jump to GNU Lesser General Public License + The following software may be included in this product: Network + Security Services (NSS). Use of any of this software is governed by + the terms of the license below: -The following software may be included in this product: neon; Use of any of this software is governed by the terms of the license below: -Joe Orton -neon -jump to LGPL + See MPL 1.1 below -The following software may be included in this product: Network Security Services; Use of any of this software is governed by the terms of the license below: -The Mozilla Foundation -Network Security Services (NSS) -MOZILLA PUBLIC LICENSE -Version 1.1 - -1. Definitions. -1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. -1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. -1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. -1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. -1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. -1.5. ''Executable'' means Covered Code in any form other than Source Code. -1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. -1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. -1.8. ''License'' means this document. -1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. -1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: -A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. -B. Any new file that contains any part of the Original Code or previous Modifications. - -1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. -1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. -1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. -1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. -2. Source Code License. -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: -(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and -(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - -(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. -(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - -(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). -(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. -(d)   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - -3. Distribution Obligations. -3.1. Application of License. -The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. -3.4. Intellectual Property Matters -(a) Third Party Claims. -If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. -(b) Contributor APIs. -If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - -         (c)   Representations. -Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. -3.6. Distribution of Executable Versions. -You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. -5. Application of this License. -This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. -6. Versions of the License. -6.1. New Versions. -Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. -6.3. Derivative Works. -If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. -8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: -(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. -(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. -8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. -8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as “Multiple-Licensedâ€. “Multiple-Licensed†means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. -``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ -Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF -ANY KIND, either express or implied. See the License for the specific language governing rights and -limitations under the License. -The Original Code is ______________________________________. -The Initial Developer of the Original Code is ________________________. Portions created by - ______________________ are Copyright (C) ______ _______________________. All Rights -Reserved. -Contributor(s): ______________________________________. -Alternatively, the contents of this file may be used under the terms of the _____ license (the “[___] Licenseâ€), in which case the provisions of [______] License are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -The following software may be included in this product: OpenSSL; Use of any of this software is governed by the terms of the license below: -OpenSSL Project OpenSSL - LICENSE ISSUES - ============== - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core@openssl.org. + The following software may be included in this product: OpenSSL. Use + of any of this software is governed by the terms of the license below: + + The OpenSSL toolkit stays under a dual license, i.e. both the + conditions of the OpenSSL License and the original SSLeay license + apply to the toolkit. + + See below for the actual license texts. Actually both licenses are + BSD-style Open Source licenses. In case of any license issues related + to OpenSSL please contact openssl-core@openssl.org. OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - - - -The following software may be included in this product:PortAudio - Portable Real-Time Audio Library; Use of any of this software is governed by the terms of the license below: -Ross Bencina and Phil Burk -PortAudio -PortAudio Portable Real-Time Audio Library -Copyright (c) 1999-2000 Ross Bencina and Phil Burk -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Plain English Interpretation of the License -The following is a plain English interpretation of the license. This interpretation is not part of the license and has no legal significance. To understand the full legal implications of the license you should consult the license itself. -You can use PortAudio for free in your projects or applications, even commercial applications. -You do not have to make your own source available as open-source code just because you used PortAudio. -Do not take our copyright information out of the PortAudio source code. -If you fix a bug in PortAudio, please send us the fix. -You cannot sue us if your program fails because of PortAudio. - - -The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below: -James Clark, Bill Lindsey -PostgreSQL Database Management System - -(formerly known as Postgres, then as Postgres95) -Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group -Portions Copyright (c) 1994, The Regents of the University of California -Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - -The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below: -Adobe -Printer Description Files - - Copyright 1987-1995 Adobe Systems Incorporated. - All Rights Reserved. - Permission is granted for redistribution of this file as - long as this copyright notice is intact and the contents - of the file is not altered in any way from its original form. - End of Copyright statement - -The following software may be included in this product: Python; Use of any of this software is governed by the terms of the license below: -Python Software Foundation + + Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. All advertising materials mentioning features or use of this + software must display the following acknowledgment: "This product + includes software developed by the OpenSSL Project for use in the + OpenSSL Toolkit. (http://www.openssl.org/)" + 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used + to endorse or promote products derived from this software without + prior written permission. For written permission, please contact + openssl-core@openssl.org. + 5. Products derived from this software may not be called "OpenSSL" + nor may "OpenSSL" appear in their names without prior written + permission of the OpenSSL Project. + 6. Redistribution of any form whatsoever must retain the following + acknowledgment: "This product includes software developed by the + OpenSSL Project for use in the OpenSSL Toolkit + (http://www.openssl.org/)" + + THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This product includes cryptographic software written by Eric Young + (eay@cryptsoft.com). This product includes software written by Tim + Hudson (tjh@cryptsoft.com). + + Original SSLeay License + + Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights + reserved. + + This package is an SSL implementation written by Eric Young + (eay@cryptsoft.com). + The implementation was written so as to conform with Netscapes SSL. + + This library is free for commercial and non-commercial use as long as + the following conditions are aheared to. The following conditions + apply to all code found in this distribution, be it the RC4, RSA, + lhash, DES, etc., code; not just the SSL code. The SSL documentation + included with this distribution is covered by the same copyright terms + except that the holder is Tim Hudson (tjh@cryptsoft.com). + + Copyright remains Eric Young's, and as such any Copyright notices in + the code are not to be removed. If this package is used in a product, + Eric Young should be given attribution as the author of the parts of + the library used. This can be in the form of a textual message at + program startup or in documentation (online or textual) provided with + the package. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistribution of source code must retain the copyright notice, + this list of conditions and the following disclaimer. + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. All advertising materials mentioning features or use of this + software must display the following acknowledgment: "This product + includes cryptographic software written by Eric Young + (eay@cryptsoft.com)" The word 'cryptographic' can be left out if + the routines from the library being used are not cryptographic + related :-). + 4. If you include any Windows specific code (or a derivative thereof) + from the apps directory (application code) you must include an + acknowledgment: "This product includes software written by Tim + Hudson (tjh@cryptsoft.com)" + + THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The license and distribution terms for any publicly available version + or derivative of this code cannot be changed. i.e. this code cannot + simply be copied and put under another distribution license [including + the GNU Public License.] + +Pentaho Reporting Flow Engine + + The following software may be included in this product: Pentaho + Reporting Flow Engine (including core, flow-engine, libbase, libfonts, + libformula, liblayout, libloader, librepository, libserializer, and + libxml). Use of any of this software is governed by the terms of the + license below: + + See LGPL Version 2.1 below + +Pixman + + The following software may be included in this product: Pixman + (libpixman). Use of any of this software is governed by the terms of + the license below: + + The following is the MIT license, agreed upon by most contributors. + + Copyright holders of new code should use this license statement where + possible. They may also add themselves to the list below. + + Copyright 1987, 1988, 1989, 1998 The Open Group + Copyright 1987, 1988, 1989 Digital Equipment Corporation + Copyright 1999, 2004, 2008 Keith Packard + Copyright 2000 SuSE, Inc. + Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. + Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc. + Copyright 2004 Nicholas Miell + Copyright 2005 Lars Knoll & Zack Rusin, Trolltech + Copyright 2005 Trolltech AS + Copyright 2007 Luca Barbato + Copyright 2008 Aaron Plattner, NVIDIA Corporation + Copyright 2008 Rodrigo Kumpera + Copyright 2008 André Tupinambá + Copyright 2008 Mozilla Corporation + Copyright 2008 Frederic Plourde + Copyright 2009, Oracle and/or its affiliates. All rights reserved. + Copyright 2009, 2010 Nokia Corporation + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: The above copyright notice and this + permission notice (including the next paragraph) shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Platform SDK Redistributable: GDI+ + + The following software may be included in this product: Platform SDK + Redistributable: GDI+ (gdiplus.dll). Use of any of this software is + governed by the terms of the license below: + + PLEASE NOTE: Microsoft Corporation (or based on where you live, one of + its affiliates) licenses this supplement to you. The supplement is + identified for use with one or more Microsoft operating system + products (the 'software'). You may use a copy of this supplement with + each validly licensed copy of the software. You may not use it if you + do not have a license for the software. The license terms for the + software apply to your use of this supplement. To read the license + terms, go to www.microsoft.com/useterms. + + Microsoft provides support services for the supplement as described at + www.support. microsoft.com/common/international.aspx. + + EULAID:HFX_RM.1_GDR_NRL_EN + Python -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PSF LICENSE AGREEMENT FOR PYTHON 2.3 ------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.3 software in source or binary form and its -associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.3 -alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are -retained in Python 2.3 alone or in any derivative version prepared by -Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.3 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.3. - -4. PSF is making Python 2.3 available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python 2.3, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - -2. Subject to the terms and conditions of this BeOpen Python License -Agreement, BeOpen hereby grants Licensee a non-exclusive, -royalty-free, world-wide license to reproduce, analyze, test, perform -and/or display publicly, prepare derivative works, distribute, and -otherwise use the Software alone or in any derivative version, -provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -6. This License Agreement shall be governed by and interpreted in all -respects by the law of the State of California, excluding conflict of -law provisions. Nothing in this License Agreement shall be deemed to -create any relationship of agency, partnership, or joint venture -between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade names in a trademark -sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - -7. By copying, installing or otherwise using the software, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- + The following software may be included in this product: Python. Use of + any of this software is governed by the terms of the license below: + + PSF LICENSE AGREEMENT FOR PYTHON 2.3 + + 1. This LICENSE AGREEMENT is between the Python Software Foundation + ("PSF"), and the Individual or Organization ("Licensee") accessing and + otherwise using Python 2.3 software in source or binary form and its + associated documentation. + + 2. Subject to the terms and conditions of this License Agreement, PSF + hereby grants Licensee a nonexclusive, royalty-free, world-wide + license to reproduce, analyze, test, perform and/or display publicly, + prepare derivative works, distribute, and otherwise use Python 2.3 + alone or in any derivative version, provided, however, that PSF's + License Agreement and PSF's notice of copyright, i.e., "Copyright (c) + 2001, 2002, 2003, 2004 Python Software Foundation; All Rights + Reserved" are retained in Python 2.3 alone or in any derivative + version prepared by Licensee. + + 3. In the event Licensee prepares a derivative work that is based on + or incorporates Python 2.3 or any part thereof, and wants to make the + derivative work available to others as provided herein, then Licensee + hereby agrees to include in any such work a brief summary of the + changes made to Python 2.3. + + 4. PSF is making Python 2.3 available to Licensee on an "AS IS" basis. + PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY + OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY + REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY + PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT INFRINGE ANY + THIRD PARTY RIGHTS. + + 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON + 2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A + RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, OR + ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + + 6. This License Agreement will automatically terminate upon a material + breach of its terms and conditions. + + 7. Nothing in this License Agreement shall be deemed to create any + relationship of agency, partnership, or joint venture between PSF and + Licensee. This License Agreement does not grant permission to use PSF + trademarks or trade name in a trademark sense to endorse or promote + products or services of Licensee, or any third party. + + 8. By copying, installing or otherwise using Python 2.3, Licensee + agrees to be bound by the terms and conditions of this License + Agreement. + + BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 + + BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + + 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an + office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the + Individual or Organization ("Licensee") accessing and otherwise using + this software in source or binary form and its associated + documentation ("the Software"). + + 2. Subject to the terms and conditions of this BeOpen Python License + Agreement, BeOpen hereby grants Licensee a non-exclusive, + royalty-free, world-wide license to reproduce, analyze, test, perform + and/or display publicly, prepare derivative works, distribute, and + otherwise use the Software alone or in any derivative version, + provided, however, that the BeOpen Python License is retained in the + Software, alone or in any derivative version prepared by Licensee. + + 3. BeOpen is making the Software available to Licensee on an "AS IS" + basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT + INFRINGE ANY THIRD PARTY RIGHTS. + + 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE + SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS + AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY + DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + + 5. This License Agreement will automatically terminate upon a material + breach of its terms and conditions. + + 6. This License Agreement shall be governed by and interpreted in all + respects by the law of the State of California, excluding conflict of + law provisions. Nothing in this License Agreement shall be deemed to + create any relationship of agency, partnership, or joint venture + between BeOpen and Licensee. This License Agreement does not grant + permission to use BeOpen trademarks or trade names in a trademark + sense to endorse or promote products or services of Licensee, or any + third party. As an exception, the "BeOpen Python" logos available at + http://www.pythonlabs.com/logos.html may be used according to the + permissions granted on that web page. + + 7. By copying, installing or otherwise using the software, Licensee + agrees to be bound by the terms and conditions of this License + Agreement. + + CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 + + 1. This LICENSE AGREEMENT is between the Corporation for National + Research Initiatives, having an office at 1895 Preston White Drive, + Reston, VA 20191 ("CNRI"), and the Individual or Organization + ("Licensee") accessing and otherwise using Python 1.6.1 software in + source or binary form and its associated documentation. + + 2. Subject to the terms and conditions of this License Agreement, CNRI + hereby grants Licensee a nonexclusive, royalty-free, world-wide + license to reproduce, analyze, test, perform and/or display publicly, + prepare derivative works, distribute, and otherwise use Python 1.6.1 + alone or in any derivative version, provided, however, that CNRI's + License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) + 1995-2001 Corporation for National Research Initiatives; All Rights + Reserved" are retained in Python 1.6.1 alone or in any derivative + version prepared by Licensee. Alternately, in lieu of CNRI's License + Agreement, Licensee may substitute the following text (omitting the + quotes): "Python 1.6.1 is made available subject to the terms and + conditions in CNRI's License Agreement. This Agreement together with + Python 1.6.1 may be located on the Internet using the following + unique, persistent identifier (known as a handle): 1895.22/1013. This + Agreement may also be obtained from a proxy server on the Internet + using the following URL: http://hdl.handle.net/1895.22/1013". + + 3. In the event Licensee prepares a derivative work that is based on + or incorporates Python 1.6.1 or any part thereof, and wants to make + the derivative work available to others as provided herein, then + Licensee hereby agrees to include in any such work a brief summary of + the changes made to Python 1.6.1. + + 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" + basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT + INFRINGE ANY THIRD PARTY RIGHTS. + + 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON + 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS + A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, + OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + + 6. This License Agreement will automatically terminate upon a material + breach of its terms and conditions. + + 7. This License Agreement shall be governed by the federal + intellectual property law of the United States, including without + limitation the federal copyright law, and, to the extent such U.S. + federal law does not apply, by the law of the Commonwealth of + Virginia, excluding Virginia's conflict of law provisions. + Notwithstanding the foregoing, with regard to derivative works based + on Python 1.6.1 that incorporate non-separable material that was + previously distributed under the GNU General Public License (GPL), the + law of the Commonwealth of Virginia shall govern this License + Agreement only as to issues arising under or with respect to + Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this + License Agreement shall be deemed to create any relationship of + agency, partnership, or joint venture between CNRI and Licensee. This + License Agreement does not grant permission to use CNRI trademarks or + trade name in a trademark sense to endorse or promote products or + services of Licensee, or any third party. + + 8. By clicking on the "ACCEPT" button where indicated, or by copying, + installing or otherwise using Python 1.6.1, Licensee agrees to be + bound by the terms and conditions of this License Agreement. + + ACCEPT + + CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 + + Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, + The Netherlands. All rights reserved. + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Stichting Mathematisch + Centrum or CWI not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior + permission. + + STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Raptor RDF Parser Library + + The following software may be included in this product: Raptor RDF + Parser Library. Use of any of this software is governed by the terms + of the license below: + + Copyright (C) 2000-2008 David Beckett + Copyright (C) 2000-2005 University of Bristol. All Rights + Reserved. + + All the licenses below are alternatives and if you select one license, + that one alone applies. + + See LGPL Version 2.1 below + + See Apache License Version 2.0 below + +Rasqal RDF Query Library + + The following software may be included in this product: Rasqal RDF + Query Library. Use of any of this software is governed by the terms of + the license below: + + Copyright (C) 2000-2008 David Beckett + Copyright (C) 2000-2005 University of Bristol. All Rights + Reserved. + + All the licenses below are alternatives and if you select one license, + that one alone applies. + + See LGPL Version 2.1 below + + See Apache License Version 2.0 below + +Redland RDF Application Framework + + The following software may be included in this product: Redland RDF + Application Framework. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2000-2008 David Beckett + Copyright (C) 2000-2005 University of Bristol. All Rights + Reserved. + + All the licenses below are alternatives and if you select one license, + that one alone applies. + + See LGPL Version 2.1 below + + See Apache License Version 2.0 below -1. This LICENSE AGREEMENT is between the Corporation for National -Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 1.6.1 -alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 1.6.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below: -librdf.org -librdf -jump to LGPL - -The following software may be included in this product: regexp; Use of any of this software is governed by the terms of the license below: -Free Software Foundation, Inc. -regexp -jump to LGPL - -The following software may be included in this product: Remote Control Wrapper; Use of any of this software is governed by the terms of the license below: -Martin Kahr Remote Control Wrapper -Created by Martin Kahr under a MIT-style license. -Copyright (c) 2006/2007 martinkahr.com. All rights reserved. + The following software may be included in this product: Remote Control + Wrapper. Use of any of this software is governed by the terms of the + license below: -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: + Created by Martin Kahr under a MIT-style license. Copyright (c) + 2006/2007 martinkahr.com. All rights reserved. -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -The following software may be included in this product: Rhino; Use of any of this software is governed by the terms of the license below: -Norris Boyd, Patrick Beard Rhino -MOZILLA PUBLIC LICENSE -Version 1.1 - -1. Definitions. -1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. -1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. -1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. -1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. -1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. -1.5. ''Executable'' means Covered Code in any form other than Source Code. -1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. -1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. -1.8. ''License'' means this document. -1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. -1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: -A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. -B. Any new file that contains any part of the Original Code or previous Modifications. - -1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. -1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. -1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. -1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. -2. Source Code License. -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: -(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and -(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - -(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. -(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - -(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). -(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. -(d)   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - -3. Distribution Obligations. -3.1. Application of License. -The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. -3.4. Intellectual Property Matters -(a) Third Party Claims. -If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. -(b) Contributor APIs. -If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - -         (c)   Representations. -Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. -3.6. Distribution of Executable Versions. -You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. -5. Application of this License. -This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. -6. Versions of the License. -6.1. New Versions. -Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. -6.3. Derivative Works. -If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. -8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: -(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. -(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. -8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. -8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as “Multiple-Licensedâ€. “Multiple-Licensed†means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. -``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ -Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF -ANY KIND, either express or implied. See the License for the specific language governing rights and -limitations under the License. -The Original Code is ______________________________________. -The Initial Developer of the Original Code is ________________________. Portions created by - ______________________ are Copyright (C) ______ _______________________. All Rights -Reserved. -Contributor(s): ______________________________________. -Alternatively, the contents of this file may be used under the terms of the _____ license (the “[___] Licenseâ€), in which case the provisions of [______] License are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -The following software may be included in this product: sRGB Profiles; Use of any of this software is governed by the terms of the license below: -International Color Consortium -sRGB Profiles - -To anyone who acknowledges that the files "sRGB_IEC61966-2-1_noBPC.icc" and "sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and distribute these file for any purpose is hereby granted without fee, provided that the files are not changed including the HP copyright notice tag, and that the name of Hewlett-Packard Company shall not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - - -The following software may be included in this product: Sablotron; Use of any of this software is governed by the terms of the license below: -Ginger Alliance -Sablotron -jump to LGPL - -The following software may be included in this product: SANE; Use of any of this software is governed by the terms of the license below: -David Mosberger-Tang, Andreas Beck + + The following software may be included in this product: Rhino. Use of + any of this software is governed by the terms of the license below: + + See MPL Version 1.1 below + SANE -/* sane - Scanner Access Now Easy. - Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck + + The following software may be included in this product: SANE. Use of + any of this software is governed by the terms of the license below: + + sane - Scanner Access Now Easy. Copyright (C) 1997-1999 David + Mosberger-Tang and Andreas Beck + This file is part of the SANE package. - This file is in the public domain. You may use and modify it as - you see fit, as long as this copyright message is included and - that there is an indication as to what modifications have been - made (if any). + This file is in the public domain. You may use and modify it as you + see fit, as long as this copyright message is included and that there + is an indication as to what modifications have been made (if any). SANE 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. - This file declares SANE application interface. See the SANE - standard for a detailed explanation of the interface. */ - + This file declares SANE application interface. See the SANE standard + for a detailed explanation of the interface. -The following software may be included in this product: Saxon (B); Use of any of this software is governed by the terms of the license below: -Michael Kay Saxon (B) -jump to MPL 1.1 -The following software may be included in this product: Stax API; Use of any of this software is governed by the terms of the license below: -stax.codehouse.org + The following software may be included in this product: Saxon (B). Use + of any of this software is governed by the terms of the license below: + + See MPL Version 1.1 below + Stax - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + The following software may be included in this product: Stax API. Use + of any of this software is governed by the terms of the license below: - 1. Definitions. + See Apache License Version 2.0 below - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +STLPort - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + The following software may be included in this product:STLport. Use of + any of this software is governed by the terms of the license below: - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + License Agreement - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. + Boris Fomitchev grants Licensee a non-exclusive, non-transferable, + royalty-free license to use STLport and its documentation without fee. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. + By downloading, using, or copying STLport or any portion thereof, + Licensee agrees to abide by the intellectual property laws and all + other applicable laws of the United States of America, and to all of + the terms and conditions of this Agreement. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. + Licensee shall maintain the following copyright and permission notices + on STLport sources and its documentation unchanged: - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. + Copyright 1999,2000 Boris Fomitchev - END OF TERMS AND CONDITIONS + This material is provided "as is", with absolutely no warranty + expressed or implied. Any use is at your own risk. - APPENDIX: How to apply the Apache License to your work. + Permission to use or copy this software for any purpose is hereby + granted without fee, provided the above notices are retained on all + copies. Permission to modify the code and to distribute modified code + is granted, provided the above notices are retained, and a notice that + the code was modified is included with the above copyright notice. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. + The Licensee may distribute binaries compiled with STLport (whether + original or modified) without any royalties or restrictions. - Copyright [yyyy] [name of copyright owner] + The Licensee may distribute original or modified STLport sources, + provided that: + * The conditions indicated in the above permission notice are met; + * The following copyright notices are retained when present, and + conditions provided in accompanying permission notices are met: - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + Copyright 1994 Hewlett-Packard Company - http://www.apache.org/licenses/LICENSE-2.0 + Copyright 1996,97 Silicon Graphics Computer Systems, Inc. - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Copyright 1997 Moscow Center for SPARC Technology. + + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation. Hewlett-Packard Company makes + no representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation. Silicon Graphics makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation. Moscow Center for SPARC + Technology makes no representations about the suitability of this + software for any purpose. It is provided "as is" without express or + implied warranty. +The Gimp Toolkit (GTK+) + + The following software may be included in this product: GTK+ (The Gimp + Toolkit). Use of any of this software is governed by the terms of the + license below: + + See LGPL Version 2.1 below -The following software may be included in this product:STLport; Use of any of this software is governed by the terms of the license below: -Boris Fomitchev -STLport -License Agreement -Boris Fomitchev grants Licensee a non-exclusive, non-transferable, royalty-free license to use STLport and its documentation without fee. - -By downloading, using, or copying STLport or any portion thereof, Licensee agrees to abide by the intellectual property laws and all other applicable laws of the United States of America, and to all of the terms and conditions of this Agreement. - -Licensee shall maintain the following copyright and permission notices on STLport sources and its documentation unchanged : -Copyright 1999,2000 Boris Fomitchev - -This material is provided "as is", with absolutely no warranty expressed or implied. Any use is at your own risk. -Permission to use or copy this software for any purpose is hereby granted without fee, provided the above notices are retained on all copies. Permission to modify the code and to distribute modified code is granted, provided the above notices are retained, and a notice that the code was modified is included with the above copyright notice. -The Licensee may distribute binaries compiled with STLport (whether original or modified) without any royalties or restrictions. -The Licensee may distribute original or modified STLport sources, provided that: -The conditions indicated in the above permission notice are met; -The following copyright notices are retained when present, and conditions provided in accompanying permission notices are met : -Copyright 1994 Hewlett-Packard Company -Copyright 1996,97 Silicon Graphics Computer Systems, Inc. -Copyright 1997 Moscow Center for SPARC Technology. -Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. -Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Silicon Graphics makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. -Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Moscow Center for SPARC Technology makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. - -The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below: -Daniela Volta, Davide Prina -Italian Thesaurus - -Jump to GPL - -The following software may be included in this product: Nepali thesaurus dictionary; Use of any of this software is governed by the terms of the license below: -NepaLinux.org -Nepali thesaurus dictionary (LGPL v2.1) - -jump to GNU Lesser General Public License - -The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below: -Daniela Volta, Davide Prina -Sownik synonimw v. 1, (Polish Thesaurus) - -Open Software License v. 2.1 -This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: -Licensed under the Open Software License version 2.1 -1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: -* to reproduce the Original Work in copies; -* to prepare derivative works ("Derivative Works") based upon the Original Work; -* to distribute copies of the Original Work and Derivative Works to the -public, with the proviso that copies of Original Work or Derivative Works that You distribute shall be licensed under the Open Software License; * to perform the Original Work publicly; and -* to display the Original Work publicly. -2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. -3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. -4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. -5) External Deployment. The term "External Deployment" means the use or distribution of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether the Original Work or Derivative Works are distributed to those persons or made available as an application intended for use over a computer network. As an express condition for the grants of license hereunder, You agree that any External Deployment by You of a Derivative Work shall be deemed a distribution and shall be licensed to all under the terms of this License, as prescribed in section 1(c) herein. -6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. -7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. -8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. -9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. This License shall terminate immediately and you may no longer exercise any of the rights granted to You by this License upon Your failure to honor the proviso in Section 1(c) herein. -10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. -11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. -12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. -13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. -14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. -15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. -This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. - -The following software may be included in this product: Russian thesaurus; Use of any of this software is governed by the terms of the license below: -Mikhail Korolyov -Russian thesaurus - -jump to GNU Lesser General Public License - -The following software may be included in this product: TWAIN; Use of any of this software is governed by the terms of the license below: -TWAIN Working Group TWAIN -The TWAIN License -The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied, express or statutory, including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction, distribution, modification, or other use of the TWAIN Toolkit. -As a condition of this license, Customer agrees to include in software programs based in whole or in part on the TWAIN Toolkit the following providions in (i) the header or similar file in such software and (ii) prominently in its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied, express or statutory warranties including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. Neither the developers nor the distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a result of the reproduction, modification, distribution or other use of the TWAIN Toolkit. + The following software may be included in this product: TWAIN. Use of + any of this software is governed by the terms of the license below: + + The TWAIN License + + The TWAIN Working Group grants customer ("Customer") the worldwide, + royalty-free, non-exclusive license to reproduce and distribute the + software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The + TWAIN Toolkit was designed to be used by third parties to assist them + in becoming compliant with the TWAIN standard, but it has not been + developed to the standards of a commercial product. Consequently, the + TWAIN toolkit is provided AS IS without any warranty. THE TWAIN + Working Group disclaims all warranties in the TWAIN toolkit whether + implied, express or statutory, including, without limitation, the + implied warranties of merchantability, non infringement of third party + rights and fitness for a particular purpose. The TWAIN Working Group + disclaims all liability for damages, whether direct, indirect, + special, incidental, or consequential, arising from the reproduction, + distribution, modification, or other use of the TWAIN Toolkit. + + As a condition of this license, Customer agrees to include in software + programs based in whole or in part on the TWAIN Toolkit the following + provisions in (i) the header or similar file in such software and (ii) + prominently in its documentation and to require its sublicensees to + include these provisions in similar locations: The TWAIN Toolkit is + distributed as is. The developer and distributors of the TWAIN Toolkit + expressly disclaim all implied, express or statutory warranties + including, without limitation, the implied warranties of + merchantability, non infringement of third party rights and fitness + for a particular purpose. Neither the developers nor the distributors + will be liable for damages, whether direct, indirect, special, + incidental, or consequential, as a result of the reproduction, + modification, distribution or other use of the TWAIN Toolkit. -The following software may be included in this product: Unicode's CLDR data repository; Use of any of this software is governed by the terms of the license below: -Unicode, Inc. Unicode CLDR data repository -Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. -Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified. -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. -Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. - -The following software may be included in this product: unixODBC; Use of any of this software is governed by the terms of the license below: -unixODBC.org -unixODBC -jump to LGPL + The following software may be included in this product: Unicode's CLDR + data repository. Use of any of this software is governed by the terms + of the license below: + + Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed + under the Terms of Use in http://www.unicode.org/copyright.html. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Unicode data files and any associated documentation (the + "Data Files") or Unicode software and any associated documentation + (the "Software") to deal in the Data Files or Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, and/or sell copies of the Data + Files or Software, and to permit persons to whom the Data Files or + Software are furnished to do so, provided that (a) the above copyright + notice(s) and this permission notice appear with all copies of the + Data Files or Software, (b) both the above copyright notice(s) and + this permission notice appear in associated documentation, and (c) + there is clear notice in each modified Data File or in the Software as + well as in the documentation associated with the Data File(s) or + Software that the data or software has been modified. + + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR + ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR + SOFTWARE. + + Except as contained in this notice, the name of a copyright holder + shall not be used in advertising or otherwise to promote the sale, use + or other dealings in these Data Files or Software without prior + written authorization of the copyright holder. + +UnixODBC + + The following software may be included in this product: unixODBC. Use + of any of this software is governed by the terms of the license below: + + See LGPL Version 2.1 below -The following software may be included in this product: vigra; Use of any of this software is governed by the terms of the license below: -Ullrich Koethe vigra -The VIGRA Artistic License -========================== -(modeled after the Perl Artistic License) - -Preamble --------- - -The intent of this document is to state the conditions under which VIGRA may be copied, such that the author maintains some semblance of artistic control over the development of the library, while giving the users of the library the right to use and distribute VIGRA in a more-or-less customary fashion, plus the right to make reasonable modifications. -Definitions ------------ -"Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany. -"Library" refers to the collection of files distributed by the Copyright Holder under the name "VIGRA" (including this LICENSE file and all accompanying documentation), and derivatives of that collection of files created through textual modification. -"Standard Version" refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below. -"You" is you, if you're thinking about using, copying, modifying or distributing this Library. -"Freely Available" means that no fee is charged for the item. It also means that recipients of the item may redistribute it under the same conditions they received it. -"Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) -License terms -------------- -1. You may make and give away verbatim copies of the Standard Version of this Library without restriction, provided that you duplicate all of the original copyright notices, this license, and associated disclaimers. -2. The Standard Version of the Library may be distributed as part of a collection of software, provided no more than a reasonable copying fee is charged for the software collection. -3. You may apply bug fixes and portability fixes derived from the Public Domain or from the Copyright Holder. A Library modified in such a way shall still be considered the Standard Version. -4. You may otherwise modify your copy of this Library in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: -a. place your modifications in the Public Domain or otherwise make them Freely Available, for example by allowing the Copyright Holder to include your modifications in the Standard Version of the Library. -b. use the modified Library only within your corporation or organization. -c. make other distribution arrangements with the Copyright Holder. -5. You may distribute programs which use this Library in object code or executable form without restriction. -6. Any object code generated as a result of using this Library does not fall under the copyright of this Library, but belongs to whomever generated it, and may be sold commercially. -7. The name of the Copyright Holder or the Library may not be used to endorse or promote products derived from this software without specific prior written permission. -8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS LIBRARY. - -The following software may be included in this product: Xalan; Use of any of this software is governed by the terms of the license below: -The Apache Software Foundation + The following software may be included in this product: vigra. Use of + any of this software is governed by the terms of the license below: + + The VIGRA Artistic License + + (modeled after the Perl Artistic License) + + Preamble + + The intent of this document is to state the conditions under which + VIGRA may be copied, such that the author maintains some semblance of + artistic control over the development of the library, while giving the + users of the library the right to use and distribute VIGRA in a + more-or-less customary fashion, plus the right to make reasonable + modifications. + + Definitions + + "Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive + Systems Group, University of Hamburg, Germany. + + "Library" refers to the collection of files distributed by the + Copyright Holder under the name "VIGRA" (including this LICENSE file + and all accompanying documentation), and derivatives of that + collection of files created through textual modification. + + "Standard Version" refers to the Library if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder as specified below. + + "You" is you, if you're thinking about using, copying, modifying or + distributing this Library. + + "Freely Available" means that no fee is charged for the item. It also + means that recipients of the item may redistribute it under the same + conditions they received it. + + "Reasonable copying fee" is whatever you can justify on the basis of + media cost, duplication charges, time of people involved, and so on. + (You will not be required to justify it to the Copyright Holder, but + only to the computing community at large as a market that must bear + the fee.) + + License terms + + 1. You may make and give away verbatim copies of the Standard Version + of this Library without restriction, provided that you duplicate all + of the original copyright notices, this license, and associated + disclaimers. + + 2. The Standard Version of the Library may be distributed as part of a + collection of software, provided no more than a reasonable copying fee + is charged for the software collection. + + 3. You may apply bug fixes and portability fixes derived from the + Public Domain or from the Copyright Holder. A Library modified in such + a way shall still be considered the Standard Version. + + 4. You may otherwise modify your copy of this Library in any way, + provided that you insert a prominent notice in each changed file + stating how and when you changed that file, and provided that you do + at least ONE of the following: + + a. place your modifications in the Public Domain or otherwise make + them Freely Available, for example by allowing the Copyright Holder to + include your modifications in the Standard Version of the Library. + + b. use the modified Library only within your corporation or + organization. + + c. make other distribution arrangements with the Copyright Holder. + + 5. You may distribute programs which use this Library in object code + or executable form without restriction. + + 6. Any object code generated as a result of using this Library does + not fall under the copyright of this Library, but belongs to whomever + generated it, and may be sold commercially. + + 7. The name of the Copyright Holder or the Library may not be used to + endorse or promote products derived from this software without + specific prior written permission. + + 8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, + INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY + DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY + THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS LIBRARY. + +W3C Simple API for CSS (SAC) + + The following software may be included in this product: W3C Simple API + for CSS (SAC). Use of any of this software is governed by the terms of + the license below: + + W3C IPR SOFTWARE NOTICE + + Copyright © 2002 World Wide Web Consortium, (Massachusetts Institute + of Technology, Institut National de Recherche en Informatique et en + Automatique, Keio University). All Rights Reserved. + + Note: The original version of the W3C Software Copyright Notice and + License could be found at + http://www.w3.org/Consortium/Legal/copyright-software-19980720 + + Copyright © 1994-2002 World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut National de + Recherche en Informatique et en Automatique, Keio University). All + Rights Reserved. http://www.w3.org/Consortium/Legal/ + + This W3C work (including software, documents, or other related items) + is being provided by the copyright holders under the following + license. By obtaining, using and/or copying this work, you (the + licensee) agree that you have read, understood, and will comply with + the following terms and conditions: + + Permission to use, copy, and modify this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include + the following on ALL copies of the software and documentation or + portions thereof, including modifications, that you make: + 1. The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the + following form (hypertext is preferred, text is permitted) should + be used within the body of any redistributed or derivative code: + "Copyright © 2002 World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut National + de Recherche en Informatique et en Automatique, Keio + University). All Rights Reserved. + http://www.w3.org/Consortium/Legal/" + 3. Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.) + + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, + written prior permission. Title to copyright in this software and any + associated documentation will at all times remain with copyright + holders. + + X11 XRender Extension + + The following software may be included in this product: X11 XRender + Extension. Use of any of this software is governed by the terms of the + license below: + + Copyright © 2000 SuSE, Inc. + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of SuSE not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. SuSE makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + Xalan - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + + The following software may be included in this product: Xalan. Use of + any of this software is governed by the terms of the license below: + + See Apache License Version 2.0 below + +XML Security Library (xmlsec) + + The following software may be included in this product: XML Security + Library (xmlsec). Use of any of this software is governed by the terms + of the license below: + + xmlsec, xmlsec-openssl, xmlsec-gnutls libraries + + Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of Aleksey Sanin shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from him. + + xmlsec-nss library + + Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. + + Copyright (c) 2003 America Online, Inc. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + Portions of the Software were created using source code and/or APIs + governed by the Mozilla Public License (MPL). The MPL is available at + http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such + portions to be distributed with code not governed by MPL, as long as + the requirements of MPL are fulfilled for such portions. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of Aleksey Sanin shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from him. + +XSLT MathML Library + + The following software may be included in this product: XSLT MathML + Library. Use of any of this software is governed by the terms of the + license below: + + Copyright + + Copyright (C) 2001-2003 Vasil Yaroshevich + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + ``Software''), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + Except as contained in this notice, the names of individuals credited + with contribution to this software shall not be used in advertising or + otherwise to promote the sale, use or other dealings in this Software + without prior written authorization from the individuals in question. + + Any stylesheet derived from this Software that is publicly distributed + will be identified with a different name and the version strings in + any derived Software will be changed so that no possibility of + confusion between the derived package and this Software will exist. + + Warranty + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER CONTRIBUTOR BE LIABLE FOR + ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Xpdf + + The following software may be included in this product: Xpdf. Use of + any of this software is governed by the terms of the license below: + + The Xpdf software and documentation are copyright 1996-2007 Glyph & + Cog, LLC. + + See GPL Version 2 below + +zlib + + The following software may be included in this product: zlib. Use of + any of this software is governed by the terms of the license below: + + (C) 1995-2002 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + + Extensions + + Only third party extensions are listed here whose source code is not + in the LibreOffice tree. + +Barcode + + The following software may be included in this product: Barcode. Use + of any of this software is governed by the terms of the license below: + + Copyright (C) Dániel Darabos and Kálmán Szalai + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at + your option) any later version. + + This program 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 + General Public License for more details. + + See GPL Version 3 below + +Convert Text to Number + + The following software may be included in this product: Convert Text + to Number. Use of any of this software is governed by the terms of the + license below: + + Copyright (C) 2008/2009 - Cor Nouws + + See LGPL Version 3 below + +Diagram + + The following software may be included in this product: Diagram. Use + of any of this software is governed by the terms of the license below: + + Copyright © Tibor Hornyák and OxygenOffice Professional Team - + http://ooop.sf.net/ + + See LGPL Version 3 below + +OpenOffice.org2GoogleDocs - export & import to Google Docs, Zoho, WebDAV + + The following software may be included in this product: + OpenOffice.org2GoogleDocs - export & import to Google Docs, Zoho, + WebDAV. Use of any of this software is governed by the terms of the + license below: + + Copyright © Przemyslaw Rumik + + See LGPL Version 3 below + +Hungarian cross-reference toolbar + + The following software may be included in this product: Hungarian + cross-reference toolbar. Use of any of this software is governed by + the terms of the license below: + + 2009-2010 (c) László Németh, license: GNU LGPL + + See LGPL Version 3 below + +LanguageTool Grammar Checker + + The following software may be included in this product: LanguageTool + Grammar Checker. Use of any of this software is governed by the terms + of the license below: + + See LGPL Version 3 below + +Lightproof Grammar Checker + + The following software may be included in this product: Lightproof + Grammar Checker. Use of any of this software is governed by the terms + of the license below: + + 2009-2010 (c) László Németh, license: GNU LGPL + + See LGPL Version 3 below + +Numbertext + + The following software may be included in this product: Numbertext. + Use of any of this software is governed by the terms of the license + below: + + License: LGPL/BSD dual-license, 2009-2010 (C) László Németh (nemeth at + openoffice dot org) + + Numbertext language data (Soros programs): + + LGPL/BSD dual-license, 2009-2010 (C) László Németh et al. (see + AUTHORS) + + Serbian modules: + + CC/LGPL/BSD tri-license, 2009 (C) Goran Rakic (grakic at devbase dot + net) + + Note: for full distribution with specifications, IDE and JavaScript + implementation, see http://NUMBERTEXT.org + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. + + See LGPL Version 3 below + +OpenOffice.org Blogger - Metaweblog support + + The following software may be included in this product: OpenOffice.org + Blogger. Use of any of this software is governed by the terms of the + license below: + + Copyright © Caolán McNamara (2009) caolanm@redhat.com + + Licensed under LGPLv3 or later. + + See LGPL Version 3 below + +Solver for Nonlinear Programming + + The following software may be included in this product: zlib. Use of + any of this software is governed by the terms of the license below: + + Copyright 2009 by Sun Microsystems, Inc. + + See LGPL Version 3 below + +Typography Toolbar + + The following software may be included in this product: Typography + Toolbar. Use of any of this software is governed by the terms of the + license below: + + 2009-2010 (c) László Németh, license: GNU LGPL + + See LGPL Version 3 below + +Validator + + The following software may be included in this product: Validator. Use + of any of this software is governed by the terms of the license below: + + Copyright © Tibor Hornyák and OxygenOffice Professional Team - + http://ooop.sf.net/ + + See LGPL Version 3 below + +WatchWindow + + The following software may be included in this product: WatchWindow. + Use of any of this software is governed by the terms of the license + below: + + Copyright © Tibor Hornyák and OxygenOffice Professional Team - + http://ooop.sf.net/ + + See LGPL Version 3 below + + Fonts + +Adobe PostScript® AFM files + + The following software may be included in this product: PostScript® + AFM Files. Use of any of this software is governed by the terms of the + license below: + + Adobe Core 35 AFM Files with 314 Glyph Entries + + This file and the 35 PostScript® AFM files it accompanies may be used, + copied, and distributed for any purpose and without charge, with or + without modification, provided that all copyright notices are + retained; that the AFM files are not distributed without this file; + that all modifications to this file or any of the AFM files are + prominently noted in the modified file(s); and that this paragraph is + not modified. Adobe Systems has no responsibility or obligation to + support the use of the AFM files. + +Deja Vu + + The following software may be included in this product: Deja Vu fonts. + Use of any of this software is governed by the terms of the license + below: + + Fonts are (c) Bitstream (see below). DejaVu changes are in public + domain. Glyphs imported from Arev fonts are (c) Tavmjong Bah (see + below) + + Bitstream Vera Fonts Copyright + + Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream + Vera is a trademark of Bitstream, Inc. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of the fonts accompanying this license ("Fonts") and associated + documentation files (the "Font Software"), to reproduce and distribute + the Font Software, including without limitation the rights to use, + copy, merge, publish, distribute, and/or sell copies of the Font + Software, and to permit persons to whom the Font Software is furnished + to do so, subject to the following conditions: + + The above copyright and trademark notices and this permission notice + shall be included in all copies of one or more of the Font Software + typefaces. + + The Font Software may be modified, altered, or added to, and in + particular the designs of glyphs or characters in the Fonts may be + modified and additional glyphs or characters may be added to the + Fonts, only if the fonts are renamed to names not containing either + the words "Bitstream" or the word "Vera". + + This License becomes null and void to the extent applicable to Fonts + or Font Software that has been modified and is distributed under the + "Bitstream Vera" names. + + The Font Software may be sold as part of a larger software package but + no copy of one or more of the Font Software typefaces may be sold by + itself. + + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL + BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, + OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT + SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + + Except as contained in this notice, the names of Gnome, the Gnome + Foundation, and Bitstream Inc., shall not be used in advertising or + otherwise to promote the sale, use or other dealings in this Font + Software without prior written authorization from the Gnome Foundation + or Bitstream Inc., respectively. For further information, contact: + fonts at gnome dot org. + + Arev Fonts Copyright + + Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of the fonts accompanying this license ("Fonts") and associated + documentation files (the "Font Software"), to reproduce and distribute + the modifications to the Bitstream Vera Font Software, including + without limitation the rights to use, copy, merge, publish, + distribute, and/or sell copies of the Font Software, and to permit + persons to whom the Font Software is furnished to do so, subject to + the following conditions: + + The above copyright and trademark notices and this permission notice + shall be included in all copies of one or more of the Font Software + typefaces. + + The Font Software may be modified, altered, or added to, and in + particular the designs of glyphs or characters in the Fonts may be + modified and additional glyphs or characters may be added to the + Fonts, only if the fonts are renamed to names not containing either + the words "Tavmjong Bah" or the word "Arev". + + This License becomes null and void to the extent applicable to Fonts + or Font Software that has been modified and is distributed under the + "Tavmjong Bah Arev" names. + + The Font Software may be sold as part of a larger software package but + no copy of one or more of the Font Software typefaces may be sold by + itself. + + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL + TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + OTHER DEALINGS IN THE FONT SOFTWARE. + + Except as contained in this notice, the name of Tavmjong Bah shall not + be used in advertising or otherwise to promote the sale, use or other + dealings in this Font Software without prior written authorization + from Tavmjong Bah. For further information, contact: tavmjong @ free . + fr. + +Gentium + + The following software may be included in this product: Gentium fonts. + Use of any of this software is governed by the terms of the license + below: + + Copyright (c) 2003-2008 SIL International (http://www.sil.org/), + with Reserved Font Names "Gentium" and "SIL". + + This Font Software is licensed under the SIL Open Font License, + Version 1.1. This license is copied below, and is also available with + a FAQ at: http://scripts.sil.org/OFL + + SIL OPEN FONT LICENSE Version 1.1 - 1 February 2007 + + PREAMBLE The goals of the Open Font License (OFL) are to stimulate + worldwide development of collaborative font projects, to support the + font creation efforts of academic and linguistic communities, and to + provide a free and open framework in which fonts may be shared and + improved in partnership with others. + + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that the font + names of derivative works are changed. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply to + any document created using the fonts or their derivatives. + + DEFINITIONS "Font Software" refers to the set of files released by the + Copyright Holder(s) under this license and clearly marked as such. + This may include source files, build scripts and documentation. + + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + + "Original Version" refers to the collection of Font Software + components as distributed by the Copyright Holder(s). + + "Modified Version" refers to any derivative made by adding to, + deleting, or substituting -- in part or in whole -- any of the + components of the Original Version, by changing formats or by porting + the Font Software to a new environment. + + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + + PERMISSION & CONDITIONS Permission is hereby granted, free of charge, + to any person obtaining a copy of the Font Software, to use, study, + copy, merge, embed, modify, redistribute, and sell modified and + unmodified copies of the Font Software, subject to the following + conditions: + + 1) Neither the Font Software nor any of its individual components, in + Original or Modified Versions, may be sold by itself. + + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created using + the Font Software. + + TERMINATION This license becomes null and void if any of the above + conditions are not met. + + DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO + EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, + OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT + SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Liberation + + The following software may be included in this product: Liberation + fonts. Use of any of this software is governed by the terms of the + license below: + + This font set had been released under GNU Public License version 2 + ("GPLv2") with exceptions. + + See GPL Version 2 below + + LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY + LIBERATION FONT SOFTWARE + + This agreement governs the use of the Software and any updates to the + Software, regardless of the delivery mechanism. Subject to the + following terms, Red Hat, Inc. ("Red Hat") grants to the user + ("Client") a license to this work pursuant to the GNU General Public + License v.2 with the exceptions set forth below and such other terms + as are set forth in this End User License Agreement. + + 1. The Software and License Exception. LIBERATION font software (the + "Software") consists of TrueType-OpenType formatted font software for + rendering LIBERATION typefaces in sans-serif, serif, and monospaced + character styles. You are licensed to use, modify, copy, and + distribute the Software pursuant to the GNU General Public License v.2 + with the following exceptions: + + (a) As a special exception, if you create a document which uses this + font, and embed this font or unaltered portions of this font into the + document, this font does not by itself cause the resulting document to + be covered by the GNU General Public License. This exception does not + however invalidate any other reasons why the document might be covered + by the GNU General Public License. If you modify this font, you may + extend this exception to your version of the font, but you are not + obligated to do so. If you do not wish to do so, delete this exception + statement from your version. + + (b) As a further exception, any distribution of the object code of the + Software in a physical product must provide you the right to access + and modify the source code for the Software and to reinstall that + modified version of the Software in object code form on the same + physical product on which you received it. + + 2. Intellectual Property Rights. The Software and each of its + components, including the source code, documentation, appearance, + structure and organization are owned by Red Hat and others and are + protected under copyright and other laws. Title to the Software and + any component, or to any copy, modification, or merged portion shall + remain with the aforementioned, subject to the applicable license. The + "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and + other countries. This agreement does not permit Client to distribute + modified versions of the Software using Red Hat's trademarks. If + Client makes a redistribution of a modified version of the Software, + then Client must modify the files names to remove any reference to the + Red Hat trademarks and must not use the Red Hat trademarks in any way + to reference or promote the modified Software. + + 3. Limited Warranty. To the maximum extent permitted under applicable + law, the Software is provided and licensed "as is" without warranty of + any kind, expressed or implied, including the implied warranties of + merchantability, non-infringement or fitness for a particular purpose. + Red Hat does not warrant that the functions contained in the Software + will meet Client's requirements or that the operation of the Software + will be entirely error free or appear precisely as described in the + accompanying documentation. + + 4. Limitation of Remedies and Liability. To the maximum extent + permitted by applicable law, Red Hat or any Red Hat authorized dealer + will not be liable to Client for any incidental or consequential + damages, including lost profits or lost savings arising out of the use + or inability to use the Software, even if Red Hat or such dealer has + been advised of the possibility of such damages. + + 5. General. If any provision of this agreement is held to be + unenforceable, that shall not affect the enforceability of the + remaining provisions. This agreement shall be governed by the laws of + the State of North Carolina and of the United States, without regard + to any conflict of laws provisions, except that the United Nations + Convention on the International Sale of Goods shall not apply. + + Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a + trademark of Red Hat, Inc. + +Linux Libertine G and Linux Biolinum G + + This Font Software is Copyright (c) 2003-2006, Philipp H. Poll + (http://linuxlibertine.sf.net/). + All Rights Reserved. + "Linux Libertine" is a Reserved Font Name for this Font Software. + + Graphite extension of the original Linux Libertine font was made by + Laszlo Nemeth under the same license. + Our fonts are free in the sense of the GPL. In short: Changing the + font is allowed as long as the derivative work is published under the + same license again. Pedantics keep claiming that the embedded use of + GPL-fonts in i.e. PDFs requires the free publication of the PDF as + well. This is why our GPL contains the so called "font exception". + + See GPL version 2 below + + As a special exception, if you create a document which uses this font, + and embed this font or unaltered portions of this font into the + document, this font does not by itself cause the resulting document to + be covered by the GNU General Public License. This exception does not + however invalidate any other reasons why the document might be covered + by the GNU General Public License. If you modify this font, you may + extend this exception to your version of the font, but you are not + obligated to do so. If you do not wish to do so, delete this exception + statement from your version. + + Additionally our fonts are licensed under the Open Fonts License (see + below). + + This Font Software is licensed under the SIL Open Font License, + Version 1.0. No modification of the license is permitted, only + verbatim copy is allowed. This license is copied below, and is also + available with a FAQ at: http://scripts.sil.org/OFL + + SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005 + + PREAMBLE The goals of the Open Font License (OFL) are to stimulate + worldwide development of cooperative font projects, to support the + font creation efforts of academic and linguistic communities, and to + provide an open framework in which fonts may be shared and improved in + partnership with others. + + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and sold with any software provided that the font names + of derivative works are changed. The fonts and derivatives, however, + cannot be released under any other type of license. + + DEFINITIONS "Font Software" refers to any and all of the following: - + font files - data files - source code - build scripts - documentation + + "Reserved Font Name" refers to the Font Software name as seen by users + and any other names as specified after the copyright statement. + + "Standard Version" refers to the collection of Font Software + components as distributed by the Copyright Holder. + + "Modified Version" refers to any derivative font software made by + adding to, deleting, or substituting -- in part or in whole -- any of + the components of the Standard Version, by changing formats or by + porting the Font Software to a new environment. + + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + + PERMISSION & CONDITIONS Permission is hereby granted, free of charge, + to any person obtaining a copy of the Font Software, to use, study, + copy, merge, embed, modify, redistribute, and sell modified and + unmodified copies of the Font Software, subject to the following + conditions: + + 1) Neither the Font Software nor any of its individual components, in + Standard or Modified Versions, may be sold by itself. + + 2) Standard or Modified Versions of the Font Software may be bundled, + redistributed and sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s), in part or in whole, unless explicit written permission is + granted by the Copyright Holder. This restriction applies to all + references stored in the Font Software, such as the font menu name and + other font description fields, which are used to differentiate the + font from others. + + 4) The name(s) of the Copyright Holder or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder and the Author(s) or with their explicit written + permission. + + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed using this license, and may not be distributed + under any other license. + + TERMINATION This license becomes null and void if any of the above + conditions are not met. + + DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO + EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, + OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT + SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + + Dictionaries + +Afrikaans + + Spelling dictionary + + The following software may be included in this product: Afrikaans + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Afrikaans Wordlist + + The Afrikaans wordlist used by MySpell is made up of multiple + wordlists. These are wither in the public domain, are used with the + authors permission or are licensed under the LGPL. The majority + of the words are derived from the Nieuwoudt and Viljoen list. + + The Nieuwoudt list was first published in this form in 1993 by Bernard + A Nieuwoudt. Contact details: origen at icon co za or bnieuwoudt at + acm org + + Copyright (C) 1993, 2003 Bernard A Nieuwoudt relicensed under the + LGPL. + + The Viljoen list is derived from the original Nieuwoudt list and is + used with permission of the author and relicensed under the LGPL. + + Copyright (C) 1998 Danie Viljoen + + MySpell Affix File + + Copyright (C) 2003 Dwayne Bailey under the LGPL based on the + original ispell list by Renier de Vos which was released under the BSD + license. + + Hyphenation patterns + + The following software may be included in this product: Afrikaans + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2005 Friedel Wolff + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + +Breton + + Spelling dictionary + + The following software may be included in this product: Breton + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + LICENSE : "An Drouizig" spelling dictionary : LGPL + +Catalan + + Spelling dictionary + + The following software may be included in this product: Catalan + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2002-2008 Joan Moratinos <jmo@softcatala.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. This program 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 General Public License for more details. You should have + received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + See GPL version 3 below + + Hyphenation patterns + + The following software may be included in this product: Catalan + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + See GPL version 3 below + + Thesaurus + + The following software may be included in this product: Catalan + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (C) 2009 Joan Montané <joan@montane.cat> --- SoftcatalÅ• + + License: GPL/LGPL + + See GPL version 3 below + + See LGPL version 3 below + +Czech + + Thesaurus + + The following software may be included in this product: Czech + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, + NLPlab, Faculty of Informatics, Masaryk University + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this data (the "Data"), to deal in the Data without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies of + the Data, and to permit persons to whom the Data is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Data. + + THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA + OR THE USE OR OTHER DEALINGS IN THE DATA. + +Croatian + + Spelling dictionary + + The following software may be included in this product: Croatian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + See LGPL Version 2.1 below + + Hyphenation patterns + + The following software may be included in this product: Croatian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + These patterns were manually converted from TeX hyphenation patterns + using the guide at + http://wiki.services.openoffice.org/wiki/Documentation/SL/Using_T + eX_hyphenation_patterns_in_OpenOffice.org + + Original version: + http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf + 8/patterns/txt/hyph-hr.pat.txt?revision=416 + + License: OpenOffice.org adaption of this file is licensed under the + GNU LGPL license. + + See LGPL Version 2.1 below + + Original license text: This file is part of hyph-utf8 package and + resulted from semi-manual conversions of hyphenation patterns into + UTF-8 in June 2008. + + Source: hrhyph.tex (1996-04-10) Author: Marinovic Igor <migor at + student.math.hr> + + The above mentioned file should become obsolete, and the author of the + original file should preferably modify this file instead. + + Modifications were needed in order to support native UTF-8 engines, + but functionality (hopefully) didn't change in any way, at least not + intentionally. This file is no longer stand-alone; at least for 8-bit + engines you probably want to use loadhyph-foo.tex (which will load + this file) instead. + + Modifications were done by Jonathan Kew, Mojca Miklavec & Arthur + Reutenauer with help & support from: - Karl Berry, who gave us free + hands and all resources - Taco Hoekwater, with useful macros - Hans + Hagen, who did the unicodifisation of patterns already long before and + helped with testing, suggestions and bug reports - Norbert Preining, + who tested & integrated patterns into TeX Live + + However, the "copyright/copyleft" owner of patterns remains the + original author. + + The copyright statement of this file is thus: + + Do with this file whatever needs to be done in future for the sake of + "a better world" as long as you respect the copyright of original + file. If you're the original author of patterns or taking over a new + revolution, please remove all of the TUG comments & credits that we + added here - you are the Queen / the King, we are only the servants. + + If you want to change this file, rather than uploading directly to + CTAN, we would be grateful if you could send it to us + (http://tug.org/tex-hyphen) or ask for credentials for SVN + repository and commit it yourself; we will then upload the whole + "package" to CTAN. + + Before a new "pattern-revolution" starts, please try to follow some + guidelines if possible: + + - \lccode is *forbidden*, and I really mean it - all the patterns + should be in UTF-8 - the only "allowed" TeX commands in this file are: + \patterns, \hyphenation, and if you really cannot do without, also + \input and \message - in particular, please no \catcode or \lccode + changes, they belong to loadhyph-foo.tex, and no \lefthyphenmin and + \righthyphenmin, they have no influence here and belong elsewhere - + \begingroup and/or \endinput is not needed - feel free to do whatever + you want inside comments + + We know that TeX is extremely powerful, but give a stupid parser at + least a chance to read your patterns. + + For more information see http://tug.org/tex-hyphen + +Danish + + Spelling dictionary + + The following software may be included in this product: Danish + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Stavekontrolden - Danish dictionary files for Hunspell + + Version 1.6 - 2010-09-19 + + da_DK.dic, da_DK.aff: © 2010 Foreningen for frit tilgćngelige + sprogvćrktÅ™jer + + http://www.stavekontrolden.dk + + These files are published under the following open source licenses: + * GNU GPL version 2.0 + * GNU LGPL version 2.1 + * Mozilla MPL version 1.1 + + This dictionary is based on data from Det Danske Sprog- og + Litteraturselskab + + (The Danish Society for Language and Literature), + http://www.dsl.dk. + + Hyphenation patterns + + The following software may be included in this product: Danish + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Thesaurus + + The following software may be included in this product: Danish + thesaurus. Use of any of this software is governed by the terms of the + license below: + * GNU GPL version 2.0 + * GNU LGPL version 2.1 + * Mozilla MPL version 1.1 + + Stavekontrolden - Danish thesaurus files for OpenOffice.org 3.0. + + Den Danske Ordbog - Synonymer + + DanNet - leksikalsk-semantisk ordnet fra Det Danske Sprog- og + Litteraturselskab og Center for Sprogteknologi, KÅ™benhavns Universitet + + © 2007 Foreningen for frit tilgćngelige sprogvćrktÅ™jer + +Dutch + + Spelling dictionary and hyphenation patterns + + The following software may be included in this product: Dutch spelling + dictionary and hyphenation patterns. Use of any of this software is + governed by the terms of the license below: + + 1. Name: Dutch word list for spell checking - OpenTaal + + 2. Version of words list: 2.00G; version of spell checking: 2.00G. + + 3. Requirements: Hunspell 1.2.8 and higher + + 4. Spelling Seal of Dutch Language Union: The OpenTaal list of lemmas + has received the Spelling Seal of Approval from the Dutch Language + Union, the formal Dutch language institute. For more information + please see: http://www.taalunieversum.org/keurmerk/ + + 5. Copyrights: © 2006-2010 OpenTaal, © 2001-2005 Simon Brouwer e.a., © + 1996 Nederlandstalige Tex Gebruikersgroep + + 6. Licenses: OpenTaal aims to create and publish free Dutch language + files. To enable the broadest (re)use the language files are freely + available under the below, liberal licenses at the discretion of the + user. We strongly recommend to read the applicable license before + usage. + + A. BSD (revised version): + + - Full license text: + http://creativecommons.org/licenses/BSD/legalcode + + - Summary: http://creativecommons.org/licenses/BSD/deed.en + + B. Creative Commons, Attribution 3.0 (unported) + + - Full license text: + http://creativecommons.org/licenses/by/3.0/legalcode + + - Summary: http://creativecommons.org/licenses/by/3.0/deed.en + + 7. Support OpenTaal: OpenTaal is a non-profit volunteer project. With + your (small) financial support OpenTaal will further expand its + activities and enhance its professionalism. Your donation is welcome + at account number: 15.62.32.782, BIC: RABONL2U, IBAN: + NL88RABO0156232782 of Stichting OpenTaal / OpenTaal Foundation. In the + Netherlands your donations are tax deductible. OpenTaal Foundation has + been designated by the Dutch Tax Administration as an Institution for + General Benefit (algemeen nut beogende instelling or ANBI). Please + see: http://belastingdienst.nl/anbi/ + + 8. Participate: Everyone is welcome to participate. Please give + feedback, discuss on the mailing list or run Harvester. By + contributing to the project you agree that your contribution is + available under free or/open source licenses. In case you wish, your + name will be mentioned on the website. Your are invited to send us + your written request. + + 9. Rights of third parties: OpenTaal respects the rights of third + parties and aims to keep its data freely available. Therefore you may + no use protected sources of third parties, i.e. dictionaries, without + their permission when you contribute to the project. It is permitted + to use the materials of the Dutch Language Union, i.e. their spelling + instruction and word list. In case you believe OpenTaal is violating + your rights, we ask you to send us a written notice as soon as + possible. + + 10.Contact: OpenTaal Foundation, http://www.opentaal.org, + bestuur@opentaal.org + +German + + Spelling dictionary + + The following software may be included in this product: German + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Author: Franz Michael Baumann <frami.baumann@web.de> + + License: GNU GPL Version 2 or GPL Version 3 or OASIS + 0.1 + + The "frami"-dictionary contains the complete word list of Björn + Jacke's "igerman98" + + (Version: 2011-03-21) and numerous supplements by Franz Michael + Baumann according to the reform of 2006-08-01. + + OASIS distribution license agreement 0.1 from 2005-11-10 + + Without any modifications this dictionary may be distributed with + programs that support the OASIS Open Document Format for Office + Applications and whose PRIMARY format for saving documents is the Open + Document Format. + + This requires that all licenses and copyright files are also + distributed together with the package the dictionary is shipped with. + + Any modifications of the dictionary files are not allowed for this + agreement, modifications require the use of the GNU GENERAL PUBLIC + LICENSE. + + If you have questions or don't get along with this, send me your + comments/questions/ideas to Bjoern Jacke <bjoern@j3e.de> + + See GPL version 3 below + + See GPL version 2 below + + Hyphenation patterns + + The following software may be included in this product: German + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Authors: Marco Huggenberger <marco@by-night.ch> / Daniel Naber <naber + at danielnaber de> + + Version: 2011-05-05 (author and license information in source file + added) + + License: GNU LGPL + + See LGPL Version 2.1 below + + Thesaurus + + The following software may be included in this product: German + thesaurus. Use of any of this software is governed by the terms of the + license below: + + OpenThesaurus - Deutscher Thesaurus - Synonyme und Assoziationen + + Version: 2011-05-04 AT + + License: GNU LGPL + + See LGPL Version 2.1 below + +English (Australia) + + Spelling dictionary + + The following software may be included in this product: English + (Australia) spelling dictionary. Use of any of this software is + governed by the terms of the license below: + + Copyright (C) 2006 Cameron Roy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. + + See GPL version 2 below + +English (Canada) + + Spelling dictionary + + The following software may be included in this product: English + (Canada) spelling dictionary. Use of any of this software is governed + by the terms of the license below: +Wordlist en_CA spelling and morphological dictionary for OpenOffice.org +Version 2008-12-18 + +Based on Wordlist Hunspell dictionaries version 2008-12-05 +and Wordlist POS and AGID data created by Kevin Atkinson +and released on http://wordlist.sourceforge.net. + +Other fixes: + +OOo Issue 48060 - add numbers with affixes by COMPOUNDRULE (1st, 111th, 1990s e +tc.) +New REP items (better suggestions for accented words and a few mistakes) +OOo Issue 63541 - remove *dessicated, *dessication + +László Németh <nemeth at OO.o> + +Original license: + +2008-12-05 Release + +README file for en_US and en_CA Hunspell dictionaries + +These dictionaries are created using the speller/make-hunspell-dict +dictionary in SCOWL, SVN revision 74. + +The NOSUGGEST flag was added to certain taboo words. While I made an +honest attempt to flag the strongest taboo words with the NOSUGGEST +flag, I MAKE NO GUARANTEE THAT I FLAGGED EVERY POSSIBLE TABOO WORD. +The list was originally derived from Németh László, however I removed +some words which, while being considered taboo by some dictionaries, +are not really considered swear words in today's society. + +You can find SCOWL and friend at http://wordlist.sourceforge.net/. +Bug reports should go to the Issue Tracker found on the previously +mentioned web site. General discussion should go to the +wordlist-devel at sourceforge net mailing list. + +COPYRIGHT, SOURCES, and CREDITS: + +The en_US and en_CA dictionaries come directly from SCOWL (up to level +60) and is thus under the same copyright of SCOWL. The affix file is +a heavily modified version of the original english.aff file which was +released as part of Geoff Kuenning's Ispell and as such is covered by +his BSD license. Part of SCOWL is also based on Ispell thus the +Ispell copyright is included with the SCOWL copyright. + +The collective work is Copyright 2000-2007 by Kevin Atkinson as well +as any of the copyrights mentioned below: + + Copyright 2000-2007 by Kevin Atkinson + + Permission to use, copy, modify, distribute and sell these word + lists, the associated scripts, the output created from the scripts, + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appears in all copies and + that both that copyright notice and this permission notice appear in + supporting documentation. Kevin Atkinson makes no representations + about the suitability of this array for any purpose. It is provided + "as is" without express or implied warranty. + +Alan Beale <biljir@pobox.com> also deserves special credit as he has, +in addition to providing the 12Dicts package and being a major +contributor to the ENABLE word list, given me an incredible amount of +feedback and created a number of special lists (those found in the +Supplement) in order to help improve the overall quality of SCOWL. + +The 10 level includes the 1000 most common English words (according to +the Moby (TM) Words II [MWords] package), a subset of the 1000 most +common words on the Internet (again, according to Moby Words II), and +frequently class 16 from Brian Kelk's "UK English Wordlist +with Frequency Classification". + +The MWords package was explicitly placed in the public domain: + + The Moby lexicon project is complete and has + been place into the public domain. Use, sell, + rework, excerpt and use in any way on any platform. + + Placing this material on internal or public servers is + also encouraged. The compiler is not aware of any + export restrictions so freely distribute world-wide. + + You can verify the public domain status by contacting + + Grady Ward + 3449 Martha Ct. + Arcata, CA 95521-4884 + + grady@netcom.com + grady@northcoast.com + +The "UK English Wordlist With Frequency Classification" is also in the +Public Domain: + + Date: Sat, 08 Jul 2000 20:27:21 +0100 + From: Brian Kelk <Brian.Kelk@cl.cam.ac.uk> + + > I was wondering what the copyright status of your "UK English + > Wordlist With Frequency Classification" word list as it seems to + > be lacking any copyright notice. + + There were many many sources in total, but any text marked + "copyright" was avoided. Locally-written documentation was one + source. An earlier version of the list resided in a filespace called + PUBLIC on the University mainframe, because it was considered public + domain. + + Date: Tue, 11 Jul 2000 19:31:34 +0100 + + > So are you saying your word list is also in the public domain? + + That is the intention. + +The 20 level includes frequency classes 7-15 from Brian's word list. + +The 35 level includes frequency classes 2-6 and words appearing in at +least 11 of 12 dictionaries as indicated in the 12Dicts package. All +words from the 12Dicts package have had likely inflections added via +my inflection database. + +The 12Dicts package and Supplement is in the Public Domain. + +The WordNet database, which was used in the creation of the +Inflections database, is under the following copyright: + + This software and database is being provided to you, the LICENSEE, + by Princeton University under the following license. By obtaining, + using and/or copying this software and database, you agree that you + have read, understood, and will comply with these terms and + conditions.: + + Permission to use, copy, modify and distribute this software and + database and its documentation for any purpose and without fee or + royalty is hereby granted, provided that you agree to comply with + the following copyright notice and statements, including the + disclaimer, and that the same appear on ALL copies of the software, + database and documentation, including modifications that you make + for internal use or for distribution. + + WordNet 1.6 Copyright 1997 by Princeton University. All rights + reserved. + + THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON + UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON + UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- + ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE + LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY + THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + + The name of Princeton University or Princeton may not be used in + advertising or publicity pertaining to distribution of the software + and/or database. Title to copyright in this software, database and + any associated documentation shall at all times remain with + Princeton University and LICENSEE agrees to preserve same. + +The 40 level includes words from Alan's 3esl list found in version 4.0 +of his 12dicts package. Like his other stuff the 3esl list is also in the +public domain. + +The 50 level includes Brian's frequency class 1, words words appearing +in at least 5 of 12 of the dictionaries as indicated in the 12Dicts +package, and uppercase words in at least 4 of the previous 12 +dictionaries. A decent number of proper names is also included: The +top 1000 male, female, and Last names from the 1990 Census report; a +list of names sent to me by Alan Beale; and a few names that I added +myself. Finally a small list of abbreviations not commonly found in +other word lists is included. + +The name files form the Census report is a government document which I +don't think can be copyrighted. + +The file special-jargon.50 uses common.lst and word.lst from the +"Unofficial Jargon File Word Lists" which is derived from "The Jargon +File". All of which is in the Public Domain. This file also contain +a few extra UNIX terms which are found in the file "unix-terms" in the +special/ directory. + +The 55 level includes words from Alan's 2of4brif list found in version +4.0 of his 12dicts package. Like his other stuff the 2of4brif is also +in the public domain. + +The 60 level includes Brian's frequency class 0 and all words +appearing in at least 2 of the 12 dictionaries as indicated by the +12Dicts package. A large number of names are also included: The 4,946 +female names and the 3,897 male names from the MWords package. + +The 70 level includes the 74,550 common dictionary words and the +21,986 names list from the MWords package The common dictionary words, +like those from the 12Dicts package, have had all likely inflections +added. The 70 level also included the 5desk list from version 4.0 of +the 12Dics package which is the public domain + +The 80 level includes the ENABLE word list, all the lists in the +ENABLE supplement package (except for ABLE), the "UK Advanced Cryptics +Dictionary" (UKACD), the list of signature words in from YAWL package, +and the 10,196 places list from the MWords package. + +The ENABLE package, mainted by M\Cooper <thegrendel@theriver.com>, +is in the Public Domain: + + The ENABLE master word list, WORD.LST, is herewith formally released + into the Public Domain. Anyone is free to use it or distribute it in + any manner they see fit. No fee or registration is required for its + use nor are "contributions" solicited (if you feel you absolutely + must contribute something for your own peace of mind, the authors of + the ENABLE list ask that you make a donation on their behalf to your + favorite charity). This word list is our gift to the Scrabble + community, as an alternate to "official" word lists. Game designers + may feel free to incorporate the WORD.LST into their games. Please + mention the source and credit us as originators of the list. Note + that if you, as a game designer, use the WORD.LST in your product, + you may still copyright and protect your product, but you may *not* + legally copyright or in any way restrict redistribution of the + WORD.LST portion of your product. This *may* under law restrict your + rights to restrict your users' rights, but that is only fair. + +UKACD, by J Ross Beresford <ross@bryson.demon.co.uk>, is under the +following copyright: + + Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved. + + The following restriction is placed on the use of this publication: + if The UK Advanced Cryptics Dictionary is used in a software package + or redistributed in any form, the copyright notice must be + prominently displayed and the text of this document must be included + verbatim. + + There are no other restrictions: I would like to see the list + distributed as widely as possible. + +The 95 level includes the 354,984 single words and 256,772 compound +words from the MWords package, ABLE.LST from the ENABLE Supplement, +and some additional words found in my part-of-speech database that +were not found anywhere else. + +Accent information was taken from UKACD. + +My VARCON package was used to create the American, British, and +Canadian word list. + +Since the original word lists used used in the VARCON package came +from the Ispell distribution they are under the Ispell copyright: + + Copyright 1993, Geoff Kuenning, Granada Hills, CA + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All modifications to the source code must be clearly marked as + such. Binary redistribution based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + (clause 4 removed with permission from Geoff Kuenning) + 5. The name of Geoff Kuenning may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS + IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEOFF + KUENNING OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +English (South Africa) + + Spelling dictionary + + The following software may be included in this product: English (South + Africa) spelling dictionary. Use of any of this software is governed + by the terms of the license below: + + See LGPL Version 2.1 below + +English (United Kingdom) + + Spelling dictionary + + The following software may be included in this product: English + (United Kingdom) spelling dictionary. Use of any of this software is + governed by the terms of the license below: + + See LGPL Version 2.1 below + + Hyphenation patterns + + The following software may be included in this product: English + (United Kingdom) hyphenation patterns. Use of any of this software is + governed by the terms of the license below: + + BSD-style. Unlimited copying, redistribution and modification of this + file is permitted with this copyright and license information. + +English (USA) + + Spelling dictionary + + The following software may be included in this product: English (USA) + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + See English (Canada). + + Hyphenation patterns + + The following software may be included in this product: English (USA) + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + BSD-style. Unlimited copying, redistribution and modification of this + file + is permitted with this copyright and license information. + + Thesaurus + + The following software may be included in this product: English (USA) + thesaurus. Use of any of this software is governed by the terms of the + license below: + + WordNet Release 2.1 + + This software and database is being provided to you, the LICENSEE, by + Princeton University under the following license. By obtaining, using + and/or copying this software and database, you agree that you have + read, understood, and will comply with these terms and conditions.: + + Permission to use, copy, modify and distribute this software and + database and its documentation for any purpose and without fee or + royalty is hereby granted, provided that you agree to comply with the + following copyright notice and statements, including the disclaimer, + and that the same appear on ALL copies of the software, database and + documentation, including modifications that you make for internal use + or for distribution. + + WordNet 2.1 Copyright 2005 by Princeton University. All rights + reserved. + + THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON + UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. + BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO + REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY + PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE + OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + + The name of Princeton University or Princeton may not be used in + advertising or publicity pertaining to distribution of the software + and/or database. Title to copyright in this software, database and any + associated documentation shall at all times remain with Princeton + University and LICENSEE agrees to preserve same. + +Estonian + + Spelling dictionary + + The following software may be included in this product: Estonian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Dictionary is adapted to myspell by Jaak Pruulmann (jjpp@meso.ee, + http://www.meso.ee/~jjpp/speller/ ) on the base of word list + created and shared by IEL (Institute of the Estonian Language, + tarkvara@eki.ee). The original of EKI software license is available at + http://www.eki.ee/eki/licence.html. The work of Jaak Pruulmann is + licensed under LGPL (GNU Lesser General Public License). The copies of + licenses are added to current file. IEL is informed about the use of + this word list. + + Software License Agreement + + Institute of the Estonian Language + + Copyright © Institute of the Estonian Language + + E-mail: tarkvara@eki.ee + + URL: http://www.eki.ee/tarkvara/ + + The present License Agreement gives the user of this Software Product + (hereinafter: Product) the right to use the Product for whatever + purpose (incl. distribution, copying, altering, inclusion in other + software, and selling) on the following conditions: + + The present License Agreement should belong unaltered to each copy + ever made of this Product; + + Neither the Institute of the Estonian Language (hereinafter: IEL) nor + the author(s) of the Product will take responsibility for any + detriment, direct or indirect, possibly ensuing from the application + of the Product; + + The IEL is ready to share the Product with other users as we wish to + advance research on the Estonian language and to promote the use of + Estonian in IT-technology now rapidly developing, yet we refuse to + bind ourselves to any further obligation, which means that the IEL is + not obliged either to warrant the suitability of the Product for a + concrete use, to improve the program, or to provide a more detailed + description of the underlying algorithms. (Which does not mean, + though, that we may not do it.) + + Whenever you use the Product, we request that you inform us by writing + to the e-mail address tarkvara@eki.ee or to street address listed + below. + + Institute of the Estonian Language + + Roosikrantsi 6 + EE-10119 Tallinn + ESTONIA + + E-mail: eki@eki.ee + Phone & Fax: +372-6411443 + + See LGPL Version 2.1 below + + Hyphenation patterns + + The following software may be included in this product: Estonian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Hyphenation file is adapted to OpenOffice.org by Jaak Pruulmann + (jjpp@meso.ee, http://www.meso.ee/~jjpp/speller/) on the base of + the LaTeX hyphenation file created by Enn Saar (saar@aai.ee), who has + signed the JCA (Joint Copyright Agreement) allowing to use his work + for OpenOffice.org. The original file is available at address + http://www.cs.ut.ee/~tqnu/eehyph.tex and in the heading of the + file it is written that this file is licensed under LPPL. The work of + Jaak Pruulmann is licensed under LGPL (GNU Lesser General Public + License). + + See LPPL below + + See LGPL Version 2.1 below + +French + + Spelling dictionary + + The following software may be included in this product: French + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Olivier R. - dicollecte<at>free<dot>fr + + Dicollecte: http://www.dicollecte.org/ + + Licenses: + * MPL: Mozilla Public License version 1.1 or higher + * GPL: GNU General Public License version 2.0 or higher + * LGPL: GNU Lesser General Public License version 2.1 or higher + + Hyphenation patterns + + The following software may be included in this product: French + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Origin: Based on the TeX hyphenation tables frhyph.tex (V2.12) + <2002/12/11> + http://mirror.ctan.org/language/hyphenation/frhyph.tex + + The TeX hyphenation tables are released under the LaTeX Project Public + License (LPPL) + + See LPPL below + + License: OpenOffice.org adaptions of this package are licensed under + the GNU Lesser General Public License (LGPL) version 2.1 or higher. + + See LGPL Version 2.1 below + + Author: Conversion author is Paul Pichaureau + <paul.pichaureau@alcandre.net> + + Based on a previous conversion by Blaise Drayer <blaise@drayer.ch> + + Thesaurus + + The following software may be included in this product: French + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Licence: LGPL: GNU Lesser General Public License version 2.1 or + higher. + + See LGPL Version 2.1 below + +Galician + + Spelling dictionary + + The following software may be included in this product: Galician + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + This extension was made by Frco. Javier Rial RodrÃguez for Mancomún, + Centro de Referencia e Servizos de Software Libre 2008 + + Spellchecker files (gl_ES.aff, gl_ES.dic) from Mar Castro Pereiro also + developed for Mancomún. + + Distributed under the GPL License. + + See GPL Version 3 below + +Hebrew + + Spelling dictionary + + The following software may be included in this product: Hebrew + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + This dictionary is Copyright (C) 2000-2009, Nadav Har'El + (nyh@math.technion.ac.il) and Dan Kenigsberg + (danken@cs.technion.ac.il). + + It is licensed under the GNU General Public License (GPL). + + See GPL Version 3 below + +Hungarian + + Spelling dictionary + + The following software may be included in this product: Hungarian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + GPL 2.0/LGPL 2.1/MPL 1.1 tri-license + + The contents of this software may be used under the terms of the GNU + General Public License Version 2 or later (the "GPL"), or the GNU + Lesser General Public License Version 2.1 or later (the "LGPL", see + COPYING.LGPL) or (excepting the LGPLed GNU gettext library in the + intl/ directory) the Mozilla Public License Version 1.1 or later (the + "MPL", see COPYING.MPL). + + Software distributed under these licenses is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the licences for the specific language governing rights and + limitations under the licenses. + + 2010 (c) László Németh & Ferenc Godó + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Hyphenation patterns + + The following software may be included in this product: Hungarian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Copyright © Bence Nagy <gimb (at) freemail (dot) hu>, 2006 + + Original license: GPL v2 + + Patch author: László Németh <nemeth (at) OOo> + + Patch license: MPL/GPL/LGPL + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Thesaurus + + The following software may be included in this product: Hungarian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (C) 2009, László Németh + + See GPL Version 2 below + +Italian + + Spelling dictionary + + The following software may be included in this product: Italian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2001, 2002 Gianluca Turconi + Copyright (C) 2002, 2003, 2004 Gianluca Turconi and Davide Prina + Copyright (C) 2004, 2005, 2006, 2007 Davide Prina + Copyright (C) 2010 Andrea Pescetti + + See GPL Version 3 below + + Hyphenation patterns + + The following software may be included in this product: Italian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Origin: Based on the TeX hyphenation tables by Claudio Beccari + + Author: conversion author is Giuseppe Bilotta + <giuseppe.bilotta@gmail.com> + + See LGPL Version 3 below + + Thesaurus + + The following software may be included in this product: Italian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (C) 2004,2005,2006,2007,2008 Daniela Volta + Copyright (C) 2008 Giovanni Zuliani + Copyright (C) 2006,2007,2008 Davide Prina + Copyright (C) 2010 Andrea Pescetti + + See GPL Version 3 below + +Kurdish + + Spelling dictionary + + The following software may be included in this product: Kurdish + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + (C) Copyright Reimar Heider <hunspell at ferheng dot org> + + With contributions from Kevin P. Scannell <scannell@slu.edu> and RÄ™zan + Tovjîn + + The original word list used for this package was augmented using Kevin + Scannell's web crawling software "An Crúbadán" and then hand-checked + by Ronahi and Tovjîn. + + Originally GPL, relicensed on 04-07-2007 to GPLv3, LGPLv3, MPL 1.1 + + See GPL Version 3 below + + See LGPL Version 3 below + + See MPL Version 1.1 below + +Lithuanian + + Spelling dictionary + + The following software may be included in this product: Lithuanian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (c) Albertas Agejevas <alga@uosis.mif.vu.lt>, 2000, 2001. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of the Albertas Agejevas nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS + IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Hyphenation patterns + + The following software may be included in this product: Lithuanian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Origin: TeX hyphenation tables by Sigitas Tolusis and Vytas + Statulevicius. The original tables can be found at + http://www.vtex.lt/tex/download/zip/texmf.zip as lthyphen.tex. + + Author: Converted to OOo format by Albertas Agejevas <alga@akl.lt> + + License: LaTeX Project Public Licence + + See LPPL below + +Nepali + + Spelling dictionary + + The following software may be included in this product: Nepali + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Compiled by Madan Puraskar Pustakalaya + + See LGPL Version 2.1 below + + Thesaurus + + The following software may be included in this product: Nepali + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Compiled by Madan Puraskar Pustakalaya + + See LGPL Version 2.1 below + +Norwegian + + Spelling dictionary + + The following software may be included in this product: Norwegian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + See GPL Version 2 below + + Hyphenation patterns + + The following software may be included in this product: Norwegian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + See GPL Version 2 below + + Thesaurus + + The following software may be included in this product: Norwegian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + See GPL Version 2 below + +Occitan + + Spelling dictionary + + The following software may be included in this product: Occitan + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2006 Bruno GALLART + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. + + See GPL Version 2 below + +Polish + + Spelling dictionary + + The following software may be included in this product: Polish + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + This dictionary for spell-checking Polish texts is licensed under GPL, + LGPL, MPL (Mozilla Public License) and Creative Commons ShareAlike + licenses (see http://creativecommons.org/licenses/sa/1.0). + + Hyphenation patterns + + The following software may be included in this product: Polish + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Origin: Based on the TeX hyphenation patterns plhyph.tex, version + 3.0a, Wednesday, May 17th, 1995. The original file is in CTAN + archives, for example + here:http://ctan.binkerton.com/ctan.readme.php?filename=language/ + polish/plhyph.tex and is licensed under LPPL. + + License: OpenOffice.org Adaptions of this package are licensed under + the GNU LGPL license. + + Author: conversion and corrects author is Artur Polaczynski + <artiip@gmail.com> + + See LGPL Version 3 below + + Thesaurus + + The following software may be included in this product: Polish + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (C) 2004-2008 Marcin Mil/kowski + <milek_pl@users.sourceforge.net> + + This product is made available subject to the terms of GNU Lesser + General Public License Version 2.1. + + See LGPL Version 2.1 below + +Portoguise (Brazil) + + Spelling dictionary + + The following software may be included in this product: Portoguise + (Brazilian) spelling dictionary. Use of any of this software is + governed by the terms of the license below: + + This dictionary is under development by Raimundo Moura and his team. + It is licensed under the terms of the GNU Lesser General Public + License version 2.1 (LGPLv2.1), as published by the Free Software + Foundation. The credits are available at + http://www.broffice.org/creditos and you can find new releases at + http://www.broffice.org/verortografico. + + Copyright (C) 2006 - 2008 by Raimundo Santos Moura + <raimundomoura@openoffice.org> + + See LGPL Version 2.1 below + + Hyphenation patterns + + The following software may be included in this product: Portoguise + (Brazilian) hyphenation patterns. Use of any of this software is + governed by the terms of the license below: + + These hyphenation patterns are under development by Raimundo Moura and + his team. It is licensed under the terms of the GNU Lesser General + Public License version 2.1 (LGPLv2.1), as published by the Free + Software Foundation. The credits are available at + http://www.broffice.org/creditos and you can find new releases at + http://www.broffice.org/verortografico. + + Copyright (C) 2008 - 2009 by Raimundo Santos Moura + <raimundomoura@openoffice.org> + + See LGPL Version 2.1 below + +Romanian + + Spelling dictionary + + The following software may be included in this product: Romanian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + GPL 2.0/LGPL 2.1/MPL 1.1 tri-license. + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Hyphenation patterns + + The following software may be included in this product: Romanian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + GNU General Public License Version 2 + + See GPL Version 2 below + + Thesaurus + + The following software may be included in this product: Romanian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + GNU General Public License Version 2 or later + + See GPL Version 2 below + +Russian + + Spelling dictionary + + The following software may be included in this product: Russian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (c) 1997-2008, Alexander I. Lebedev + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Modified versions must be clearly marked as such. + * The name of Alexander I. Lebedev may not be used to endorse or + promote products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Hyphenation patterns + + The following software may be included in this product: Russian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + unknown + + Thesaurus + + The following software may be included in this product: Russian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + License: GNU LGPL + + Author: Mikhail Korolyov <mkorolyov@yandex.ru> + + Origin: Abramov", N. Slovar' russkih" sinonimov" i shodnyh" po smyslu + vyrazhenij. Izd. 3-e, dop., Pg., 1911 + +Serbian + + Spelling dictionary + + The following software may be included in this product: Serbian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Serbian spellcheck dictionary (files sr.dic, sr.aff, sh.dic, sh.aff) + is released under disjunctive tri-licence GNU LGPL version 2.1 or + later / MPL version 1.1 or later / GNU GPL version 2 or later giving + you the choice of one of the three sets of free software licensing + terms. You can also use the dictionary under the terms of the Creative + Commons BY-SA 3.0 Unpored licence. + + Hyphenation patterns + + The following software may be included in this product: Serbian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Serbian hyphenation patterns (files hyph_sr.dic and hyph_sh.dic) are + derived from the official TeX patterns for Serbocroatian language + (Cyrillic and Latin) created by Dejan Muhamedagic + <dejan@hello-penguin.com> version 2.02 released on 22 June 2008. The + format is adopted for usage with Hyphen hyphenation library and is + released again as hyphen-sr under the compatible GNU LGPL version 2.1 + or later. + + See LGPL Version 2.1 below + +Slovak + + Spelling dictionary + + The following software may be included in this product: Slovak + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Data are released under these licenses (you can select one): + * The GNU General Public License (GPL) Version 2, June 1991 + * GNU Lesser General Public License Version 2.1, February 1999 + * Mozilla Public License 1.1 (MPL 1.1) + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Hyphenation patterns + + The following software may be included in this product: Slovak + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Dictionary is created by converting TeX hyphenation patterns for + Slovak (Author: Jana ChlebÃková) with lingucomponent-tools + (http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/oo-cs/lingucompon + ent-tools/). + + Original license: LPPL + + See LPPL below + + Thesaurus + + The following software may be included in this product: Slovak + thesaurus. Use of any of this software is governed by the terms of the + license below: + + Copyright (c) 2004-2010 Tibor Bako, yorik (at) szm.sk, Zdenko Podobný, + zposter (at) gmail.com + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this data (the "Data"), to deal in the Data without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies of + the Data, and to permit persons to whom the Data is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Data. + + THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA + OR THE USE OR OTHER DEALINGS IN THE DATA. + +Slovenian + + Spelling dictionary + + The following software may be included in this product: Slovenian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + See GPL Version 2 below + + See LGPL Version 2.1 below + + Hyphenation patterns + + The following software may be included in this product: Slovenian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + See GPL Version 2 below + + See LGPL Version 2.1 below + + Thesaurus + + The following software may be included in this product: Slovenian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + See LGPL Version 2.1 below + +Spanish + + Spelling dictionary + + The following software may be included in this product: Spanish + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + See LGPL Version 3 below + +Swahili + + Spelling dictionary + + The following software may be included in this product: Swahili + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2004 Jason M Githeko + + See LGPL Version 2.1 below + +Swedish + + Spelling dictionary + + The following software may be included in this product: Swedish + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright © 2003-08 Tom Westerberg <tweg@welho.com> and Göran + Andersson <goran@init.se>. + + The contents of The Swedish Dictionary for Spell Checking (i.e. the + files sv.aff and sv.dic) are subject to the Mozilla Public License + Version1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis,WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + Alternatively, The Swedish Dictionary may be used under the terms of + either the GNU General Public License Version 2 or later (the "GPL"), + or the GNU Lesser General Public License Version 2.1 or later (the + "LGPL"),in which case the provisions of the GPL or the LGPL are + applicable instead of those above. If you wish to allow use of your + version of this file only under the terms of either the GPL or the + LGPL, and not to allow others to use your version of this file under + the terms of the MPL, indicate your decision by deleting the + provisions above and replace them with the notice and other provisions + required by the GPL or the LGPL. If you do not delete the provisions + above, a recipient may use your version of this file under the terms + of any one of the MPL, the GPL or the LGPL. + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + +Thai + + Spelling dictionary + + The following software may be included in this product: Thai spelling + dictionary. Use of any of this software is governed by the terms of + the license below: + + See LGPL Version 2.1 below + +Ukrainian + + Spelling dictionary + + The following software may be included in this product: Ukrainian + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 1999 Vladimir Yakovchuk, Oleg Podgurniy + Copyright (C) 2001 Dmytro Kovalyov, Maksym Polyakov, Andriy Rysin + Copyright (C) 2002 Valentyn Solomko, Volodymyr M. Lisivka + Copyright (C) 2005 Andriy Rysin, Eugeniy Meshcheryakov, Dmytro + Kovalyov + Copyright (C) 2006-2009 Andriy Rysin + + This dictionary is licensed under GPL 2.0 or above, LGPL 2.1 or above + and MPL (Mozilla Public License) 1.1 licenses. + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + + Hyphenation patterns + + The following software may be included in this product: Ukrainian + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Copyright 1998-2002 Maksym Polyakov. + + License: GNU General Public License version 2 or any later version + + See GPL Version 2 below + + Thesaurus + + The following software may be included in this product: Ukrainian + thesaurus. Use of any of this software is governed by the terms of the + license below: + + This thesaurus is based on: P. M. Derkach, Korotkij slovnik + sinoniimiiv ukrayins'koyi movi, Radyans'ka shkola, Kiyiv, 1960 S. + Karavans'kij, Poshuk ukrayins'kogo slova + + Copyright (C) 2009 Andriy Rysin + + This thesaurus is licensed under GPL, LGPL and MPL (Mozilla Public + License) licenses. + + See GPL Version 2 below + + See LGPL Version 2.1 below + + See MPL Version 1.1 below + +Vietnamese + + Spelling dictionary + + The following software may be included in this product: Vietnamese + spelling dictionary. Use of any of this software is governed by the + terms of the license below: + + Authors: + Ivan Garcia <capiscuas@gmail.com> + Nguye>?n Xuân Minh <mxn@zoomtown.com> + + This spellchecker for OpenOffice was based on the Vietnamese + Dictionary list from Proffessor Ho>! Ngo-.c Äu9'c + + This spellchecker is released with GPLv2 license. + + See GPL Version 2 below + +Zulu + + Hyphenation patterns + + The following software may be included in this product: Zulu + hyphenation patterns. Use of any of this software is governed by the + terms of the license below: + + Copyright (C) 2005, 2007 Friedel Wolff + + See LGPL Version 2.1 below + + Artwork + +KDE Crystal theme icons + + The following software may be included in this product:KDE Crystal + theme icons. Use of any of this software is governed by the terms of + the license below: + + KDE Crystal theme icons. + Copyright (C) 2002 and following years KDE Artists This library is + free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the + Free Software Foundation, version 2.1 of the License. + + See LGPL Version 2.1 below + + Miscellaneous + +Adobe Printer Description Files + + The following software may be included in this product: Adobe Printer + Description Files. Use of any of this software is governed by the + terms of the license below: + + Copyright 1987-1995 Adobe Systems Incorporated. + + All Rights Reserved. + + Permission is granted for redistribution of this file as long as this + copyright notice is intact and the contents of the file is not altered + in any way from its original form. + + End of Copyright statement + +International Color Consortium sRGB Profiles + + The following software may be included in this product: ICC sRGB + Profiles. Use of any of this software is governed by the terms of the + license below: + + To anyone who acknowledges that the files + "sRGB_IEC61966-2-1_noBPC.icc" and "sRGB_IEC61966-2-1_withBPC.icc" are + provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to + use, copy and distribute these file for any purpose is hereby granted + without fee, provided that the files are not changed including the HP + copyright notice tag, and that the name of Hewlett-Packard Company + shall not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior + permission. Hewlett-Packard Company makes no representations about the + suitability of this software for any purpose. + +MathML DTD + + The following software may be included in this product: MathML DTD. + Use of any of this software is governed by the terms of the license + below: + + W3C^® SOFTWARE NOTICE AND LICENSE + + Copyright © 1994-2001 World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut National de + Recherche en Informatique et en Automatique, Keio University). + All Rights Reserved. http://www.w3.org/Consortium/Legal/ + + This W3C work (including software, documents, or other related items) + is being provided by the copyright holders under the following + license. By obtaining, using and/or copying this work, you (the + licensee) agree that you have read, understood, and will comply with + the following terms and conditions: + + Permission to use, copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include + the following on ALL copies of the software and documentation or + portions thereof, including modifications, that you make: + 1. The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, a short notice of the + following form (hypertext is preferred, text is permitted) should + be used within the body of any redistributed or derivative code: + "Copyright © [$date-of-software] World Wide Web Consortium, + (Massachusetts Institute of Technology, Institut + National de Recherche en Informatique et en Automatique, Keio + University). All Rights Reserved. + http://www.w3.org/Consortium/Legal/" + 3. Notice of any changes or modifications to the W3C files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.) + + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, + written prior permission. Title to copyright in this software and any + associated documentation will at all times remain with copyright + holders. + +NSIS + + The following software may be included in this product: NSIS (Nullsoft + Scriptable Install System). Use of any of this software is governed by + the terms of the license below: + + Copyright + + Copyright (C) 1995-2009 Contributors + + More detailed copyright information can be found in the individual + source code files. + + Applicable licenses + + * All NSIS source code, plug-ins, documentation, examples, header + files and graphics, with the exception of the compression modules + and where otherwise noted, are licensed under the zlib/libpng + license. + * The zlib compression module for NSIS is licensed under the + zlib/libpng license. + * The bzip2 compression module for NSIS is licensed under the bzip2 + license. + * The lzma compression module for NSIS is licensed under the Common + Public License version 1.0. + + zlib/libpng license + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source + distribution. + + bzip2 license + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + 1. Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + Julian Seward, Cambridge, UK. + + jseward@acm.org + + Common Public License version 1.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF + THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + 1. DEFINITIONS + + "Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and b) in the case of + each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and + are distributed by that particular Contributor. A Contribution + 'originates' from a Contributor if it was added to the Program by such + Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include additions to the Program which: (i) are + separate modules of software distributed in conjunction with the + Program under their own license agreement, and (ii) are not derivative + works of the Program. + + "Contributor" means any person or entity that distributes the Program. + + "Licensed Patents " mean patent claims licensable by a Contributor + which are necessarily infringed by the use or sale of its Contribution + alone or when combined with the Program. + + "Program" means the Contributions distributed in accordance with this + Agreement. + + "Recipient" means anyone who receives the Program under this + Agreement, including all Contributors. + + 2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare derivative works of, publicly display, + publicly perform, distribute and sublicense the Contribution of such + Contributor, if any, and such derivative works, in source code and + object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, if + any, in source code and object code form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. Each + Contributor disclaims any liability to Recipient for claims brought by + any other entity based on infringement of intellectual property rights + or otherwise. As a condition to exercising the rights and licenses + granted hereunder, each Recipient hereby assumes sole responsibility + to secure any other intellectual property rights needed, if any. For + example, if a third party patent license is required to allow + Recipient to distribute the Program, it is Recipient's responsibility + to acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + + 3. REQUIREMENTS + + A Contributor may choose to distribute the Program in object code form + under its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties or + conditions of merchantability and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability + for damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + + When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the + Program. + + Contributors may not remove or alter any copyright notices contained + within the Program. + + Each Contributor must identify itself as the originator of its + Contribution, if any, in a manner that reasonably allows subsequent + Recipients to identify the originator of the Contribution. + + 4. COMMERCIAL DISTRIBUTION + + Commercial distributors of software may accept certain + responsibilities with respect to end users, business partners and the + like. While this license is intended to facilitate the commercial use + of the Program, the Contributor who includes the Program in a + commercial product offering should do so in a manner which does not + create potential liability for other Contributors. Therefore, if a + Contributor includes the Program in a commercial product offering, + such Contributor ("Commercial Contributor") hereby agrees to defend + and indemnify every other Contributor ("Indemnified Contributor") + against any losses, damages and costs (collectively "Losses") arising + from claims, lawsuits and other legal actions brought by a third party + against the Indemnified Contributor to the extent caused by the acts + or omissions of such Commercial Contributor in connection with its + distribution of the Program in a commercial product offering. The + obligations in this section do not apply to any claims or Losses + relating to any actual or alleged intellectual property infringement. + In order to qualify, an Indemnified Contributor must: a) promptly + notify the Commercial Contributor in writing of such claim, and b) + allow the Commercial Contributor to control, and cooperate with the + Commercial Contributor in, the defense and any related settlement + negotiations. The Indemnified Contributor may participate in any such + claim at its own expense. + + For example, a Contributor might include the Program in a commercial + product offering, Product X. That Contributor is then a Commercial + Contributor. If that Commercial Contributor then makes performance + claims, or offers warranties related to Product X, those performance + claims and warranties are such Commercial Contributor's responsibility + alone. Under this section, the Commercial Contributor would have to + defend claims against the other Contributors related to those + performance claims and warranties, and if a court requires any other + Contributor to pay any damages as a result, the Commercial Contributor + must pay those damages. + + 5. NO WARRANTY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS + PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY + WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY + OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely + responsible for determining the appropriateness of using and + distributing the Program and assumes all risks associated with its + exercise of rights under this Agreement, including but not limited to + the risks and costs of program errors, compliance with applicable + laws, damage to or loss of data, programs or equipment, and + unavailability or interruption of operations. + + 6. DISCLAIMER OF LIABILITY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR + ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING + WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR + DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED + HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 7. GENERAL + + If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this Agreement, and without further + action by the parties hereto, such provision shall be reformed to the + minimum extent necessary to make such provision valid and enforceable. + + If Recipient institutes patent litigation against a Contributor with + respect to a patent applicable to software (including a cross-claim or + counterclaim in a lawsuit), then any patent licenses granted by that + Contributor to such Recipient under this Agreement shall terminate as + of the date such litigation is filed. In addition, if Recipient + institutes patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Program + itself (excluding combinations of the Program with other software or + hardware) infringes such Recipient's patent(s), then such Recipient's + rights granted under Section 2(b) shall terminate as of the date such + litigation is filed. + + All Recipient's rights under this Agreement shall terminate if it + fails to comply with any of the material terms or conditions of this + Agreement and does not cure such failure in a reasonable period of + time after becoming aware of such noncompliance. If all Recipient's + rights under this Agreement terminate, Recipient agrees to cease use + and distribution of the Program as soon as reasonably practicable. + However, Recipient's obligations under this Agreement and any licenses + granted by Recipient relating to the Program shall continue and + survive. + + Everyone is permitted to copy and distribute copies of this Agreement, + but in order to avoid inconsistency the Agreement is copyrighted and + may only be modified in the following manner. The Agreement Steward + reserves the right to publish new versions (including revisions) of + this Agreement from time to time. No one other than the Agreement + Steward has the right to modify this Agreement. IBM is the initial + Agreement Steward. IBM may assign the responsibility to serve as the + Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The + Program (including Contributions) may always be distributed subject to + the version of the Agreement under which it was received. In addition, + after a new version of the Agreement is published, Contributor may + elect to distribute the Program (including its Contributions) under + the new version. Except as expressly stated in Sections 2(a) and 2(b) + above, Recipient receives no rights or licenses to the intellectual + property of any Contributor under this Agreement, whether expressly, + by implication, estoppel or otherwise. All rights in the Program not + expressly granted under this Agreement are reserved. + + This Agreement is governed by the laws of the State of New York and + the intellectual property laws of the United States of America. No + party to this Agreement will bring a legal action under this Agreement + more than one year after the cause of action arose. Each party waives + its rights to a jury trial in any resulting litigation. + + Special exception for LZMA compression module + + Igor Pavlov and Amir Szekely, the authors of the LZMA compression + module for NSIS, expressly permit you to statically or dynamically + link your code (or bind by name) to the files from the LZMA + compression module for NSIS without subjecting your linked code to the + terms of the Common Public license version 1.0. Any modifications or + additions to files from the LZMA compression module for NSIS, however, + are subject to the terms of the Common Public License version 1.0. + + GNU Lesser General Public License Version 3 + + Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/> + + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + + This version of the GNU Lesser General Public License incorporates the + terms and conditions of version 3 of the GNU General Public License, + supplemented by the additional permissions listed below. + +0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser + General Public License, and the "GNU GPL" refers to version 3 of the + GNU General Public License. + + "The Library" refers to a covered work governed by this License, other + than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided + by the Library, but which is not otherwise based on the Library. + Defining a subclass of a class defined by the Library is deemed a mode + of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an + Application with the Library. The particular version of the Library + with which the Combined Work was made is also called the "Linked + Version". + + The "Minimal Corresponding Source" for a Combined Work means the + Corresponding Source for the Combined Work, excluding any source code + for portions of the Combined Work that, considered in isolation, are + based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the + object code and/or source code for the Application, including any data + and utility programs needed for reproducing the Combined Work from the + Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License + without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a + facility refers to a function or data to be supplied by an Application + that uses the facility (other than as an argument passed when the + facility is invoked), then you may convey a copy of the modified + version: + * a) under this License, provided that you make a good faith effort + to ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + * b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from a + header file that is part of the Library. You may convey such object + code under terms of your choice, provided that, if the incorporated + material is not limited to numerical parameters, data structure + layouts and accessors, or small macros, inline functions and templates + (ten or fewer lines in length), you do both of the following: + * a) Give prominent notice with each copy of the object code that + the Library is used in it and that the Library and its use are + covered by this License. + * b) Accompany the object code with a copy of the GNU GPL and this + license document. + +4. Combined Works. + + You may convey a Combined Work under terms of your choice that, taken + together, effectively do not restrict modification of the portions of + the Library contained in the Combined Work and reverse engineering for + debugging such modifications, if you also do each of the following: + * a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + * b) Accompany the Combined Work with a copy of the GNU GPL and this + license document. + * c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + * d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of + this License, and the Corresponding Application Code in a + form suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version + of the Linked Version to produce a modified Combined Work, in + the manner specified by section 6 of the GNU GPL for + conveying Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (a) uses at run + time a copy of the Library already present on the user's + computer system, and (b) will operate properly with a + modified version of the Library that is interface-compatible + with the Linked Version. + * e) Provide Installation Information, but only if you would + otherwise be required to provide such information under section 6 + of the GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the Application + with a modified version of the Linked Version. (If you use option + 4d0, the Installation Information must accompany the Minimal + Corresponding Source and Corresponding Application Code. If you + use option 4d1, you must provide the Installation Information in + the manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.) + +5. Combined Libraries. + + You may place library facilities that are a work based on the Library + side by side in a single library together with other library + facilities that are not Applications and are not covered by this + License, and convey such a combined library under terms of your + choice, if you do both of the following: + * a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities, conveyed under the terms of this License. + * b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions + of the GNU Lesser General Public License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Library + as you received it specifies that a certain numbered version of the + GNU Lesser General Public License "or any later version" applies to + it, you have the option of following the terms and conditions either + of that published version or of any later version published by the + Free Software Foundation. If the Library as you received it does not + specify a version number of the GNU Lesser General Public License, you + may choose any version of the GNU Lesser General Public License ever + published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide + whether future versions of the GNU Lesser General Public License shall + apply, that proxy's public statement of acceptance of any version is + permanent authorization for you to choose that version for the + Library. + + GNU Lesser General Public License Version 2.1 + +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts as the su +ccessor of the GNU Library Public License, version 2, hence the version number +2.1.] + +Preamble + + The licenses for most software are designed to take away your freedom + to share and change it. By contrast, the GNU General Public Licenses + are intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some + specially designated software packages--typically libraries--of the + Free Software Foundation and other authors who decide to use it. You + can use it too, but we suggest you first think carefully about whether + this license or the ordinary General Public License is the better + strategy to use in any particular case, based on the explanations + below. + + When we speak of free software, we are referring to freedom of use, + not price. Our General Public Licenses are designed to make sure that + you have the freedom to distribute copies of free software (and charge + for this service if you wish); that you receive source code or can get + it if you want it; that you can change the software and use pieces of + it in new free programs; and that you are informed that you can do + these things. + + To protect your rights, we need to make restrictions that forbid + distributors to deny you these rights or to ask you to surrender these + rights. These restrictions translate to certain responsibilities for + you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis + or for a fee, you must give the recipients all the rights that we gave + you. You must make sure that they, too, receive or can get the source + code. If you link other code with the library, you must provide + complete object files to the recipients, so that they can relink them + with the library after making changes to the library and recompiling + it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the + library, and (2) we offer you this license, which gives you legal + permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that there + is no warranty for the free library. Also, if the library is modified + by someone else and passed on, the recipients should know that what + they have is not the original version, so that the original author's + reputation will not be affected by problems that might be introduced + by others. + + Finally, software patents pose a constant threat to the existence of + any free program. We wish to make sure that a company cannot + effectively restrict the users of a free program by obtaining a + restrictive license from a patent holder. Therefore, we insist that + any patent license obtained for a version of the library must be + consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the + ordinary GNU General Public License. This license, the GNU Lesser + General Public License, applies to certain designated libraries, and + is quite different from the ordinary General Public License. We use + this license for certain libraries in order to permit linking those + libraries into non-free programs. + + When a program is linked with a library, whether statically or using a + shared library, the combination of the two is legally speaking a + combined work, a derivative of the original library. The ordinary + General Public License therefore permits such linking only if the + entire combination fits its criteria of freedom. The Lesser General + Public License permits more lax criteria for linking other code with + the library. + + We call this license the "Lesser" General Public License because it + does Less to protect the user's freedom than the ordinary General + Public License. It also provides other free software developers Less + of an advantage over competing non-free programs. These disadvantages + are the reason we use the ordinary General Public License for many + libraries. However, the Lesser license provides advantages in certain + special circumstances. + + For example, on rare occasions, there may be a special need to + encourage the widest possible use of a certain library, so that it + becomes a de-facto standard. To achieve this, non-free programs must + be allowed to use the library. A more frequent case is that a free + library does the same job as widely used non-free libraries. In this + case, there is little to gain by limiting the free library to free + software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free + programs enables a greater number of people to use a large body of + free software. For example, permission to use the GNU C Library in + non-free programs enables many more people to use the whole GNU + operating system, as well as its variant, the GNU/Linux operating + system. + + Although the Lesser General Public License is Less protective of the + users' freedom, it does ensure that the user of a program that is + linked with the Library has the freedom and the wherewithal to run + that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and + modification follow. Pay close attention to the difference between a + "work based on the library" and a "work that uses the library". The + former contains code derived from the library, whereas the latter must + be combined with the library in order to run. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other + program which contains a notice placed by the copyright holder or + other authorized party saying it may be distributed under the terms of + this Lesser General Public License (also called "this License"). Each + licensee is addressed as "you". + + A "library" means a collection of software functions and/or data + prepared so as to be conveniently linked with application programs + (which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work + which has been distributed under these terms. A "work based on the + Library" means either the Library or any derivative work under + copyright law: that is to say, a work containing the Library or a + portion of it, either verbatim or with modifications and/or translated + straightforwardly into another language. (Hereinafter, translation is + included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for + making modifications to it. For a library, complete source code means + all the source code for all modules it contains, plus any associated + interface definition files, plus the scripts used to control + compilation and installation of the library. + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running a program using the Library is not restricted, and output from + such a program is covered only if its contents constitute a work based + on the Library (independent of the use of the Library in a tool for + writing it). Whether that is true depends on what the Library does and + what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep intact + all the notices that refer to this License and to the absence of any + warranty; and distribute a copy of this License along with the + Library. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a + fee. + + 2. You may modify your copy or copies of the Library or any portion of + it, thus forming a work based on the Library, and copy and distribute + such modifications or work under the terms of Section 1 above, + provided that you also meet all of these conditions: + * a) The modified work must itself be a software library. + * b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + * c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + * d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Library, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Library, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote + it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Library. + + In addition, mere aggregation of another work not based on the Library + with the Library (or with a work based on the Library) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public + License instead of this License to a given copy of the Library. To do + this, you must alter all the notices that refer to this License, so + that they refer to the ordinary GNU General Public License, version 2, + instead of to this License. (If a newer version than version 2 of the + ordinary GNU General Public License has appeared, then you can specify + that version instead if you wish.) Do not make any other change in + these notices. + + Once this change is made in a given copy, it is irreversible for that + copy, so the ordinary GNU General Public License applies to all + subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of the + Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or derivative + of it, under Section 2) in object code or executable form under the + terms of Sections 1 and 2 above provided that you accompany it with + the complete corresponding machine-readable source code, which must be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange. + + If distribution of object code is made by offering access to copy from + a designated place, then offering equivalent access to copy the source + code from the same place satisfies the requirement to distribute the + source code, even though third parties are not compelled to copy the + source along with the object code. + + 5. A program that contains no derivative of any portion of the + Library, but is designed to work with the Library by being compiled or + linked with it, is called a "work that uses the Library". Such a work, + in isolation, is not a derivative work of the Library, and therefore + falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library + creates an executable that is a derivative of the Library (because it + contains portions of the Library), rather than a "work that uses the + library". The executable is therefore covered by this License. Section + 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file + that is part of the Library, the object code for the work may be a + derivative work of the Library even though the source code is not. + Whether this is true is especially significant if the work can be + linked without the Library, or if the work is itself a library. The + threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data structure + layouts and accessors, and small macros and small inline functions + (ten lines or less in length), then the use of the object file is + unrestricted, regardless of whether it is legally a derivative work. + (Executables containing this object code plus portions of the Library + will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may + distribute the object code for the work under the terms of Section 6. + Any executables containing that work also fall under Section 6, + whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or link + a "work that uses the Library" with the Library to produce a work + containing portions of the Library, and distribute that work under + terms of your choice, provided that the terms permit modification of + the work for the customer's own use and reverse engineering for + debugging such modifications. + + You must give prominent notice with each copy of the work that the + Library is used in it and that the Library and its use are covered by + this License. You must supply a copy of this License. If the work + during execution displays copyright notices, you must include the + copyright notice for the Library among them, as well as a reference + directing the user to the copy of this License. Also, you must do one + of these things: + * a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood that + the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + * b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + * c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + * d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + * e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the + Library" must include any data and utility programs needed for + reproducing the executable from it. However, as a special exception, + the materials to be distributed need not include anything that is + normally distributed (in either source or binary form) with the major + components (compiler, kernel, and so on) of the operating system on + which the executable runs, unless that component itself accompanies + the executable. + + It may happen that this requirement contradicts the license + restrictions of other proprietary libraries that do not normally + accompany the operating system. Such a contradiction means you cannot + use both them and the Library together in an executable that you + distribute. + + 7. You may place library facilities that are a work based on the + Library side-by-side in a single library together with other library + facilities not covered by this License, and distribute such a combined + library, provided that the separate distribution of the work based on + the Library and of the other library facilities is otherwise + permitted, and provided that you do these two things: + * a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + * b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute the + Library except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense, link with, or distribute the + Library is void, and will automatically terminate your rights under + this License. However, parties who have received copies, or rights, + from you under this License will not have their licenses terminated so + long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Library or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Library (or any work based on the + Library), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the + Library), the recipient automatically receives a license from the + original licensor to copy, distribute, link with or modify the Library + subject to these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties with + this License. + + 11. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Library at all. For example, if a patent + license would not permit royalty-free redistribution of the Library by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Library. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply, and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Library under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new + versions of the Lesser General Public License from time to time. Such + new versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Library + specifies a version number of this License which applies to it and + "any later version", you have the option of following the terms and + conditions either of that version or of any later version published by + the Free Software Foundation. If the Library does not specify a + license version number, you may choose any version ever published by + the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free + programs whose distribution conditions are incompatible with these, + write to the author to ask for permission. For software which is + copyrighted by the Free Software Foundation, write to the Free + Software Foundation; we sometimes make exceptions for this. Our + decision will be guided by the two goals of preserving the free status + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR + OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE + LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME + THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING + RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A + FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + + END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest + possible use to the public, we recommend making it free software that + everyone can redistribute and change. You can do so by permitting + redistribution under these terms (or, alternatively, under the terms + of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. It + is safest to attach them to the start of each source file to most + effectively convey the exclusion of warranty; and each file should + have at least the "copyright" line and a pointer to where the full + notice is found. +one line to give the library's name and an idea of what it does. +Copyright (C) year name of author + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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 for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Also add information on how to contact you by electronic and paper + mail. + + You should also get your employer (if you work as a programmer) or + your school, if any, to sign a "copyright disclaimer" for the library, + if necessary. Here is a sample; alter the names: +Yoyodyne, Inc., hereby disclaims all copyright interest in +the library `Frob' (a library for tweaking knobs) written +by James Random Hacker. + +signature of Ty Coon, 1 April 1990 +Ty Coon, President of Vice + + That's all there is to it! + + GNU General Public License Version 3 + + Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/> + + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + +Preamble + + The GNU General Public License is a free, copyleft license for + software and other kinds of works. + + The licenses for most software and other practical works are designed + to take away your freedom to share and change the works. By contrast, + the GNU General Public License is intended to guarantee your freedom + to share and change all versions of a program--to make sure it remains + free software for all its users. We, the Free Software Foundation, use + the GNU General Public License for most of our software; it applies + also to any other work released this way by its authors. You can apply + it to your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + them if you wish), that you receive source code or can get it if you + want it, that you can change the software or use pieces of it in new + free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you + these rights or asking you to surrender the rights. Therefore, you + have certain responsibilities if you distribute copies of the + software, or if you modify it: responsibilities to respect the freedom + of others. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must pass on to the recipients the same + freedoms that you received. You must make sure that they, too, receive + or can get the source code. And you must show them these terms so they + know their rights. + + Developers that use the GNU GPL protect your rights with two steps: + (1) assert copyright on the software, and (2) offer you this License + giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains + that there is no warranty for this free software. For both users' and + authors' sake, the GPL requires that modified versions be marked as + changed, so that their problems will not be attributed erroneously to + authors of previous versions. + + Some devices are designed to deny users access to install or run + modified versions of the software inside them, although the + manufacturer can do so. This is fundamentally incompatible with the + aim of protecting users' freedom to change the software. The + systematic pattern of such abuse occurs in the area of products for + individuals to use, which is precisely where it is most unacceptable. + Therefore, we have designed this version of the GPL to prohibit the + practice for those products. If such problems arise substantially in + other domains, we stand ready to extend this provision to those + domains in future versions of the GPL, as needed to protect the + freedom of users. + + Finally, every program is threatened constantly by software patents. + States should not allow patents to restrict development and use of + software on general-purpose computers, but in those that do, we wish + to avoid the special danger that patents applied to a free program + could make it effectively proprietary. To prevent this, the GPL + assures that patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and + modification follow. + +TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds + of works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this + License. Each licensee is addressed as "you". "Licensees" and + "recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work + in a fashion requiring copyright permission, other than the making of + an exact copy. The resulting work is called a "modified version" of + the earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based + on the Program. + + To "propagate" a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it on a + computer or modifying a private copy. Propagation includes copying, + distribution (with or without modification), making available to the + public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other + parties to make or receive copies. Mere interaction with a user + through a computer network, with no transfer of a copy, is not + conveying. + + An interactive user interface displays "Appropriate Legal Notices" to + the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to the + extent that warranties are provided), that licensees may convey the + work under this License, and how to view a copy of this License. If + the interface presents a list of user commands or options, such as a + menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work for + making modifications to it. "Object code" means any non-source form of + a work. + + A "Standard Interface" means an interface that either is an official + standard defined by a recognized standards body, or, in the case of + interfaces specified for a particular programming language, one that + is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other + than the work as a whole, that (a) is included in the normal form of + packaging a Major Component, but which is not part of that Major + Component, and (b) serves only to enable use of the work with that + Major Component, or to implement a Standard Interface for which an + implementation is available to the public in source code form. A + "Major Component", in this context, means a major essential component + (kernel, window system, and so on) of the specific operating system + (if any) on which the executable work runs, or a compiler used to + produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all + the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including scripts to + control those activities. However, it does not include the work's + System Libraries, or general-purpose tools or generally available free + programs which are used unmodified in performing those activities but + which are not part of the work. For example, Corresponding Source + includes interface definition files associated with source files for + the work, and the source code for shared libraries and dynamically + linked subprograms that the work is specifically designed to require, + such as by intimate data communication or control flow between those + subprograms and other parts of the work. + + The Corresponding Source need not include anything that users can + regenerate automatically from other parts of the Corresponding Source. + + The Corresponding Source for a work in source code form is that same + work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of + copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running a + covered work is covered by this License only if the output, given its + content, constitutes a covered work. This License acknowledges your + rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not convey, + without conditions so long as your license otherwise remains in force. + You may convey covered works to others for the sole purpose of having + them make modifications exclusively for you, or provide you with + facilities for running those works, provided that you comply with the + terms of this License in conveying all material for which you do not + control copyright. Those thus making or running the covered works for + you must do so exclusively on your behalf, under your direction and + control, on terms that prohibit them from making any copies of your + copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under the + conditions stated below. Sublicensing is not allowed; section 10 makes + it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological + measure under any applicable law fulfilling obligations under article + 11 of the WIPO copyright treaty adopted on 20 December 1996, or + similar laws prohibiting or restricting circumvention of such + measures. + + When you convey a covered work, you waive any legal power to forbid + circumvention of technological measures to the extent such + circumvention is effected by exercising rights under this License with + respect to the covered work, and you disclaim any intention to limit + operation or modification of the work as a means of enforcing, against + the work's users, your or third parties' legal rights to forbid + circumvention of technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you + receive it, in any medium, provided that you conspicuously and + appropriately publish on each copy an appropriate copyright notice; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the code; + keep intact all notices of the absence of any warranty; and give all + recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, + and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to + produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these + conditions: + * a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + * b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to "keep + intact all notices". + * c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + * d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent + works, which are not by their nature extensions of the covered work, + and which are not combined with it such as to form a larger program, + in or on a volume of a storage or distribution medium, is called an + "aggregate" if the compilation and its resulting copyright are not + used to limit the access or legal rights of the compilation's users + beyond what the individual works permit. Inclusion of a covered work + in an aggregate does not cause this License to apply to the other + parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms of + sections 4 and 5, provided that you also convey the machine-readable + Corresponding Source under the terms of this License, in one of these + ways: + * a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + * b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. + * c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + * d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + * e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded + from the Corresponding Source as a System Library, need not be + included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any + tangible personal property which is normally used for personal, + family, or household purposes, or (2) anything designed or sold for + incorporation into a dwelling. In determining whether a product is a + consumer product, doubtful cases shall be resolved in favor of + coverage. For a particular product received by a particular user, + "normally used" refers to a typical or common use of that class of + product, regardless of the status of the particular user or of the way + in which the particular user actually uses, or expects or is expected + to use, the product. A product is a consumer product regardless of + whether the product has substantial commercial, industrial or + non-consumer uses, unless such uses represent the only significant + mode of use of the product. + + "Installation Information" for a User Product means any methods, + procedures, authorization keys, or other information required to + install and execute modified versions of a covered work in that User + Product from a modified version of its Corresponding Source. The + information must suffice to ensure that the continued functioning of + the modified object code is in no case prevented or interfered with + solely because modification has been made. + + If you convey an object code work under this section in, or with, or + specifically for use in, a User Product, and the conveying occurs as + part of a transaction in which the right of possession and use of the + User Product is transferred to the recipient in perpetuity or for a + fixed term (regardless of how the transaction is characterized), the + Corresponding Source conveyed under this section must be accompanied + by the Installation Information. But this requirement does not apply + if neither you nor any third party retains the ability to install + modified object code on the User Product (for example, the work has + been installed in ROM). + + The requirement to provide Installation Information does not include a + requirement to continue to provide support service, warranty, or + updates for a work that has been modified or installed by the + recipient, or for the User Product in which it has been modified or + installed. Access to a network may be denied when the modification + itself materially and adversely affects the operation of the network + or violates the rules and protocols for communication across the + network. + + Corresponding Source conveyed, and Installation Information provided, + in accord with this section must be in a format that is publicly + documented (and with an implementation available to the public in + source code form), and must require no special password or key for + unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this + License by making exceptions from one or more of its conditions. + Additional permissions that are applicable to the entire Program shall + be treated as though they were included in this License, to the extent + that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately + under those permissions, but the entire Program remains governed by + this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option + remove any additional permissions from that copy, or from any part of + it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you + add to a covered work, you may (if authorized by the copyright holders + of that material) supplement the terms of this License with terms: + * a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + * b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + * c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + * d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or + * e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + * f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + + All other non-permissive additional terms are considered "further + restrictions" within the meaning of section 10. If the Program as you + received it, or any part of it, contains a notice stating that it is + governed by this License along with a term that is a further + restriction, you may remove that term. If a license document contains + a further restriction but permits relicensing or conveying under this + License, you may add to a covered work material governed by the terms + of that license document, provided that the further restriction does + not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you + must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the + form of a separately written license, or stated as exceptions; the + above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly + provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights under + this License (including any patent licenses granted under the third + paragraph of section 11). + + However, if you cease all violation of this License, then your license + from a particular copyright holder is reinstated (a) provisionally, + unless and until the copyright holder explicitly and finally + terminates your license, and (b) permanently, if the copyright holder + fails to notify you of the violation by some reasonable means prior to + 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from that + copyright holder, and you cure the violation prior to 30 days after + your receipt of the notice. + + Termination of your rights under this section does not terminate the + licenses of parties who have received copies or rights from you under + this License. If your rights have been terminated and not permanently + reinstated, you do not qualify to receive new licenses for the same + material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or run + a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer transmission + to receive a copy likewise does not require acceptance. However, + nothing other than this License grants you permission to propagate or + modify any covered work. These actions infringe copyright if you do + not accept this License. Therefore, by modifying or propagating a + covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically + receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not responsible + for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an + organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a covered + work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or could + give under the previous paragraph, plus a right to possession of the + Corresponding Source of the work from the predecessor in interest, if + the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the + rights granted or affirmed under this License. For example, you may + not impose a license fee, royalty, or other charge for exercise of + rights granted under this License, and you may not initiate litigation + (including a cross-claim or counterclaim in a lawsuit) alleging that + any patent claim is infringed by making, using, selling, offering for + sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this + License of the Program or a work on which the Program is based. The + work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims owned + or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, permitted + by this License, of making, using, or selling its contributor version, + but do not include claims that would be infringed only as a + consequence of further modification of the contributor version. For + purposes of this definition, "control" includes the right to grant + patent sublicenses in a manner consistent with the requirements of + this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free + patent license under the contributor's essential patent claims, to + make, use, sell, offer for sale, import and otherwise run, modify and + propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express + agreement or commitment, however denominated, not to enforce a patent + (such as an express permission to practice a patent or covenant not to + sue for patent infringement). To "grant" such a patent license to a + party means to make such an agreement or commitment not to enforce a + patent against the party. + + If you convey a covered work, knowingly relying on a patent license, + and the Corresponding Source of the work is not available for anyone + to copy, free of charge and under the terms of this License, through a + publicly available network server or other readily accessible means, + then you must either (1) cause the Corresponding Source to be so + available, or (2) arrange to deprive yourself of the benefit of the + patent license for this particular work, or (3) arrange, in a manner + consistent with the requirements of this License, to extend the patent + license to downstream recipients. "Knowingly relying" means you have + actual knowledge that, but for the patent license, your conveying the + covered work in a country, or your recipient's use of the covered work + in a country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or + arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, modify + or convey a specific copy of the covered work, then the patent license + you grant is automatically extended to all recipients of the covered + work and works based on it. + + A patent license is "discriminatory" if it does not include within the + scope of its coverage, prohibits the exercise of, or is conditioned on + the non-exercise of one or more of the rights that are specifically + granted under this License. You may not convey a covered work if you + are a party to an arrangement with a third party that is in the + business of distributing software, under which you make payment to the + third party based on the extent of your activity of conveying the + work, and under which the third party grants, to any of the parties + who would receive the covered work from you, a discriminatory patent + license (a) in connection with copies of the covered work conveyed by + you (or copies made from those copies), or (b) primarily for and in + connection with specific products or compilations that contain the + covered work, unless you entered into that arrangement, or that patent + license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting + any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot convey a + covered work so as to satisfy simultaneously your obligations under + this License and any other pertinent obligations, then as a + consequence you may not convey it at all. For example, if you agree to + terms that obligate you to collect a royalty for further conveying + from those to whom you convey the Program, the only way you could + satisfy both those terms and this License would be to refrain entirely + from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have + permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a single + combined work, and to convey the resulting work. The terms of this + License will continue to apply to the part which is the covered work, + but the special requirements of the GNU Affero General Public License, + section 13, concerning interaction through a network will apply to the + combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions + of the GNU General Public License from time to time. Such new versions + will be similar in spirit to the present version, but may differ in + detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies that a certain numbered version of the GNU General Public + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that numbered version or + of any later version published by the Free Software Foundation. If the + Program does not specify a version number of the GNU General Public + License, you may choose any version ever published by the Free + Software Foundation. + + If the Program specifies that a proxy can decide which future versions + of the GNU General Public License can be used, that proxy's public + statement of acceptance of a version permanently authorizes you to + choose that version for the Program. + + Later license versions may give you additional or different + permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND + PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE + DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR + CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR + CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES + ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT + NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR + LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM + TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER + PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided + above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely approximates + an absolute waiver of all civil liability in connection with the + Program, unless a warranty or assumption of liability accompanies a + copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these + terms. + + To do so, attach the following notices to the program. It is safest to + attach them to the start of each source file to most effectively state + the exclusion of warranty; and each file should have at least the + "copyright" line and a pointer to where the full notice is found. + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + Also add information on how to contact you by electronic and paper + mail. + + If the program does terminal interaction, make it output a short + notice like this when it starts in an interactive mode: + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the + appropriate parts of the General Public License. Of course, your + program's commands might be different; for a GUI interface, you would + use an "about box". + + You should also get your employer (if you work as a programmer) or + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. For more information on this, and how to apply and follow + the GNU GPL, see <http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your + program into proprietary programs. If your program is a subroutine + library, you may consider it more useful to permit linking proprietary + applications with the library. If this is what you want to do, use the + GNU Lesser General Public License instead of this License. But first, + please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. + + GNU General Public License Version 2 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your freedom + to share and change it. By contrast, the GNU General Public License is + intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if + you distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights that + you have. You must make sure that they, too, receive or can get the + source code. And you must show them these terms so they know their + rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, + we want its recipients to know that what they have is not the + original, so that any problems introduced by others will not reflect + on the original authors' reputations. + + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at + all. + + The precise terms and conditions for copying, distribution and + modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains a + notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running the Program is not restricted, and the output from the Program + is covered only if its contents constitute a work based on the Program + (independent of having been made by running the Program). Whether that + is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's source + code as you receive it, in any medium, provided that you conspicuously + and appropriately publish on each copy an appropriate copyright notice + and disclaimer of warranty; keep intact all the notices that refer to + this License and to the absence of any warranty; and give any other + recipients of the Program a copy of this License along with the + Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a + fee. + + 2. You may modify your copy or copies of the Program or any portion of + it, thus forming a work based on the Program, and copy and distribute + such modifications or work under the terms of Section 1 above, + provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + b) You must cause any work that you distribute or publish, that + in whole or in part contains or is derived from the Program or + any part thereof, to be licensed as a whole at no charge to all + third parties under the terms of this License. + c) If the modified program normally reads commands + interactively when run, you must cause it, when started running + for such interactive use in the most ordinary way, to print or + display an announcement including an appropriate copyright + notice and a notice that there is no warranty (or else, saying + that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to + view a copy of this License. (Exception: if the Program itself + is interactive but does not normally print such an + announcement, your work based on the Program is not required to + print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Program, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote + it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed under + the terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange; or, + c) Accompany it with the information you received as to the + offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial distribution and + only if you received the program in object code or executable + form with such an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source + code means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the executable. However, as a + special exception, the source code distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of the + operating system on which the executable runs, unless that component + itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt otherwise + to copy, modify, sublicense or distribute the Program is void, and + will automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties to + this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new + versions of the General Public License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and + "any later version", you have the option of following the terms and + conditions either of that version or of any later version published by + the Free Software Foundation. If the Program does not specify a + version number of this License, you may choose any version ever + published by the Free Software Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the + author to ask for permission. For software which is copyrighted by the + Free Software Foundation, write to the Free Software Foundation; we + sometimes make exceptions for this. Our decision will be guided by the + two goals of preserving the free status of all derivatives of our free + software and of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR + OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE + PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME + THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING + RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A + FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + + END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these + terms. + + To do so, attach the following notices to the program. It is safest to + attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. +one line to give the program's name and an idea of what it does. +Copyright (C) yyyy name of author + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Also add information on how to contact you by electronic and paper + mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. + + The hypothetical commands `show w' and `show c' should show the + appropriate parts of the General Public License. Of course, the + commands you use may be called something other than `show w' and `show + c'; they could even be mouse-clicks or menu items--whatever suits your + program. + + You should also get your employer (if you work as a programmer) or + your school, if any, to sign a "copyright disclaimer" for the program, + if necessary. Here is a sample; alter the names: +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision' +(which makes passes at compilers) written +by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + + This General Public License does not permit incorporating your program + into proprietary programs. If your program is a subroutine library, + you may consider it more useful to permit linking proprietary + applications with the library. If this is what you want to do, use the + GNU Lesser General Public License instead of this License. + + Mozilla Public License Version 1.1 + +1. Definitions. + + 1.0.1. "Commercial Use" + means distribution or otherwise making the Covered Code + available to a third party. + + 1.1. "Contributor" + means each entity that creates or contributes to the creation + of Modifications. + + 1.2. "Contributor Version" + means the combination of the Original Code, prior Modifications + used by a Contributor, and the Modifications made by that + particular Contributor. + + 1.3. "Covered Code" + means the Original Code or Modifications or the combination of + the Original Code and Modifications, in each case including + portions thereof. + + 1.4. "Electronic Distribution Mechanism" + means a mechanism generally accepted in the software + development community for the electronic transfer of data. + + 1.5. "Executable" + means Covered Code in any form other than Source Code. + + 1.6. "Initial Developer" + means the individual or entity identified as the Initial + Developer in the Source Code notice required by Exhibit A. + + 1.7. "Larger Work" + means a work which combines Covered Code or portions thereof + with code not governed by the terms of this License. + + 1.8. "License" + means this document. + + 1.8.1. "Licensable" + means having the right to grant, to the maximum extent + possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed + herein. + + 1.9. "Modifications" + means any addition to or deletion from the substance or + structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of + files, a Modification is: + + a. + Any addition to or deletion from the contents of a file containing + Original Code or previous Modifications. + b. + Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" + means Source Code of computer software code which is described + in the Source Code notice required by Exhibit A as Original + Code, and which, at the time of its release under this License + is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" + means any patent claim(s), now owned or hereafter acquired, + including without limitation, method, process, and apparatus + claims, in any patent Licensable by grantor. + + 1.11. "Source Code" + means the preferred form of the Covered Code for making + modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to + control compilation and installation of an Executable, or + source code differential comparisons against either the + Original Code or another well known, available Covered Code of + the Contributor's choice. The Source Code can be in a + compressed or archival form, provided the appropriate + decompression or de-archiving software is widely available for + no charge. + + 1.12. "You" (or "Your") + means an individual or a legal entity exercising rights under, + and complying with all of the terms of, this License or a + future version of this License issued under Section 6.1. For + legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, + direct or indirect, to cause the direction or management of + such entity, whether by contract or otherwise, or (b) ownership + of more than fifty percent (50%) of the outstanding shares or + beneficial ownership of such entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + a. under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + b. under Patents Claims infringed by the making, using or selling of + Original Code, to make, have made, use, practice, sell, and offer + for sale, and/or otherwise dispose of the Original Code (or + portions thereof). + c. the licenses granted in this Section 2.1 (a) and (b) are effective + on the date Initial Developer first distributes Original Code + under the terms of this License. + d. Notwithstanding Section 2.1 (b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + a. under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code and/or + as part of a Larger Work; and + b. under Patent Claims infringed by the making, using, or selling of + Modifications made by that Contributor either alone and/or in + combination with its Contributor Version (or portions of such + combination), to make, use, sell, offer for sale, have made, + and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + c. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective + on the date Contributor first makes Commercial Use of the Covered + Code. + d. Notwithstanding Section 2.2 (b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; 3) + for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + + (a) Third Party Claims + + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, Contributor + must include a text file with the Source Code distribution titled + "LEGAL" which describes the claim and the party making the claim in + sufficient detail that a recipient will know whom to contact. If + Contributor obtains such knowledge after the Modification is made + available as described in Section 3.2, Contributor shall promptly + modify the LEGAL file in all copies Contributor makes available + thereafter and shall take other steps (such as notifying appropriate + mailing lists or newsgroups) reasonably calculated to inform those who + received the Covered Code that new knowledge has been obtained. + + (b) Contributor APIs + + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which are + reasonably necessary to implement that API, Contributor must also + include this information in the legal file. + + (c) Representations. + + Contributor represents that, except as disclosed pursuant to Section + 3.4 (a) above, Contributor believes that Contributor's Modifications + are Contributor's original creation(s) and/or Contributor has + sufficient rights to grant the rights conveyed by this License. + + 3.5. Required Notices. + + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + + You may distribute Covered Code in Executable form only if the + requirements of Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for + that Covered Code, and if You include a notice stating that the Source + Code version of the Covered Code is available under the terms of this + License, including a description of how and where You have fulfilled + the obligations of Section 3.2. The notice must be conspicuously + included in any notice in an Executable version, related documentation + or collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the legal file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions + + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions + + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works + + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" + or any confusingly similar phrase do not appear in your license + (except to note that your license differs from this License) and (b) + otherwise make it clear that Your version of the license contains + terms which differ from the Mozilla Public License and Netscape Public + License. (Filling in the name of the Initial Developer, Original Code + or Contributor in the notice described in Exhibit A shall not of + themselves be deemed to be modifications of this License.) + +7. Disclaimer of warranty + + Covered code is provided under this license on an "as is" basis, + without warranty of any kind, either expressed or implied, including, + without limitation, warranties that the covered code is free of + defects, merchantable, fit for a particular purpose or non-infringing. + The entire risk as to the quality and performance of the covered code + is with you. Should any covered code prove defective in any respect, + you (not the initial developer or any other contributor) assume the + cost of any necessary servicing, repair or correction. This disclaimer + of warranty constitutes an essential part of this license. No use of + any covered code is authorized hereunder except under this disclaimer. + +8. Termination + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declaratory judgment actions) against Initial + Developer or a Contributor (the Initial Developer or Contributor + against whom You file such action is referred to as "Participant") + alleging that: + a. such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate + prospectively, unless if within 60 days after receipt of notice + You either: (i) agree in writing to pay Participant a mutually + agreeable reasonable royalty for Your past and future use of + Modifications made by such Participant, or (ii) withdraw Your + litigation claim with respect to the Contributor Version against + such Participant. If within 60 days of notice, a reasonable + royalty and payment arrangement are not mutually agreed upon in + writing by the parties or the litigation claim is not withdrawn, + the rights granted by Participant to You under Sections 2.1 and/or + 2.2 automatically terminate at the expiration of the 60 day notice + period specified above. + b. any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, + then any rights granted to You by such Participant under Sections + 2.1(b) and 2.2(b) are revoked effective as of the date You first + made, used, sold, distributed, or had made, Modifications made by + that Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, all + end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. Limitation of liability + + Under no circumstances and under no legal theory, whether tort + (including negligence), contract, or otherwise, shall you, the initial + developer, any other contributor, or any distributor of covered code, + or any supplier of any of such parties, be liable to any person for + any indirect, special, incidental, or consequential damages of any + character including, without limitation, damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all other + commercial damages or losses, even if such party shall have been + informed of the possibility of such damages. This limitation of + liability shall not apply to liability for death or personal injury + resulting from such party's negligence to the extent applicable law + prohibits such limitation. Some jurisdictions do not allow the + exclusion or limitation of incidental or consequential damages, so + this exclusion and limitation may not apply to you. + +10. U.S. government end users + + The Covered Code is a "commercial item," as that term is defined in 48 + C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" + and "commercial computer software documentation," as such terms are + used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. + 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all + U.S. Government End Users acquire Covered Code with only those rights + set forth herein. + +11. Miscellaneous + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. Responsibility for claims + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. Multiple-licensed code + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the MPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +Exhibit A - Mozilla Public License. + +"The contents of this file are subject to the Mozilla Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is ______________________________________. + +The Initial Developer of the Original Code is ________________________. +Portions created by ______________________ are Copyright (C) ______ +_______________________. All Rights Reserved. + +Contributor(s): ______________________________________. + +Alternatively, the contents of this file may be used under the terms +of the _____ license (the "[___] License"), in which case the +provisions of [______] License are applicable instead of those +above. If you wish to allow use of your version of this file only +under the terms of the [____] License and not to allow others to use +your version of this file under the MPL, indicate your decision by +deleting the provisions above and replace them with the notice and +other provisions required by the [___] License. If you do not delete +the provisions above, a recipient may use your version of this file +under either the MPL or the [___] License." + + NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications. + + Apache License + + Version 2.0, January 2004 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by the + copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all other + entities that control, are controlled by, or are under common control + with that entity. For the purposes of this definition, "control" means + (i) the power, direct or indirect, to cause the direction or + management of such entity, whether by contract or otherwise, or (ii) + ownership of fifty percent (50%) or more of the outstanding shares, or + (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity exercising + permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but not + limited to compiled object code, generated documentation, and + conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or Object + form, made available under the License, as indicated by a copyright + notice that is included in or attached to the work (an example is + provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the + purposes of this License, Derivative Works shall not include works + that remain separable from, or merely link (or bind by name) to the + interfaces of, the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including the + original version of the Work and any modifications or additions to + that Work or Derivative Works thereof, that is intentionally submitted + to Licensor for inclusion in the Work by the copyright owner or by an + individual or Legal Entity authorized to submit on behalf of the + copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent to + the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control + systems, and issue tracking systems that are managed by, or on behalf + of, the Licensor for the purpose of discussing and improving the Work, + but excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, publicly + display, publicly perform, sublicense, and distribute the Work and + such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except + as stated in this section) patent license to make, have made, use, + offer to sell, sell, import, and otherwise transfer the Work, where + such license applies only to those patent claims licensable by such + Contributor that are necessarily infringed by their Contribution(s) + alone or by combination of their Contribution(s) with the Work to + which such Contribution(s) was submitted. If You institute patent + litigation against any entity (including a cross-claim or counterclaim + in a lawsuit) alleging that the Work or a Contribution incorporated + within the Work constitutes direct or contributory patent + infringement, then any patent licenses granted to You under this + License for that Work shall terminate as of the date such litigation + is filed. + + 4. Redistribution. You may reproduce and distribute copies of the Work + or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You meet + the following conditions: + 1. You must give any other recipients of the Work or Derivative Works + a copy of this License; and + 2. You must cause any modified files to carry prominent notices + stating that You changed the files; and + 3. You must retain, in the Source form of any Derivative Works that + You distribute, all copyright, patent, trademark, and attribution + notices from the Source form of the Work, excluding those notices + that do not pertain to any part of the Derivative Works; and + 4. If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one of + the following places: within a NOTICE text file distributed as + part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents of + the NOTICE file are for informational purposes only and do not + modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an + addendum to the NOTICE text from the Work, provided that such + additional attribution notices cannot be construed as modifying + the License. You may add Your own copyright statement to Your + modifications and may provide additional or different license + terms and conditions for use, reproduction, or distribution of + Your modifications, or for any such Derivative Works as a whole, + provided Your use, reproduction, and distribution of the Work + otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. + any Contribution intentionally submitted for inclusion in the Work by + You to the Licensor shall be under the terms and conditions of this + License, without any additional terms or conditions. Notwithstanding + the above, nothing herein shall supersede or modify the terms of any + separate license agreement you may have executed with Licensor + regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or agreed + to in writing, Licensor provides the Work (and each Contributor + provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied, including, without + limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, + MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely + responsible for determining the appropriateness of using or + redistributing the Work and assume any risks associated with Your + exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. + whether in tort (including negligence), contract, or otherwise, unless + required by applicable law (such as deliberate and grossly negligent + acts) or agreed to in writing, shall any Contributor be liable to You + for damages, including any direct, indirect, special, incidental, or + consequential damages of any character arising as a result of this + License or out of the use or inability to use the Work (including but + not limited to damages for loss of goodwill, work stoppage, computer + failure or malfunction, or any and all other commercial damages or + losses), even if such Contributor has been advised of the possibility + of such damages. 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. + the Work or Derivative Works thereof, You may choose to offer, and + charge a fee for, acceptance of support, warranty, indemnity, or other + liability obligations and/or rights consistent with this License. + However, in accepting such obligations, You may act only on Your own + behalf and on Your sole responsibility, not on behalf of any other + Contributor, and only if You agree to indemnify, defend, and hold each + Contributor harmless for any liability incurred by, or claims asserted + against, such Contributor by reason of your accepting any such + warranty or additional liability. END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. +APPENDIX: How to apply the Apache License to your work + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "" replaced + with your own identifying information. (Don't include the brackets!) + The text should be enclosed in the appropriate comment syntax for the + file format. We also recommend that a file or class name and + description of purpose be included on the same "printed page" as the + copyright notice for easier identification within third-party + archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); @@ -4577,322 +7341,11 @@ Xalan See the License for the specific language governing permissions and limitations under the License. + The LaTeX Project Public License -The following software may be included in this product: XML Security Library (xmlsec); Use of any of this software is governed by the terms of the license below: -Aleksey Sanin -XML Security Library (xmlsec) -xmlsec, xmlsec-openssl, xmlsec-gnutls libraries ------------------------------------------------------------------------------- -Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. - -xmlsec-nss library ------------------------------------------------------------------------------- -Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. -Copyright (c) 2003 America Online, Inc. All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -Portions of the Software were created using source code and/or APIs governed by the Mozilla Public License (MPL). The MPL is available at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such portions to be distributed with code not governed by MPL, as long as the requirements of MPL are fulfilled for such portions. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. - -The following software may be included in this product: X11 XRender Extension; Use of any of this software is governed by the terms of the license below: -Keith Packard, SuSE, Inc. -X11 XRender Extension -Copyright © 2000 SuSE, Inc. -Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of SuSE not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. SuSE makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. -SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below: -James Clark, Bill Lindsey -XT -Copyright (c) 1998, 1999 James Clark -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of James Clark shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from James Clark. - -Copyright (c) 2002 Bill Lindsey -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. Substantial portions of the Software are copyrighted by James Clark. Copying permissions and restrictions for those portions are covered in the file "copyingjc.txt" -THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL BILL LINDSEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of Bill Lindsey shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Bill Lindsey. - -The following software may be included in this product:zlib; Use of any of this software is governed by the terms of the license below: -Jean-Loup Gailly, Mark Adler -zlib -(C) 1995-2002 Jean-loup Gailly and Mark Adler -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -The following software may be included in this product: Mozilla, Mozilla Address Book, NP SDK: Use of any of this software is governed by the terms of the license below: -The Mozilla Foundation -Mozilla Address Book -MOZILLA PUBLIC LICENSE -Version 1.1 - -1. Definitions. -1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. -1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. -1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. -1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. -1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. -1.5. ''Executable'' means Covered Code in any form other than Source Code. -1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. -1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. -1.8. ''License'' means this document. -1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. -1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: -A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. -B. Any new file that contains any part of the Original Code or previous Modifications. - -1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. -1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. -1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. -1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. -2. Source Code License. -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: -(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and -(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - -(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. -(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - -(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). -(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. -(d)   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - -3. Distribution Obligations. -3.1. Application of License. -The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. -3.4. Intellectual Property Matters -(a) Third Party Claims. -If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. -(b) Contributor APIs. -If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - -         (c)   Representations. -Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. -3.6. Distribution of Executable Versions. -You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. -5. Application of this License. -This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. -6. Versions of the License. -6.1. New Versions. -Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. -6.3. Derivative Works. -If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. -8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: -(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. -(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. -8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. -8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as “Multiple-Licensedâ€. “Multiple-Licensed†means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. -``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ -Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF -ANY KIND, either express or implied. See the License for the specific language governing rights and -limitations under the License. -The Original Code is ______________________________________. -The Initial Developer of the Original Code is ________________________. Portions created by - ______________________ are Copyright (C) ______ _______________________. All Rights -Reserved. -Contributor(s): ______________________________________. -Alternatively, the contents of this file may be used under the terms of the _____ license (the “[___] Licenseâ€), in which case the provisions of [______] License are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -FSF -GNU General Public License - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +LPPL Version 1.3c 2008-05-04 -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. -The precise terms and conditions for copying, distribution and modification follow. -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. -NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS - -FSF -GNU Lesser General Public License - - -GNU LESSER GENERAL PUBLIC LICENSE -Version 2.1, February 1999 - -Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. -This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. -When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. -To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. -For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. -We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. -To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - -Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. -Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. -When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. -We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. -For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. -In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. -Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. -The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - -GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". -A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. -The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) -"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. -1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: -a) The modified work must itself be a software library. -b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. -c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. -d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. -In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. -3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. -This option is useful when you wish to copy part of the code of the Library into a program that is not a library. -4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. -If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. -5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. -However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. -When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. -If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) -Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. -You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: -a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) -b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. -c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. -d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. -e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. -For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. -It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - -7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: -a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. -b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. -8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. -10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - -11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS - -LaTeX3 Project -The LaTeX Project Public License -The LaTeX Project Public License -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -LPPL Version 1.3c 2006-05-20 - -Copyright 1999 2002-2006 LaTeX3 Project +Copyright 1999 2002-2008 LaTeX3 Project Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed. @@ -4901,12 +7354,12 @@ PREAMBLE ======== The LaTeX Project Public License (LPPL) is the primary license under -which the the LaTeX kernel and the base LaTeX packages are distributed. +which the LaTeX kernel and the base LaTeX packages are distributed. You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -it is written in such a way that you can use it even if your work is +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is unrelated to TeX. The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', @@ -4933,11 +7386,11 @@ In this license document the following terms are used: `Work' Any work being distributed under this License. - + `Derived Work' Any work that under any applicable law is derived from the Work. - `Modification' + `Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of @@ -4947,7 +7400,7 @@ In this license document the following terms are used: `Modify' To apply any procedure that produces a Derived Work under any applicable law. - + `Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) @@ -4968,16 +7421,16 @@ In this license document the following terms are used: no such explicit nomination then it is the `Copyright Holder' under any applicable law. - `Base Interpreter' + `Base Interpreter' A program or process that is normally needed for running or - interpreting a part or the whole of the Work. + interpreting a part or the whole of the Work. A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the + `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. @@ -5018,8 +7471,8 @@ the Derived Work. distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the @@ -5029,13 +7482,13 @@ to a component of the Work. clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. - + b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. - + c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) @@ -5045,7 +7498,7 @@ to a component of the Work. d. You distribute at least one of the following with the Derived Work: - 1. A complete, unmodified copy of the Work; + 1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy @@ -5072,15 +7525,15 @@ format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. - + 10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. - + b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the + itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. 11. This license places no restrictions on works that are unrelated to @@ -5149,7 +7602,7 @@ the Work through the following steps: a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. - + b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over @@ -5159,17 +7612,17 @@ the Work through the following steps: 3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. - + b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. - + then this takes effect immediately upon announcement. + 4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. - + 5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must @@ -5252,7 +7705,7 @@ Here is an example of such a notice and statement: % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. - % + % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins @@ -5266,7 +7719,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. +Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it @@ -5296,9 +7749,10 @@ Important Recommendations using a line such as: % This work consists of all files listed in manifest.txt. - + in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. + diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml index 6b19577d8b86..cb399d6daccb 100755 --- a/scripting/examples/java/build.xml +++ b/scripting/examples/java/build.xml @@ -47,7 +47,7 @@ <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/> <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/> @@ -69,7 +69,7 @@ <javac srcdir="Highlight" destdir="${outdir}/Highlight" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/> <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/> @@ -91,7 +91,7 @@ <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/> <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/> diff --git a/scripting/java/build.xml b/scripting/java/build.xml index e068237d4618..2abb784a387e 100755 --- a/scripting/java/build.xml +++ b/scripting/java/build.xml @@ -29,7 +29,6 @@ <!-- =================== Environmental Properties ======================= --> <property name="prj" value=".."/> - <property name="build.compiler" value="classic"/> <property name="optimize" value="off"/> <property name="debug" value="on"/> <property name="jardir" value="${out}/class"/> @@ -98,12 +97,12 @@ <target name="compile" depends="prepare"> <javac srcdir="com" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="off"> + debug="${debug}" optimize="${optimize}" deprecation="off" includeantruntime="false"> <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> <javac srcdir="Framework/" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" debug="${debug}" - optimize="${optimize}" deprecation="off"> + optimize="${optimize}" deprecation="off" includeantruntime="false"> <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> </target> diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 40a4cced46d1..1be60dabb72c 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -188,7 +188,7 @@ namespace basprov if ( aFileURL.getLength() ) { osl::DirectoryItem aFileItem; - osl::FileStatus aFileStatus( FileStatusMask_FileURL ); + osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL ); OSL_VERIFY( osl::DirectoryItem::get( aFileURL, aFileItem ) == osl::FileBase::E_None ); OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None ); ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() ); diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index fc2f5aab953e..43a35f4af568 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -893,7 +893,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { (void)ppEnv; @@ -901,7 +901,7 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 3c2f97a040ba..4450228705b5 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -515,7 +515,7 @@ extern "C" #undef css #define css ::com::sun::star - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName, uno_Environment** ppEnvironment ) { (void)ppEnvironment; @@ -523,7 +523,7 @@ extern "C" *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , + SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) { diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk index fa43858021bb..a304d972ee52 100755 --- a/scripting/source/pyprov/makefile.mk +++ b/scripting/source/pyprov/makefile.mk @@ -35,10 +35,12 @@ TARGET=pyprov .INCLUDE : settings.mk # --- Targets ------------------------------------------------------ -.IF "$(DISABLE_PYTHON)" != "TRUE" +# mailmerge is put in an extra services.rdb +# simply do not fiddle with that. cws sb123, sb129 ALL : ALLTAR \ $(DLLDEST)$/officehelper.py \ - $(DLLDEST)$/mailmerge.py + $(DLLDEST)$/msgbox.py \ + $(DLLDEST)$/mailmerge.py $(DLLDEST)$/%.py: %.py cp $? $@ @@ -68,9 +70,3 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py .INCLUDE : target.mk .ENDIF - -.ELSE - -.INCLUDE : target.mk - -.ENDIF diff --git a/scripting/source/pyprov/msgbox.py b/scripting/source/pyprov/msgbox.py new file mode 100644 index 000000000000..c9ee80bac80f --- /dev/null +++ b/scripting/source/pyprov/msgbox.py @@ -0,0 +1,260 @@ +# -*- tab-width: 4; indent-tabs-mode: nil -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Laurent Godard <listes.godard@laposte.net> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# Timo <timo@iera.de> +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# prepare pythoin environnement - Add the path of this class +from os import path +from sys import modules +from sys import path as syspath + +# pyUNO program itself +import uno, unohelper + +# UNO GUI toolkit +from com.sun.star.awt.WindowClass import TOP, SIMPLE +from com.sun.star.awt.PushButtonType import STANDARD as standard +from com.sun.star.awt.PushButtonType import OK as ok +from com.sun.star.awt.PushButtonType import CANCEL as cancel +from com.sun.star.awt.PushButtonType import HELP as help +from com.sun.star.awt.TextAlign import CENTER as center +from com.sun.star.awt.TextAlign import LEFT as left +from com.sun.star.awt.TextAlign import RIGHT as right + +# used UNO listeners +from com.sun.star.awt import XActionListener + +class MsgBox(unohelper.Base): + """Inspect UNO object, link to sdk and recusrsive calls""" + + def __init__(self, aContext): + """acontext : a Valid UNO context + """ + + self.VERSION = '0.1' + self.ctx = aContext + self.smgr = aContext.ServiceManager + # UI Dialog object + self.dialog=None + # List of openned Listeners + self.lst_listeners={} + #UI parameters + self.ButtonSize = 50 + self.boxSize = 200 + self.lineHeight = 10 + self.fromBroxSize = False + self.numberOfLines = -1 + + self.Buttons = [] + self.Response = '' + + return + + ##################################################### + # GUI definition # + ##################################################### + def _createBox(self): + """Create the Box""" + + # computes parameters of the message dialog + if self.numberOfLines == -1: + #calculate + numberOfLines = len(self.message.split(chr(10))) + else: + numberOfLines = self.numberOfLines + + numberOfButtons = len(self.Buttons) + self.ButtonSpace = self.ButtonSize/2 + if self.fromBroxSize: + # button size is calculated from boxsize + size = (2 * self.boxSize) / (3 * numberOfButtons + 1) + self.ButtonSize = size + self.ButtonSpace = self.ButtonSize/2 + else: + # boxsize i calculated form buttonsize + self.boxSize = numberOfButtons * (self.ButtonSize + + self.ButtonSpace) + self.ButtonSpace + + # create the dialog model and set the properties + dialog_model = self.smgr.createInstanceWithContext( + 'com.sun.star.awt.UnoControlDialogModel', + self.ctx) + dialog_model.PositionX = 50 + dialog_model.Step = 1 + dialog_model.TabIndex = 7 + dialog_model.Width = self.boxSize#numberOfButtons * (self.ButtonSize + + # self.ButtonSpace) + 25 + dialog_model.Height = 10 + self.lineHeight * numberOfLines + 10 + 12 + 10 + dialog_model.PositionY = 63 + dialog_model.Sizeable = True + dialog_model.Closeable = False + + dialog = self.smgr.createInstanceWithContext( + 'com.sun.star.awt.UnoControlDialog', self.ctx) + + # label Label0 + label = dialog_model.createInstance( + 'com.sun.star.awt.UnoControlFixedTextModel') + label.PositionX = 10 + label.TabIndex = 9 + label.Width = dialog_model.Width - label.PositionX + label.Height = self.lineHeight* numberOfLines + label.PositionY = 10 + label.Align = left + label.MultiLine = True + label.Label = self.message + dialog_model.insertByName('Label0', label) + + nb = 0 + for buttonName in self.Buttons: + nb +=1 + button = dialog_model.createInstance( + 'com.sun.star.awt.UnoControlButtonModel') + button.PositionX = nb * self.ButtonSpace + (nb-1)* self.ButtonSize + button.TabIndex = 8 + button.Height = 12 + button.Width = self.ButtonSize + button.PositionY = 10 + label.Height + 10 + button.PushButtonType = standard + if nb == 1: + button.DefaultButton = True + else: + button.DefaultButton = False + button.Label = buttonName + dialog_model.insertByName('Btn' + str(nb), button ) + + if not dialog.getModel(): + dialog.setModel(dialog_model) + + # UNO toolkit definition + toolkit = self.smgr.createInstanceWithContext('com.sun.star.awt.Toolkit', self.ctx) + a_rect = uno.createUnoStruct( 'com.sun.star.awt.Rectangle' ) + a_rect.X = 50 + dialog.setTitle ( self.title ) + a_rect.Width = 270 + a_rect.Height = 261 + a_rect.Y = 63 + win_descriptor = uno.createUnoStruct('com.sun.star.awt.WindowDescriptor') + win_descriptor.Type = TOP + win_descriptor.ParentIndex = -1 + win_descriptor.Bounds = a_rect + peer = toolkit.createWindow( win_descriptor ) + dialog.createPeer( toolkit, peer ) + + return dialog + + def _addListeners(self): + """Add listeners to dialog""" + nb = 0 + for buttonName in self.Buttons: + nb +=1 + a_control = self.dialog.getControl('Btn'+str(nb)) + the_listener = ButtonListener(self) + a_control.addActionListener(the_listener) + self.lst_listeners['Btn'+str(nb)] = the_listener + return + + def _removeListeners(self): + """ remove listeners on exiting""" + nb = 0 + for buttonName in self.Buttons: + nb +=1 + a_control = self.dialog.getControl('Btn'+str(nb)) + a_control.removeActionListener(self.lst_listeners['Btn'+str(nb)]) + return + + def show(self, message, decoration, title): + self.message = message + self.decoration = decoration + self.title = title + # Create GUI + self.dialog = self._createBox() + self._addListeners() + #execute the dialog --> blocking call + self.dialog.execute() + #end --> release listeners and dispose dialog + self._removeListeners() + self.dialog.dispose() + return self.Response + + def addButton(self, caption): + self.Buttons.append(caption) + return + + def renderFromBoxSize(self, size = 150): + self.boxSize = size + self.fromBroxSize = True + return + + def renderFromButtonSize(self, size = 50): + self.ButtonSize = size + self.fromBroxSize = False + return + +class ButtonListener(unohelper.Base, XActionListener): + """Stops the MessageBox, sets the button label as returned value""" + def __init__(self, caller): + self.caller = caller + + def disposing(self, eventObject): + pass + + def actionPerformed(self, actionEvent): + button = actionEvent.Source + self.caller.Response = button.Model.Label + self.caller.dialog.endExecute() + return + +### TEST +if __name__ == '__main__': + # get the uno component context from the PyUNO runtime + localContext = uno.getComponentContext() + + # create the UnoUrlResolver + resolver = localContext.ServiceManager.createInstanceWithContext( + "com.sun.star.bridge.UnoUrlResolver", localContext ) + + # connect to the running office + # OOo has to be launched in listen mode as + # ./soffice "-accept=socket,host=localhost,port=2002;urp;" + ctx = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" ) + myBox = MsgBox(ctx) + myBox.addButton("Yes") + myBox.addButton("No") + myBox.addButton("May be") + myBox.renderFromBoxSize(150) + myBox.numberOflines = 2 + + print myBox.show("A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message " + chr(10)+chr(10)+"Do you agree ?",0,"Dialog title") + + myBox = MsgBox(ctx) + myBox.addButton("oK") + myBox.renderFromButtonSize() + myBox.numberOflines = 2 + + print myBox.show("A small message",0,"Dialog title") diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 6a9ccede733d..ce05625d19dd 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -460,7 +460,7 @@ static struct cppu::ImplementationEntry s_entries [] = */ extern "C" { - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -475,7 +475,7 @@ extern "C" * data * @return a component factory */ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index cb60dc182975..48f4625a8bc7 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -123,13 +123,13 @@ StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rx StringResourceImpl::~StringResourceImpl() { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; delete pLocaleItem; } - for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; delete pLocaleItem; @@ -326,7 +326,7 @@ Sequence< Locale > StringResourceImpl::getLocales( ) Sequence< Locale > aLocalSeq( nSize ); Locale* pLocales = aLocalSeq.getArray(); int iTarget = 0; - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; pLocales[iTarget] = pLocaleItem->m_locale; @@ -566,7 +566,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) if( m_pCurrentLocaleItem == pRemoveItem || m_pDefaultLocaleItem == pRemoveItem ) { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != pRemoveItem ) @@ -586,7 +586,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) } } } - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem == pRemoveItem ) @@ -666,7 +666,7 @@ LocaleItem* StringResourceImpl::getItemForLocale LocaleItem* pRetItem = NULL; // Search for locale - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem ) @@ -699,7 +699,7 @@ LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca // Search for locale for( sal_Int32 iPass = 0 ; iPass <= 2 ; ++iPass ) { - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem ) @@ -1058,7 +1058,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage } } - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) && @@ -1097,7 +1097,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage if( bUsedForStore ) { for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); - it != m_aChangedDefaultLocaleVector.end(); it++ ) + it != m_aChangedDefaultLocaleVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -1196,7 +1196,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles { // Delete files for changed defaults for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); - it != m_aChangedDefaultLocaleVector.end(); it++ ) + it != m_aChangedDefaultLocaleVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -1228,7 +1228,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation if( bUsedForStore || bKillAll ) implKillRemovedLocaleFiles( Location, aNameBase, xFileAccess ); - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && (bStoreAll || bKillAll || pLocaleItem->m_bModified) && @@ -1431,7 +1431,7 @@ Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( ) sal_Int32 iLocale = 0; sal_Int32 iDefault = 0; for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); - it != m_aLocaleItemVector.end(); it++,iLocale++ ) + it != m_aLocaleItemVector.end(); ++it,++iLocale ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -1740,7 +1740,7 @@ bool checkNamingSceme( const ::rtl::OUString& aName, const ::rtl::OUString& aNam void StringResourcePersistenceImpl::implLoadAllLocales( void ) { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -3071,7 +3071,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { (void)ppEnv; @@ -3079,7 +3079,7 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml index 2fbfe5416428..5f115b98bcab 100755 --- a/scripting/workben/bindings/drawmenubar.xml +++ b/scripting/workben/bindings/drawmenubar.xml @@ -120,7 +120,7 @@ <menu:menuseparator/> <menu:menu menu:id="slot:338" menu:label="~Grid"> <menu:menupopup> - <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/> + <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/> <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/> <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/> </menu:menupopup> @@ -128,9 +128,9 @@ <menu:menuseparator/> <menu:menu menu:id="slot:339" menu:label="~Snap Lines"> <menu:menupopup> - <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/> - <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/> - <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/> + <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/> + <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/> + <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> @@ -197,8 +197,8 @@ <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/> <menu:menuseparator/> <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/> - <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/> - <menu:menu menu:id="slot:1" menu:label="Case/Characters"> + <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/> + <menu:menu menu:id="slot:1" menu:label="~Change Case"> <menu:menupopup> <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/> <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/> diff --git a/scripting/workben/bindings/impressmenubar.xml b/scripting/workben/bindings/impressmenubar.xml index 627fd168159c..02d6d66d16de 100755 --- a/scripting/workben/bindings/impressmenubar.xml +++ b/scripting/workben/bindings/impressmenubar.xml @@ -138,7 +138,7 @@ <menu:menuseparator/> <menu:menu menu:id="slot:338" menu:label="~Grid"> <menu:menupopup> - <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/> + <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/> <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/> <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/> </menu:menupopup> @@ -146,9 +146,9 @@ <menu:menuseparator/> <menu:menu menu:id="slot:339" menu:label="~Snap Lines"> <menu:menupopup> - <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/> - <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/> - <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/> + <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/> + <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/> + <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> @@ -215,8 +215,8 @@ <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/> <menu:menuseparator/> <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/> - <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/> - <menu:menu menu:id="slot:1" menu:label="Case/Characters"> + <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/> + <menu:menu menu:id="slot:1" menu:label="~Change Case"> <menu:menupopup> <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/> <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/> diff --git a/scripting/workben/build.xml b/scripting/workben/build.xml index fa36ad4869c7..1a3e464783f4 100755 --- a/scripting/workben/build.xml +++ b/scripting/workben/build.xml @@ -30,7 +30,6 @@ <property name="prj" value=".."/> <property file="${prj}/java/build.env"/> - <property name="build.compiler" value="classic"/> <property name="optimize" value="on"/> <property name="debug" value="on"/> <property name="installerclasses" value="${out}/class/sframeworkinstall"/> diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 4d2396bf069c..c93efacab9f8 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -251,11 +251,6 @@ $(eval $(call gb_Library_set_defs,sfx,\ )) endif -ifeq ($(OS),OS2) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconOs2.ob \ -)) -endif ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx index f61e95984fe8..98a7f583cfb2 100644 --- a/sfx2/inc/bitset.hxx +++ b/sfx2/inc/bitset.hxx @@ -197,7 +197,7 @@ inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const } //-------------------------------------------------------------------- -// detsermines if the other bitset is a superset or equal +// determines if the other bitset is a superset or equal inline sal_Bool BitSet::IsSubSet( const BitSet& ) const { diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx index 13c451836313..b9e4b18dbe8d 100644 --- a/sfx2/inc/macro.hxx +++ b/sfx2/inc/macro.hxx @@ -17,11 +17,11 @@ class SfxMacro; class SfxMacroStatement { - sal_uInt16 nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // aktuelle Parameter, falls nSlotId != 0 - String aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF) - sal_Bool bDone; // auskommentieren wenn kein Done() gerufen - void* pDummy; // f"ur alle F"alle zum kompatibel bleiben + sal_uInt16 nSlotId; // performed Slot-Id or 0, if manually + ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // current Parameter, in case nSlotId != 0 + String aStatement; // Statement in BASIC-Syntax (if necessary with CR/LF) + sal_Bool bDone; // comment out if no Done() is called + void* pDummy; // for all cases, to remain compatible #ifdef _SFXMACRO_HXX private: @@ -59,11 +59,10 @@ public: inline sal_uInt16 SfxMacroStatement::GetSlotId() const -/* [Beschreibung] +/* [Description] - Liefert die Slot-Id die das Statement beim Abspielen wieder ausf"uhren - soll oder 0, falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>) - aufgezeichnet wurde. + Returns the Slot-Id which the Statement should redo when called or 0 + if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually. */ { @@ -74,14 +73,13 @@ inline sal_uInt16 SfxMacroStatement::GetSlotId() const inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& SfxMacroStatement::GetArgs() const -/* [Beschreibung] +/* [Description] - Liefert die Parameter mit denen Statement ausgef"uhrt wurde oder 0, - falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>) aufgezeichnet - wurde. + Returns the Parameter which was used in the call of the Statement or 0 + if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually - Der R"uckgabewert geh"ort dem SfxMacroStatement und ist nur im - unmittelbar aufrufenden Stackframe g"ultig. + The returned value belongs to the SfxMacroStatement and is only valid + to the Stackframe. */ { @@ -92,11 +90,11 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property inline sal_Bool SfxMacroStatement::IsDone() const -/* [Beschreibung] +/* [Description] - Liefert TRUE, wenn das Statement wirklich ausgef"uhrt wurde, - also z.B. nicht vom Benutzer abgebrochen wurde. Wurde es nicht - wirklich ausgef"uhrt, dann wird es im BASIC-Source auskommentiert. + Returns TRUE only if the Statement really was excecuted, so for instance + not if it was canceled by the user. If it was not excecuted the + BASIC-Source would be commented out. */ { @@ -105,18 +103,18 @@ inline sal_Bool SfxMacroStatement::IsDone() const //-------------------------------------------------------------------- -/* [Beschreibung] +/* [Description] - Liefert das Statement in BASIC-Syntax. Wurde das Makro manuell erzeugt, - wird genau der im Konstruktor angegebene String zur"uckgegeben, sonst - der generierte Source-Code. + Returns the Statement in BASIC-Syntax. If the Macro was created manually, + the string will be returned exactly as given in the constructor, else the + generated Source-Code is returned. - Bei beiden Arten ist es m"oglich, da\s mehrere BASIC-Statements, jeweils - mit CR/LF getrennt in dem String enthalten sind, da ein SFx-Statement - ggf. in mehrere BASIC-Statements "ubersetzt wird. + It is possible in both of the above cases that several BASIC-Statements, + each contains CR / LF separators in the string, since a SFx statement + is translated if necessary into several BASIC statements. - Statements f"ur die nicht <SfxRequest::Done()> gerufen wurde, werden - mit einem vorangestellten 'rem' gekennzeichnet. + Statements for which <SfxRequest::Done()> was not called are marked + with a preceding 'rem'. */ inline const String& SfxMacroStatement::GetStatement() const @@ -128,41 +126,38 @@ inline const String& SfxMacroStatement::GetStatement() const enum SfxMacroMode -/* [Beschreibung] +/* [Description] - Mit diesem enum wird bestimmt, ob eine <SfxMacro>-Instanz zum - absoluten oder relativen Recorden erzeugt wurde, oder um ein - existierendendes Makro zu Referenzieren. + By using this enum it is determined, if a <SfxMacro>-Instance was created + by absolute or relative recording, or to create a reference to a existing + macro. */ { - SFX_MACRO_EXISTING, /* es handelt sich um ein bereits - exitistierendes Makro, welches lediglich - referenziert wird */ - - SFX_MACRO_RECORDINGABSOLUTE,/* dieses Makro soll aufgezeichnet werden, - wobei die betroffenen Objekte m"oglichst - direkt angesprochen werden sollen - (Beispiel: "[doc.sdc]") */ - - SFX_MACRO_RECORDINGRELATIVE/* dieses Makro soll aufgezeichnet werden, - wobei die betroffenen Objekte so - angesprochen werden sollen, da\s sich das - Abspielen auf die dann g"ultige Selektion - bezieht (Beispiel: "ActiveDocument()") */ + SFX_MACRO_EXISTING, /* Indicates that it is a existing + macro, which will only referenced */ + + SFX_MACRO_RECORDINGABSOLUTE, /* This macro shall be recorded so that the + affected objects are to be addressed as + directly as possible (example: "[doc.sdc]") */ + + SFX_MACRO_RECORDINGRELATIVE /* This macro is recorded and the affected + objects are addressed in such a way so + that when running the macro it refers to + a vaild selection + (example:" active document () ") */ }; //==================================================================== class SfxMacro -/* [Beschreibung] +/* [Description] - "Uber diese Klasse (bzw. genaugenommen ihre Subklassen) wird zum - einen die Lokation einer BASIC-Funktion (also in welcher Library, - in welchem Modul sowie der Funktions-Name) beschrieben, als auch - ein aufzuzeichnendes Makro w"ahrend der Aufzeichnung zwischen- - gespeichert. + Through using this class (and in fact its subclasses) the location of a + BASIC function will be discribed (also in which Library, in which module + and the Function name) as well as temporary storing a macro during the + recording. */ { diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx deleted file mode 100644 index 53c15fc02d24..000000000000 --- a/sfx2/inc/msgnodei.hxx +++ /dev/null @@ -1,221 +0,0 @@ -/* -*- 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 - * - * 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. - * - ************************************************************************/ - -#ifndef _MSGNODEI_HXX -#define _MSGNODEI_HXX - -#include <svl/eitem.hxx> -#include <tools/string.hxx> -#include <svl/poolitem.hxx> - -struct SfxMsgAttachFile { - String aFile; - String aName; - - int operator==( const SfxMsgAttachFile& rRec ) const - { - if( aName == rRec.aName && aFile == rRec.aFile ) - return sal_True; - return sal_False; - } - - SfxMsgAttachFile( const String& rFile, const String& rName) - : aName( rName ), aFile( rFile ) {} - - SfxMsgAttachFile( const SfxMsgAttachFile& rRec ) - : aName( rRec.aName), aFile( rRec.aFile ) {} -}; - -enum SfxMsgReceiverRole -{ - MSG_RECEIVER_TO = 0, - MSG_RECEIVER_CC, - MSG_RECEIVER_BCC, - MSG_RECEIVER_NEWSGROUP -}; - -struct SfxMsgReceiver { - String aName; - SfxMsgReceiverRole eRole; - - int operator==( const SfxMsgReceiver& rRec ) const - { - if( aName == rRec.aName && eRole == rRec.eRole ) - return sal_True; - return sal_False; - } - - SfxMsgReceiver( const String& rName, SfxMsgReceiverRole _eRole ) - : aName( rName ), eRole( _eRole ) {} - - SfxMsgReceiver( const SfxMsgReceiver& rRec ) - : aName( rRec.aName), eRole( rRec.eRole ) {} -}; - -// ------------------------------------------------------------------------ - -class SfxMsgReceiverList_Impl : public List -{ - sal_uIntPtr nRef; - ~SfxMsgReceiverList_Impl(); - SfxMsgReceiverList_Impl& operator=( const SfxMsgReceiverList_Impl&); //n.i. -public: - SfxMsgReceiverList_Impl(); - SfxMsgReceiverList_Impl(const SfxMsgReceiverList_Impl&); - - void Load( SvStream& ); - void Store( SvStream& ) const; - void IncRef() { nRef++; } - void DecRef() { nRef--; if( !nRef ) delete this; } - sal_uIntPtr GetRefCount() const { return nRef; } - int operator==( const SfxMsgReceiverList_Impl& ) const; -}; - -class SfxMsgReceiverListItem : public SfxPoolItem -{ - void Disconnect(); -protected: - SfxMsgReceiverList_Impl* pImp; -public: - TYPEINFO(); - - SfxMsgReceiverListItem(); - SfxMsgReceiverListItem( sal_uInt16 nWhich ); - SfxMsgReceiverListItem( sal_uInt16 nWhich, SvStream& rStream ); - SfxMsgReceiverListItem( const SfxMsgReceiverListItem& rItem ); - ~SfxMsgReceiverListItem(); - - virtual int operator==( const SfxPoolItem& ) const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - XubString &rText ) const; - - sal_uInt16 Count() const; - SfxMsgReceiver* GetObject( sal_uInt16 nPos ); - void Remove( sal_uInt16 nPos ); - void Add( const SfxMsgReceiver& ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; -}; - - -// ------------------------------------------------------------------------ - -class SfxMsgAttachFileList_Impl : public List -{ - sal_uIntPtr nRef; - ~SfxMsgAttachFileList_Impl(); - SfxMsgAttachFileList_Impl& operator=( const SfxMsgAttachFileList_Impl&); //n.i. - -public: - SfxMsgAttachFileList_Impl(); - SfxMsgAttachFileList_Impl(const SfxMsgAttachFileList_Impl&); - - int operator==( const SfxMsgAttachFileList_Impl& rRec ) const; - SfxMsgAttachFile* GetReceiver(sal_uIntPtr nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); } - void Load( SvStream& ); - void Store( SvStream& ) const; - void IncRef() { nRef++; } - void DecRef() { nRef--; if( !nRef ) delete this; } - sal_uIntPtr GetRefCount() const { return nRef; } -}; - -class SfxMsgAttachFileListItem : public SfxPoolItem -{ -protected: - SfxMsgAttachFileList_Impl* pImp; - void Disconnect(); -public: - TYPEINFO(); - - SfxMsgAttachFileListItem(); - SfxMsgAttachFileListItem( sal_uInt16 nWhich ); - SfxMsgAttachFileListItem( sal_uInt16 nWhich, SvStream& rStream ); - SfxMsgAttachFileListItem( const SfxMsgAttachFileListItem& rItem ); - ~SfxMsgAttachFileListItem(); - - virtual int operator==( const SfxPoolItem& ) const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - XubString &rText ) const; - - sal_uInt16 Count() const; - SfxMsgAttachFile* GetObject( sal_uInt16 nPos ); - void Remove( sal_uInt16 nPos ); - void Add( const SfxMsgAttachFile& ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; -}; - - -//========================================================================= - -enum SfxMsgPriority -{ - MSG_PRIORITY_LOW = 0, - MSG_PRIORITY_NORMAL, - MSG_PRIORITY_URGENT -}; -#define SFXMSGPRIORITYCOUNT 3 - -class SfxMsgPriorityItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SfxMsgPriorityItem( sal_uInt16 nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL); - - virtual SfxPoolItem* Clone( SfxItemPool* pPool=0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, - String &rText ) const; - virtual sal_uInt16 GetValueCount() const; - virtual String GetValueTextByPos( sal_uInt16 nPos ) const; - - inline SfxMsgPriorityItem& operator=(const SfxMsgPriorityItem& rPrio) - { - SetValue( rPrio.GetValue() ); - return *this; - } -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 5c4a41e7d6f2..8615cc61d450 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -599,7 +599,6 @@ #include "tools/globname.hxx" #include "tools/inetmime.hxx" #include "tools/link.hxx" -#include "tools/ownlist.hxx" #include "tools/rc.hxx" #include "tools/rcid.h" #include "tools/ref.hxx" diff --git a/sfx2/inc/sfx2/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx index 753f6a4b2607..89a2902b1081 100644 --- a/sfx2/inc/sfx2/QuerySaveDocument.hxx +++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx @@ -33,7 +33,7 @@ class Window; class String; -/** opens the generell query save document dialog. +/** Opens the general query save document dialog. @param _pParent The parent window. @_rTitle diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index c6a9e8870b3d..23354d1baf06 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -70,12 +70,12 @@ SV_DECL_PTRARR( SfxUnoControllerArr_Impl, SfxUnoControllerItemPtr, 20, 20 ) // defines //________________________________________________________________________________________________________________ -#define SFX_CALLMODE_SLOT 0x00 // sync/async vom Slot -#define SFX_CALLMODE_SYNCHRON 0x01 // synchron im selben Stackframe -#define SFX_CALLMODE_ASYNCHRON 0x02 // asynchron per AppEvent -#define SFX_CALLMODE_RECORD 0x04 // beim Recorden ber"ucksichtigen -#define SFX_CALLMODE_API 0x08 // Call von der API (silent) -#define SFX_CALLMODE_MODAL 0x10 // trotz ModalMode +#define SFX_CALLMODE_SLOT 0x00 // sync/async from Slot +#define SFX_CALLMODE_SYNCHRON 0x01 // synchronously in the same Stackframe +#define SFX_CALLMODE_ASYNCHRON 0x02 // asynchronously via AppEvent +#define SFX_CALLMODE_RECORD 0x04 // take into accont while recording +#define SFX_CALLMODE_API 0x08 // API call (silent) +#define SFX_CALLMODE_MODAL 0x10 // despite ModalMode #define SFX_CALLMODE_STANDARD SFX_CALLMODE_RECORD typedef sal_uInt16 SfxCallMode; @@ -90,23 +90,22 @@ enum SfxPopupAction //==================================================================== class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster -/* [Beschreibung] - - In jeder SFx-Applikation existiert "uber die Laufzeit von vor - <SfxApplication::Init()> bis nach <SfxApplication::Exit()> eine Instanz - der Klasse SfxBindings. Sie wird von der SfxApplication automatisch - angelegt und zerst"ort. Instanzen werden aber i.d.R. "uber das - Makro <SFX_BINDINGS> oder den zugeh"origen <SfxViewFrame> besorgt - werden. - - Die SfxBindings verwalten alle in den an ihr angemeldeten Controllern - gebundenen Slot-Ids und cachen die jeweiligen <Slot-Server> - (so nenne wir die Kombination aus SfxShell-Instanz und SfxSlot). - In den SfxBindings ist gespeichert, ob und welche Controller dirty - sind sowie welche Slot-Server-Caches jeweils dirty sind. Sie fa"st - Status-Anfragen (Aufrufe der in der IDL genannten Status-Methoden) - zusammen, die von derselben Status-Methode bedient werden, und sorgt - f"ur die Simulation der <Pseudo-Slots>. +/* [Description] + + In each SFx application one instance of the SfxBindings-Class will + exists from <SfxApplication::Init()> until <SfxApplication::Exit()>. + This instance is automatically created and destroyed by SfxApplication. + However these instances will be handled by the Macro <SFX_BINDINGS> + or the associated <SfxViewFrame>. + + The SfxBindings manages all of its Slot-Ids bound by the registerd + controllers and keeps a cache of the <Slot-Server> respectively. + (it is what we call the combination of SfxShell instance and SfxSlot). + In the SfxBindings it is stored, if and in this case which controllers + that are dirty and which Slot-Server-Caches are dirty respectively. + It summarizes status queries (calls to the status methods specified + in the IDL) that are served by the same state methods, and handles + the simulation of <Pseudo-Slots>. */ { @@ -114,15 +113,15 @@ friend class SfxApplication; friend class SfxShell; friend class SfxBindings_Impl; - SfxBindings_Impl*pImp; // Daten der Bindings-Instanz - SfxDispatcher* pDispatcher; // zu verwendender Dispatcher - sal_uInt16 nRegLevel; // Lock-Level waehrend Reconfig + SfxBindings_Impl*pImp; // Data of the Bindings instance + SfxDispatcher* pDispatcher; // Dispatcher, to be used + sal_uInt16 nRegLevel; // Lock-Level while Reconfig private: SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi, SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False); SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* ); - SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren + SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache, const SfxSlot* &pRealSlot, const SfxSlotServer**, @@ -145,7 +144,7 @@ public: void SetDispatcher(SfxDispatcher *pDisp); - void Update( sal_uInt16 nId ); // z.B. aus Menu::Activate + void Update( sal_uInt16 nId ); // For example, from Menu::Activate void Update(); SAL_DLLPRIVATE void StartUpdate_Impl(sal_Bool bComplete=sal_False); void Invalidate( sal_uInt16 nId ); @@ -232,21 +231,21 @@ public: inline int SfxBindings::IsInRegistrations() const -/* [Beschreibung] +/* [Description] - Stellt fest, ob an der SfxBindings Instanz gerade <SfxContollerItems> - an- oder abgemeldet werden, also noch <SfxBindings::EnterRegistrations()> - Aufrufe nicht mit <SfxBindings::EnterRegistrations()> geschlo"sen wurden. + Determines whether the <SfxContollerItems> SfxBindings instance is + registerd or unregisted, i.e. <SfxBindings::EnterRegistrations()> + calls that have not been closed by <SfxBindings::LeaveRegistrations()>. - [R"uckgabewert] + [Return value] int sal_True - Die SfxBindings Instanz ist gerade im Registrierungs- - Modus. Es erfolgen also keine Status-Updates. + The SfxBindings instance is currently in + Registration-Mode. No status updates . - sal_False - Die SfxBindings Instanz ist gerade im normalen - Modus. Es k"oennen also Status-Updates erfolgen. + int sal_False + The SfxBindings instance is the normal mode. + Status updates can be done. */ { diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx index 0b2967bdbd70..6707424e816f 100644 --- a/sfx2/inc/sfx2/chalign.hxx +++ b/sfx2/inc/sfx2/chalign.hxx @@ -30,32 +30,32 @@ #include <tools/solar.h> -// Neue Reihenfolge: zuerst Navigationsleiste, dann senkrecht angedockte -// ChildWindows (Explorer!), dann horizontal angedockte ChildWindows (Browser!), -// dann die Formatleiste, die Statuszeile, am Ende die Werkzeugleiste. +// New order: first, navigation bar, then vertically docked child windows +// (Explorer!), then horizontally docked child windows (Browser!), +// then the format bar, status bar, and at the end of the toolbar. enum SfxChildAlignment { - SFX_ALIGN_HIGHESTTOP, // z.B. Navigationsleiste + SFX_ALIGN_HIGHESTTOP, // for example Navigation bar SFX_ALIGN_LOWESTBOTTOM, SFX_ALIGN_FIRSTLEFT, SFX_ALIGN_LASTRIGHT, - SFX_ALIGN_LEFT, // z.B. SplitWindow + SFX_ALIGN_LEFT, // for example SplitWindow SFX_ALIGN_RIGHT, SFX_ALIGN_LASTLEFT, SFX_ALIGN_FIRSTRIGHT, - SFX_ALIGN_TOP, // z.B. Hyperlink-Builder, SplitWindow - SFX_ALIGN_BOTTOM, // z.B. SplitWindow - SFX_ALIGN_TOOLBOXTOP, // z.B. Objektleiste + SFX_ALIGN_TOP, // for example Hyperlink-Builder, SplitWindow + SFX_ALIGN_BOTTOM, // for example SplitWindow + SFX_ALIGN_TOOLBOXTOP, // for example Objekt bar SFX_ALIGN_TOOLBOXBOTTOM, - SFX_ALIGN_LOWESTTOP, // z.B. Calc-Rechenleiste - SFX_ALIGN_HIGHESTBOTTOM, // z.B. Statusleiste - SFX_ALIGN_TOOLBOXLEFT, // z.B. Werkzeugleiste + SFX_ALIGN_LOWESTTOP, // for example Calc bar + SFX_ALIGN_HIGHESTBOTTOM, // for example Status bar + SFX_ALIGN_TOOLBOXLEFT, // for example Tool bar SFX_ALIGN_TOOLBOXRIGHT, - SFX_ALIGN_NOALIGNMENT // alle FloatingWindows + SFX_ALIGN_NOALIGNMENT // all FloatingWindows }; -// "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird +// Verifies that a valid alignment is used inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign ) { return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT ); diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 13e92d9ff150..8aeaff3ad0ad 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -48,17 +48,18 @@ class SfxChildWindow; class SfxChildWindowContext; class SfxChildWinContextArr_Impl; -#define SFX_CHILDWIN_ZOOMIN 0x01 // ganz eingeklapptes Float -#define SFX_CHILDWIN_SMALL 0x02 // halb eingeklapptes Float -#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float verboten -#define SFX_CHILDWIN_AUTOHIDE 0x08 // DockingWindow im AutoHide-Modus -#define SFX_CHILDWIN_TASK 0x10 // ChildWindow innerhalb der Task -#define SFX_CHILDWIN_CANTGETFOCUS 0x20 // ChildWindow kann keinen Focus bekommen +#define SFX_CHILDWIN_ZOOMIN 0x01 // Fully retracted Float +#define SFX_CHILDWIN_SMALL 0x02 // Half retracted Float +#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float forbidden +#define SFX_CHILDWIN_AUTOHIDE 0x08 // DockingWindow in AutoHide mode +#define SFX_CHILDWIN_TASK 0x10 // ChildWindow inside the Task +#define SFX_CHILDWIN_CANTGETFOCUS 0x20 // ChildWindow can not get focus #define SFX_CHILDWIN_ALWAYSAVAILABLE 0x40 // ChildWindow is never disabled -#define SFX_CHILDWIN_NEVERHIDE 0x80 // ChildWindow is can always made visible/is visible +#define SFX_CHILDWIN_NEVERHIDE 0x80 // ChildWindow is can always made + // visible/is visible #define CHILDWIN_NOPOS USHRT_MAX -// Konfiguration eines ChildWindows +// ChildWindow Configuration struct SfxChildWinInfo { sal_Bool bVisible; @@ -80,21 +81,21 @@ struct SfxChildWinInfo sal_uInt16 *pPos = 0 ) const; }; -// Factory-Methode eines ChildWindows +// ChildWindow factory methods typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); -// Factory-Methode eines ChildWindowsContexts +// ChildWindowsContexts factory methods typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow, SfxBindings *pBindings, SfxChildWinInfo *pInfo); struct SfxChildWinContextFactory { - SfxChildWinContextCtor pCtor; // Factory-Methode - sal_uInt16 nContextId; // Identifier f"ur das SfxInterface - SfxChildWinInfo aInfo; // Konfiguration + SfxChildWinContextCtor pCtor; // Factory method + sal_uInt16 nContextId; // Idenifier for SfxInterface + SfxChildWinInfo aInfo; // Configuration SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID ) : pCtor(pTheCtor) @@ -106,11 +107,11 @@ SV_DECL_PTRARR_DEL( SfxChildWinContextArr_Impl, SfxChildWinContextFactory*, 2, 2 struct SfxChildWinFactory { - SfxChildWinCtor pCtor; // Factory-Methode + SfxChildWinCtor pCtor; // Factory method sal_uInt16 nId; // ChildWindow-Id ( SlotId ) - SfxChildWinInfo aInfo; // Konfiguration - sal_uInt16 nPos; // ggf. Position im UI - SfxChildWinContextArr_Impl *pArr; // Array f"ur Contexte + SfxChildWinInfo aInfo; // Configuration + sal_uInt16 nPos; // Position in UI + SfxChildWinContextArr_Impl *pArr; // Array for Contexts SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, sal_uInt16 n ) @@ -162,13 +163,13 @@ class SFX2_DLLPUBLIC SfxChildWindow sal_uInt16 nType; // ChildWindow-Id protected: - SfxChildAlignment eChildAlignment;// aktuelles ::com::sun::star::drawing::Alignment - ::Window* pWindow; // eigentlicher Inhalt - SfxChildWindow_Impl* pImp; // Imp-Daten + SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment + ::Window* pWindow; // actual contents + SfxChildWindow_Impl* pImp; // Implementation data private: - SfxChildWindowContext* pContext; // bei kontextsensitiven ChildWindows: - // weiteres window in pWindow + SfxChildWindowContext* pContext; // With context-sensitive ChildWindows: + // Annother window in pWindow SAL_DLLPRIVATE SfxChildWindowContext* GetContext() const { return pContext; } @@ -240,19 +241,19 @@ public: }; //------------------------------------------------------------------ -//! demn"achst hinf"allig ! +//! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(SfxModule *pMod=0); \ -//! Das Macro der Zukunft ... +//! The Macro of the future ... #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \ -//! demn"achst hinf"allig ! +//! soon obsolete ! #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ @@ -270,9 +271,10 @@ public: SfxChildWindowContext::RegisterChildWindowContext(pMod, MyID, pFact); \ } -//! Das Macro der Zukunft ... -// CreateImpl mu\s noch als Parameter die Factory mitbekommen wg. ContextId -// Solange wird diese Id auf 0 gesetzt und in SfxChildWindow::CreateContext gepatched +//! The Macro of the future ... +// As a parameter and because of ContextId, CreateImpl must be handed the +// factory. As long as Id is set to 0 and patched in +// SfxChildWindow::CreateContext #define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index ef652981f76d..35cbf6e1fc6f 100755 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -39,9 +39,9 @@ // Slot-ID's ----------------------------------------------------------------- #ifndef SID_SFX_START -// HACK() - SID's duerfen nicht o.w. ihren numerischen Wert aendern, -// sfxsids.hrc darf aber nicht included werden!!! Loesung: sfxsids.hrc -// "tiefer legen" - z.B. svtools??? +// HACK() - SID's may not change its numerical value just like that, +// sfxsids.hrc may not be included!!! Solution: sfxsids.hrc +// include it on a lower level - for example svtools??? #define SID_SFX_START 5000 #endif #define SID_TITLE (SID_SFX_START + 307) @@ -349,24 +349,24 @@ // Tabpage-Ids --------------------------------------------------------------- -#define CNT_TABPAGE_GENERAL 1 // "Allgemein" -#define CNT_TABPAGE_SERVER_SETTINGS 2 // "Server" -#define CNT_TABPAGE_RULES 3 // "Regeln" -#define CNT_TABPAGE_VIEW_PROPERTIES 4 // "Ansicht" -#define CNT_TABPAGE_CONTENT_PROPERTIES 5 // "Inhalte" -#define CNT_TABPAGE_SUBSCRIBE 6 // "Abonniert" -#define CNT_TABPAGE_RECIPIENT_STATE 7 // "Status" (Outtray-Msgs) -#define CNT_TABPAGE_RECV_POP3 8 // "Empfangen" fuer POP3 -#define CNT_TABPAGE_RECV_NNTP 9 // - " - fuer NNTP-Accounts -#define CNT_TABPAGE_RECV_IMAP 10 // - " - fuer IMAP-Accounts -#define CNT_TABPAGE_RECV_VIM 11 // - " - fuer VIM-Accounts -#define CNT_TABPAGE_SEND_SMTP 12 // "SMTP" -#define CNT_TABPAGE_SEND_NNTP 13 // "NNTP" -#define CNT_TABPAGE_SEND_VIM 14 // "VIM" -#define CNT_TABPAGE_MAIL_NEWS_SEND 15 // "Versenden" +#define CNT_TABPAGE_GENERAL 1 +#define CNT_TABPAGE_SERVER_SETTINGS 2 +#define CNT_TABPAGE_RULES 3 +#define CNT_TABPAGE_VIEW_PROPERTIES 4 +#define CNT_TABPAGE_CONTENT_PROPERTIES 5 +#define CNT_TABPAGE_SUBSCRIBE 6 +#define CNT_TABPAGE_RECIPIENT_STATE 7 +#define CNT_TABPAGE_RECV_POP3 8 +#define CNT_TABPAGE_RECV_NNTP 9 +#define CNT_TABPAGE_RECV_IMAP 10 +#define CNT_TABPAGE_RECV_VIM 11 +#define CNT_TABPAGE_SEND_SMTP 12 +#define CNT_TABPAGE_SEND_NNTP 13 +#define CNT_TABPAGE_SEND_VIM 14 +#define CNT_TABPAGE_MAIL_NEWS_SEND 15 #define CNT_TABPAGE_SEARCH_CRITERIA 16 #define CNT_TABPAGE_SEARCH_LOCATIONS 17 -#define CNT_TABPAGE_PROJECT_DATAEXCHANGE 18 // "Datenaustausch" +#define CNT_TABPAGE_PROJECT_DATAEXCHANGE 18 #define CNT_TABPAGE_SBOX_LOCATION 19 #define CNT_TABPAGE_SBOX_SUBSCRIBTION 20 #define CNT_TABPAGE_SBOX_SCHEDULE 21 @@ -377,12 +377,12 @@ #define CNT_TABPAGE_SBOX_SDC_GENERAL 26 #define CNT_TABPAGE_SBOX_CDF_SUBSCRIBTION 27 #define CNT_TABPAGE_BACKGROUND 28 -#define CNT_TABPAGE_HEADER 29 // "Kopfzeilen" - Header bei Mail/News etc. -#define CNT_TABPAGE_DESCRIPTION 30 // "Beschreibung" - Header im Filesys +#define CNT_TABPAGE_HEADER 29 +#define CNT_TABPAGE_DESCRIPTION 30 #define CNT_TABPAGE_FONT 31 -#define CNT_TABPAGE_FOLDER_BMK 32 // Link auf Ordner -#define CNT_TABPAGE_DOCUMENT_BMK 33 // Link auf Dokument -#define CNT_TABPAGE_WEBVIEW 34 // Web-Ansicht +#define CNT_TABPAGE_FOLDER_BMK 32 +#define CNT_TABPAGE_DOCUMENT_BMK 33 +#define CNT_TABPAGE_WEBVIEW 34 #define DEF_WIDTH_FROM 150 diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx index f5ee81b977a1..e7b1dc6cfbc2 100644 --- a/sfx2/inc/sfx2/ctrlitem.hxx +++ b/sfx2/inc/sfx2/ctrlitem.hxx @@ -41,30 +41,29 @@ class SFX2_DLLPUBLIC SfxControllerItem { private: sal_uInt16 nId; - SfxControllerItem* pNext; // zu benachrichtigendes weiteres ControllerItem + SfxControllerItem* pNext; // to notify next ControllerItem SfxBindings* pBindings; protected: -//#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE ) #if defined( DBG_UTIL ) SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType ); #endif public: SfxBindings & GetBindings() { - DBG_ASSERT(pBindings, "keine Bindings"); + DBG_ASSERT(pBindings, "no Bindings"); return *pBindings; } const SfxBindings & GetBindings() const { - DBG_ASSERT(pBindings, "keine Bindings"); + DBG_ASSERT(pBindings, "no Bindings"); return *pBindings; } - SfxControllerItem(); // fuer arrays + SfxControllerItem(); // for arrays SfxControllerItem( sal_uInt16 nId, SfxBindings & ); virtual ~SfxControllerItem(); - void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // in SfxBindings registrieren + void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // Register in SfxBindings void UnBind(); void ReBind(); sal_Bool IsBound() const; diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 2e9c39e8b027..f6eb60be3755 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -111,7 +111,7 @@ class SFX2_DLLPUBLIC SfxDispatcher sal_Bool bFlushed; private: - // auf temporaer ausgewerteten Todos suchen + // Search for temporary evaluated Todos SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep ); #ifndef _SFX_HXX @@ -131,8 +131,8 @@ friend class SfxBindings; friend class SfxStateCache; friend class SfxPopupMenuManager; friend class SfxHelp; - // Fuer die Bindings: Finden einer Message; Level fuer - // erneuten Zugriff + // For bindings: Finding the Message; + // level for re-access SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); sal_Bool _FillState( const SfxSlotServer &rServer, @@ -261,11 +261,10 @@ public: inline sal_Bool SfxDispatcher::IsFlushed() const -/* [Beschreibung] +/* [Description] - Mit dieser Methode l"a"st sich erfragen, ob der Stack des - SfxDispatchers geflusht ist, oder noch Push- oder Pop-Befehle - ausstehen. + This method checks if the stack of the SfxDispatchers is flushed, or if + push- or pop- commands are pending. */ { @@ -276,13 +275,12 @@ inline sal_Bool SfxDispatcher::IsFlushed() const inline void SfxDispatcher::Flush() -/* [Beschreibung] +/* [Description] - Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus. - F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird - <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur - SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)> - mit bMDI == sal_True aufgerufen. + This method performs outstanding push- and pop- commands. For <SfxShell>s, + which are new on the stack, the <SfxShell::Activate(sal_Bool)> is invoked with + bMDI == sal_True, for SfxShells that are removed from the stack, the + <SfxShell::Deactivate(sal_Bool)> is invoked with bMDI == sal_True */ { @@ -293,14 +291,15 @@ inline void SfxDispatcher::Flush() inline void SfxDispatcher::Push( SfxShell& rShell ) -/* [Beschreibung] +/* [Description] - Mit dieser Methode wird eine <SfxShell> auf den SfxDispatcher - gepusht. Die SfxShell wird zun"achst zum pushen vermerkt und - es wird ein Timer aufgesetzt. Erst bei Ablauf des Timers wird - tats"achlich gepusht (<SfxDispatcher::Flush()>) und die <SfxBindings> - werden invalidiert. W"ahrend der Timer l"auft gleichen sich - entgegengesetzte Push und Pop Befehle mit derselben SfxShell aus. + With this method, a <SfxShell> pushed on to the SfxDispatcher. + The SfxShell is first marked for push and a timer is set up. + First when the timer has couted down to zero the push + ( <SfxDispatcher::Flush()> ) is actually performed and the + <SfxBindings> is invalidated. While the timer is counting down + the opposing push and pop commands on the same SfxShell are + leveled out. */ { @@ -311,21 +310,18 @@ inline void SfxDispatcher::Push( SfxShell& rShell ) inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell ) -/* [Beschreibung] +/* [Description] - Mit dieser Methode kann abgefragt werden, ob sich eine bestimmte - <SfxShell>-Instanz auf dem SfxDispatcher befindet. + This method checks whether a particular <SfxShell> instance is + on the SfxDispatcher. - [R"uckgabewert] + [Return value] sal_Bool sal_True - Die SfxShell-Instanz befindet sich auf dem - SfxDispatcher. + The SfxShell instance is on the SfxDispatcher. sal_False - Die SfxShell-Instanz befindet sich nicht auf dem - SfxDispatcher. - + The SfxShell instance is not on the SfxDispatcher. */ { @@ -335,21 +331,20 @@ inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell ) inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell ) -/* [Beschreibung] +/* [Description] - Mit dieser Methode kann abgefragt werden, ob sich eine bestimmte - <SfxShell>-Instanz zuoberst auf dem SfxDispatcher befindet. + This method checks whether a particular <SfxShell> instance is on + top of the SfxDispatcher. - [R"uckgabewert] + [Return value] sal_Bool sal_True - Die SfxShell-Instanz befindet sich als oberste - SfxShell auf dem SfxDispatcher. + The SfxShell instance is on the top of + the SfxDispatcher. sal_False - Die SfxShell-Instanz befindet sich nicht als - oberste SfxShell auf dem SfxDispatcher. - + The SfxShell instance is not on the top of + the SfxDispatcher. */ { diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index 9be57c9bb528..b0a047c7180b 100644 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -54,25 +54,25 @@ class SfxBindings; typedef void (*SfxVoidFunc)(); #define SDT_SDT_DOCFACTPRIO 10 // Explorer -#define SDT_SW_DOCFACTPRIO 20 // Text-Dokument -#define SDT_SWW_DOCFACTPRIO 21 // Web-Dokument -#define SDT_SC_DOCFACTPRIO 30 // Tabellen-Dokument -#define SDT_SI_DOCFACTPRIO 40 // Impress-Dokument -#define SDT_SD_DOCFACTPRIO 41 // Draw-Dokument -#define SDT_SCH_DOCFACTPRIO 50 // Chart-Dokument -#define SDT_SMA_DOCFACTPRIO 60 // Math-Dokument -#define SDT_SIM_DOCFACTPRIO 70 // Image-Dokument -#define SDT_FRM_DOCFACTPRIO 100 // Rahmen-Dokument -#define SDT_MSG_DOCFACTPRIO 110 // Nachrichten-Dokument -#define SDT_SDB_DOCFACTPRIO 200 // Datenbank-Dokument +#define SDT_SW_DOCFACTPRIO 20 // Text Document +#define SDT_SWW_DOCFACTPRIO 21 // Web Document +#define SDT_SC_DOCFACTPRIO 30 // Table Document +#define SDT_SI_DOCFACTPRIO 40 // Impress Document +#define SDT_SD_DOCFACTPRIO 41 // Draw Document +#define SDT_SCH_DOCFACTPRIO 50 // Chart Document +#define SDT_SMA_DOCFACTPRIO 60 // Math Document +#define SDT_SIM_DOCFACTPRIO 70 // Image Document +#define SDT_FRM_DOCFACTPRIO 100 // Frame Document +#define SDT_MSG_DOCFACTPRIO 110 // Message Document +#define SDT_SDB_DOCFACTPRIO 200 // Database Document //==================================================================== class SFX2_DLLPUBLIC SfxObjectFactory { private: - const char* pShortName; // Objekt-Kurzname - SfxObjectFactory_Impl* pImpl; // Zusatzdaten + const char* pShortName; + SfxObjectFactory_Impl* pImpl; // Additional Data SfxObjectShellFlags nFlags; SAL_DLLPRIVATE void Construct(); @@ -122,20 +122,16 @@ private: //========================================================================= #define SFX_DECL_OBJECTFACTORY() \ -private: \ - static SfxObjectFactory* pObjectFactory; \ public: \ static SfxObjectFactory& Factory(); \ virtual SfxObjectFactory& GetFactory() const { return Factory(); } #define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \ - SfxObjectFactory* ClassName::pObjectFactory = 0; \ - SfxObjectFactory& ClassName::Factory() \ - { if (!pObjectFactory) \ - pObjectFactory = \ - new SfxObjectFactory( GlobName, Flags, ShortName ); \ - return *pObjectFactory; \ - } + SfxObjectFactory& ClassName::Factory() \ + { \ + static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \ + return aObjectFactory; \ + } #endif // #ifndef _SFX_OBJFAC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx index ee3db35cebf4..370647e2a647 100644 --- a/sfx2/inc/sfx2/doctempl.hxx +++ b/sfx2/inc/sfx2/doctempl.hxx @@ -87,16 +87,15 @@ public: String GetDefaultTemplatePath(const String &rLongName); - // Pfad zur Vorlage geben lassen; logischer Name muss angegeben - // werden, damit beim Ueberschreiben einer Vorlage der - // richtige Dateiname gefunden werden kann + // Path to the template; the logical name must be given in order to find + // the correct file name when overwriting a template String GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const; // Allows to retrieve the target template URL from the UCB ::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, const ::rtl::OUString& aTitle ); - // Speichern als Vorlage hat geklappt -> Aktualisieren + // Save as template worked -> update void NewTemplate(sal_uInt16 nRegion, const String &rLongName, const String &rFileName); diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index 165c7020850b..513846614d4c 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -40,6 +40,8 @@ #include <sfx2/docfilt.hxx> #include <sfx2/sfxdefs.hxx> +#include <boost/utility.hpp> + class Window; class SfxFilter; class SfxFilterArr_Impl; @@ -124,10 +126,10 @@ public: class SfxFilterMatcher_Impl; -class SFX2_DLLPUBLIC SfxFilterMatcher +class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable { friend class SfxFilterMatcherIter; - SfxFilterMatcher_Impl *pImpl; + SfxFilterMatcher_Impl &m_rImpl; public: SfxFilterMatcher( const String& rFact ); SfxFilterMatcher(); @@ -152,17 +154,18 @@ public: }; class SfxFilterContainer_Impl; -class SFX2_DLLPUBLIC SfxFilterMatcherIter +class SFX2_DLLPUBLIC SfxFilterMatcherIter : private boost::noncopyable + { SfxFilterFlags nOrMask; SfxFilterFlags nAndMask; sal_uInt16 nCurrent; - const SfxFilterMatcher_Impl *pMatch; + const SfxFilterMatcher_Impl &m_rMatch; SAL_DLLPRIVATE const SfxFilter* Find_Impl(); public: - SfxFilterMatcherIter( const SfxFilterMatcher* pMatchP, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED ); + SfxFilterMatcherIter( const SfxFilterMatcher& rMatcher, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED ); const SfxFilter* First(); const SfxFilter* Next(); }; diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index f31f6d24e5d1..bbcf9b8b5b27 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -84,10 +84,10 @@ class Window; #define SFXWB_READONLY WB_READONLY // ((WinBits)0x02000000) #define SFXWB_PATHDIALOG WB_PATH // ((WinBits)0x00100000) #define SFXWB_CLASSPATH ( 0x08000000L | SFXWB_PATHDIALOG ) -#define SFXWB_SHOWALLFOLDER 0x10000000L // alle Ordner auch Mail/News/... -#define SFXWB_MULTISELECTION 0x20000000L // Multiselection an +#define SFXWB_SHOWALLFOLDER 0x10000000L // All folders also mail/news/... +#define SFXWB_MULTISELECTION 0x20000000L #define SFXWB_NOREMOTE 0x40000000L -#define SFXWB_SHOWVERSIONS 0x80000000L // Versionsauswahl anzeigen +#define SFXWB_SHOWVERSIONS 0x80000000L #define SFXWB_GRAPHIC 0x00800000L // FileOpen with link and preview box #define SFXWB_SHOWSTYLES 0x01000000L // FileOpen with link and preview box and styles diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index 54b3d0330308..1080824baeb7 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -99,16 +99,15 @@ typedef ::std::vector< String* > TargetList; #define SFXFRAME_HASTITLE 0x0001 //========================================================================== -// Ein SfxFrame ist eine Verwaltungsklasse f"ur Fenster und deren Inhalte. -// Eine SfxApplication pr"asentiert sich als Hierarchie von SfxFrames, wobei -// die konkreten Inhalte in den abgeleiteten Klassen festgelegt werden. -// Die Basisklasse SfxFrame implementiert 2 Aspekte der Frames: Benennung und -// Kontrolle der Lebensdauer. -// Innerhalb einer Frames-Hierarchie kontrolliert immer der ParentFrame die -// Lebensdauer seiner ChildFrames, auch wenn sie in der Regel gar nicht von -// ihm selbst erzeugt wurden. Durch Aufruf vonn DoClose() an irgendeinem -// Frame in der Hierarchie kann ein Teil des "Frameworks" entfernt werden, -// wobei sich Frames an ihren ParentFrames selbst abmelden. +// SfxFrame is a management class for windows and their content. +// A SfxApplication represent a hierarchy of SfxFrames, with which the actual +// content in the derived classes is defined. The base class SfxFrame +// implements two aspects of frames: naming and control of its lifespan. +// Inside a frame hierarchy the parent frame always controls the lifespan of +// its child frames, even though they usually are not even produced by the +// parent. By calling DoCloser() on any frame in the hierarchy, +// a part of the "framework" can be removed, where frames unsubscribe +// from their parent frames. //========================================================================== class SfxFrameArr_Impl; @@ -195,7 +194,7 @@ public: SAL_DLLPRIVATE sal_Bool IsClosing_Impl() const; SAL_DLLPRIVATE void SetIsClosing_Impl(); - // Methoden f"ur den Zugriff auf das aktuelle Set + // Methods for accessing the current set SAL_DLLPRIVATE void SetDescriptor( SfxFrameDescriptor* ); SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index fb5f232dddd7..f1c62c66f129 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -47,16 +47,14 @@ typedef SfxFrameDescriptor* SfxFrameDescriptorPtr; SV_DECL_PTRARR(SfxFramesArr, SfxFrameDescriptorPtr, 4, 2) //=========================================================================== -// Die SfxFrame...descriptoren bauen eine rekursive Struktur auf, die -// s"amtliche zur Anzeige des Frame-Dokuments erforderlichen Daten umfa\st. -// "Uber einen SfxFrameSetDescriptor hat man Zugriff auf die gesamte darunter -// liegende Struktur. -// Aufgrund der besonderen Eigenschaften des SfxFrames-Dokuments ist ein -// SfxFramesSetDescriptor nicht nur der Inhalt dieses Dokuments, sondern -// beschreibt auch die View darauf. -// Das FrameSet wird aus Zeilen aufgebaut, die wiederum die eigentlichen -// Fenster enthalten. Eine Zeile kann horizontal oder vertikal ausgerichtet -// sein, woraus sich auch das Alignment des FrameSets ergibt. +// The SfxFrame descriptors build a recursive structure, that covers all the +// required data in-order to display the frame document. +// Through a SfxFrameSetDescriptor access is given to the whole underlying +// structure. Due to the nature of the SfxFrames document, the +// SfxFramesSetDescriptor is not only the content of this document, but also +// describes the view on it. The FrameSet is made up of lines, which in turn, +// contains the actual window . A line can be horizontally or vertically +// aligned, from which also the alignment of the FrameSet is given. //=========================================================================== enum ScrollingMode @@ -105,7 +103,7 @@ public: SfxFrameDescriptor(); ~SfxFrameDescriptor(); - // Eigenschaften + // Properties void TakeProperties( const SfxFrameProperties& rProp ); // FileName/URL @@ -184,7 +182,7 @@ public: void SetHasUI( sal_Bool bOn ) { bHasUI = bOn; } - // Attribute f"ur das Splitwindow + // Attribute for Splitwindow sal_uInt16 GetItemId() const { return nItemId; } void SetItemId( sal_uInt16 nId ) @@ -193,11 +191,11 @@ public: long GetSize() const; sal_uInt16 GetItemPos() const; - // Kopie z.B. f"ur die Views + // Copy for example for Views SfxFrameDescriptor* Clone( sal_Bool bWithIds = sal_True ) const; }; -// Kein Bock, einen operator= zu implementieren... +// No block to implement a =operator struct SfxFrameProperties { String aURL; diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index ac3f2303df7b..c6d007bea86d 100644 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -51,7 +51,7 @@ protected: SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {}; public: - // Diese Methoden koennen auch von anderen Parsern benutzt werden + // These methods can also be used by other parsers. static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& ); }; diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx index 0a3fbe1672c6..13c4993bca5d 100644 --- a/sfx2/inc/sfx2/hintpost.hxx +++ b/sfx2/inc/sfx2/hintpost.hxx @@ -39,17 +39,16 @@ class SfxHint; class SfxHintPoster: public SvRefBase -/* [Beschreibung] +/* [Description] - Mit Instanzen dieser Klasse k"onnen eindeutige Events per PostUserEvent - "uber die StarView-Application verschickt werden. Wenn das User-Event - ausgel"ost wird, wird der Handler <Event()> gerufen, dessen - Basisimplementierung den mit <SetEventHdl()> angegbenen Link ruft. + With instances of this class unique events per PostUserEvent can be sent + using the StarView-application. If the User-Event is triggered often, + the handler <Event()> is called, the base implementation with the + <SetEventHdl()> line is making these link calls. - Die Instanz wird via Ref-Count mindestens solange gehalten, wie - ein ggf. abgeschicktes Event noch nicht angekommen ist. Sollte das - Ziel vorher sterben, ist die Verbindung zuvor mit 'SetEventHdl(GenLink())' - zu kappen. + The instance are held via Ref-Count at least as long as a possible sent + event has not arrived yet. Should be killed before the goal, before the + connection is SetEventHdl (GenLink ()) . */ { diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx index b6f5982b455f..5f3c36c147d5 100644 --- a/sfx2/inc/sfx2/htmlmode.hxx +++ b/sfx2/inc/sfx2/htmlmode.hxx @@ -30,19 +30,19 @@ #define HTMLMODE_ON 0x0001 -#define HTMLMODE_PARA_BORDER 0x0002 /* Absatzumrandungen */ -#define HTMLMODE_PARA_DISTANCE 0x0004 /* bestimmte Absatzabstaende */ -#define HTMLMODE_SMALL_CAPS 0x0008 /* Kapitaelchen */ -#define HTMLMODE_FRM_COLUMNS 0x0010 /* spaltige Rahmen */ +#define HTMLMODE_PARA_BORDER 0x0002 +#define HTMLMODE_PARA_DISTANCE 0x0004 +#define HTMLMODE_SMALL_CAPS 0x0008 +#define HTMLMODE_FRM_COLUMNS 0x0010 #define HTMLMODE_SOME_STYLES 0x0020 /* mind. MS IE */ #define HTMLMODE_FULL_STYLES 0x0040 /* == SW */ -#define HTMLMODE_BLINK 0x0080 /* blinkende Zeichen*/ -#define HTMLMODE_PARA_BLOCK 0x0100 /* Blocksatz */ -#define HTMLMODE_DROPCAPS 0x0200 /* Initialen*/ -#define HTMLMODE_FIRSTLINE 0x0400 /* Erstzeileneinzug mit Spacer == NS 3.0 */ -#define HTMLMODE_GRAPH_POS 0x0800 /* Grafikpositionen Hintergrund */ -#define HTMLMODE_FULL_ABS_POS 0x1000 /* abs. Rahmenpositionierung */ -#define HTMLMODE_SOME_ABS_POS 0x2000 /* abs. Rahmenpositionierung vollst.*/ +#define HTMLMODE_BLINK 0x0080 +#define HTMLMODE_PARA_BLOCK 0x0100 +#define HTMLMODE_DROPCAPS 0x0200 +#define HTMLMODE_FIRSTLINE 0x0400 /* First-line intent with Spacer == NS 3.0 */ +#define HTMLMODE_GRAPH_POS 0x0800 +#define HTMLMODE_FULL_ABS_POS 0x1000 +#define HTMLMODE_SOME_ABS_POS 0x2000 #define HTMLMODE_RESERVED1 0x4000 #define HTMLMODE_RESERVED0 0x8000 diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index dbd792413784..39fcd6bd3918 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -48,10 +48,10 @@ namespace com { namespace sun { namespace star { namespace sfx2 { - // Damit der Link ueber den Status der zu ladenen Grafik informierten werden - // verschickt das FileObject ein SvData, mit der FormatId - // "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser - // enthaelt den folgenden enum. + // For the link to receive information about the status of graphics that + // will be loaded the FileObject sends a SvData, which contains the + // FormatID "RegisterStatusInfoId" and a string as the data container. + // This contains the following enum. class SvBaseLink; class SvBaseLinkRef; @@ -71,7 +71,7 @@ class SFX2_DLLPUBLIC LinkManager SvBaseLinks aLinkTbl; SvLinkSources aServerTbl; - SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden + SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell protected: sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, const String* pName = 0 ); @@ -104,23 +104,23 @@ public: void Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ); sal_Bool Insert( SvBaseLink* pLink ); - // den Link mit einem SvLinkSource verbinden und in die Liste eintragen + // the links connect to a SvLinkSource and adds to the list sal_Bool InsertDDELink( SvBaseLink*, const String& rServer, const String& rTopic, const String& rItem ); - // falls am Link schon alles eingestellt ist ! + // if everything is already set at the link! sal_Bool InsertDDELink( SvBaseLink* ); - // den Link mit einem PseudoObject verbinden und in die Liste eintragen + // Connect the links to a pseudo-object and add to the list sal_Bool InsertFileLink( sfx2::SvBaseLink&, sal_uInt16 nFileType, const String& rTxt, const String* pFilterNm = 0, const String* pRange = 0 ); - // falls am Link schon alles eingestellt ist ! + // if everything is already set for the link! sal_Bool InsertFileLink( sfx2::SvBaseLink& ); void ReconnectDdeLink(SfxObjectShell& rServer); @@ -134,7 +134,7 @@ public: */ void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; - // erfrage die Strings fuer den Dialog + // Obtain the string for the dialog sal_Bool GetDisplayNames( const SvBaseLink *, String* pType, String* pFile = 0, @@ -148,29 +148,29 @@ public: sal_Bool bUpdateGrfLinks = sal_False, Window* pParentWin = 0 ); - // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog) + // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } - // ----------------- Serverseitige Verwaltung -------------------- + // ----------------- Server-side management -------------------- - // Liste der zu serviereden Links erfragen + // Call with list of links to server const SvLinkSources& GetServers() const { return aServerTbl; } - // einen zu servierenden Link eintragen/loeschen + // Link register/delete sal_Bool InsertServer( SvLinkSource* rObj ); void RemoveServer( SvLinkSource* rObj ); void RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ) { aServerTbl.Remove( nPos, nCnt ); } - // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln - // (ist zur Zeit nur fuer die FileLinks interressant!) + // A transfer is aborted, so cancel all download media + // (for the time beeing this is only of interest for the FileLinks!) void CancelTransfers(); - // um Status Informationen aus dem FileObject an den BaseLink zu - // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat - // dann die entsprechenden Informationen als String. - // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt - // - das braucht Informationen ueber Load/Abort/Error - static sal_uIntPtr RegisterStatusInfoId(); + // To send status information from the FileObject to the Baselink, + // for this there exist a separate ClipBoardId. The SvData-object has + // got the appropriate information as a string. + // Is now required for FileObject in conjunction with JavaScript + // this needs information about Load/Abort/Error + static sal_uIntPtr RegisterStatusInfoId(); // if the mimetype says graphic/bitmap/gdimetafile then get the // graphic from the Any. Return says no errors @@ -183,15 +183,15 @@ private: LinkManager& operator=( const LinkManager& ); }; -// Trenner im LinkName fuer die DDE-/File-/Grafik- Links -// (nur wer es braucht, um einen SvLinkName zusammenzubasteln) +// Separator in the link name for the DDE-/File-/Graphics- links +// (only those who need to construct a SvLinkName) const sal_Unicode cTokenSeperator = 0xFFFF; -// erzeuge einen String fuer den SvLinkName. Fuer -// - DDE die ersten 3 Strings, (Server, Topic, Item) -// - File-/Grf-LinkNms die letzen 3 Strings (FileName, Bereich, Filter) +// create a string for the SvLinkName. For: +// - DDE the first 3 Strings, (Server, Topic, Item) +// - File-/Graphics-LinkNames the last 3 Strings (FileName, Region, Filter) SFX2_DLLPUBLIC void MakeLnkName( String& rName, - const String* pType, // kann auch 0 sein !! + const String* pType, // Can also be null!! const String& rFile, const String& rLink, const String* pFilter = 0 ); diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index 11a9a2281f08..7b6f1fbb26d1 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -48,7 +48,7 @@ class Window; class String; #ifndef ADVISEMODE_NODATA -// Muessen die gleichen Werte wie Ole2 ADVF_* sein +// Must be the same value as Ole2 ADVF_* #define ADVISEMODE_NODATA 0x01 //#define ADVISEMODE_PRIMEFIRST 0x02 #define ADVISEMODE_ONLYONCE 0x04 diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx index 2c0e4c625c11..34cc33b9e781 100644 --- a/sfx2/inc/sfx2/lnkbase.hxx +++ b/sfx2/inc/sfx2/lnkbase.hxx @@ -54,16 +54,16 @@ class FileDialogHelper; #define OBJECT_DDE_EXTERN 0x02 #endif -#define OBJECT_CLIENT_SO 0x80 // ein Link +#define OBJECT_CLIENT_SO 0x80 // a Link #define OBJECT_CLIENT_DDE 0x81 -//#define OBJECT_CLIENT_OLE 0x82 // ein Ole-Link -//#define OBJECT_CLIENT_OLE_CACHE 0x83 // ein Ole-Link mit SvEmbeddedObject +//#define OBJECT_CLIENT_OLE 0x82 // a Ole-Link +//#define OBJECT_CLIENT_OLE_CACHE 0x83 // a Ole-Link with SvEmbeddedObject #define OBJECT_CLIENT_FILE 0x90 #define OBJECT_CLIENT_GRF 0x91 #define OBJECT_CLIENT_OLE 0x92 // embedded link enum sfxlink { - // Ole2 compatibel und persistent + // Ole2 compatibel and persistent LINKUPDATE_ALWAYS = 1, LINKUPDATE_ONCALL = 3, @@ -84,7 +84,7 @@ private: sal_uInt16 nObjType; sal_Bool bVisible : 1; sal_Bool bSynchron : 1; - sal_Bool bUseCache : 1; // fuer GrafikLinks! + sal_Bool bUseCache : 1; // for Graphics Links! sal_Bool bWasLastEditOK : 1; DECL_LINK( EndEditHdl, String* ); @@ -94,9 +94,9 @@ private: protected: void SetObjType( sal_uInt16 ); - // setzen des LinkSourceName ohne aktion + // Set LinkSourceName without action void SetName( const String & rLn ); - // LinkSourceName der im SvLinkBase steht + // LinkSourceName which is in SvLinkBase String GetName() const; ImplBaseLinkData* pImplData; @@ -120,7 +120,7 @@ protected: public: TYPEINFO(); - // ask JP + virtual void Closed(); SvBaseLink( const String& rNm, sal_uInt16 nObjectType, SvLinkSource* ); @@ -151,10 +151,10 @@ public: // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this virtual void Edit( Window*, const Link& rEndEditHdl ); - // soll der Link im Dialog angezeigt werden ? (Links im Link im ...) + // should the link appear in the dialog? (to the left in the link in the...) sal_Bool IsVisible() const { return bVisible; } void SetVisible( sal_Bool bFlag ) { bVisible = bFlag; } - // soll der Link synchron oder asynchron geladen werden? + // should the Link be loaded synchronous or asynchronous? sal_Bool IsSynchron() const { return bSynchron; } void SetSynchron( sal_Bool bFlag ) { bSynchron = bFlag; } diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx index ee0f313d0470..21af363ca94f 100644 --- a/sfx2/inc/sfx2/mgetempl.hxx +++ b/sfx2/inc/sfx2/mgetempl.hxx @@ -39,9 +39,9 @@ #include <svtools/svmedit2.hxx> #include <svtools/svmedit.hxx> -/* erwartet: - SID_TEMPLATE_NAME : In: StringItem, Name der Vorlage - SID_TEMPLATE_FAMILY : In: Familie der Vorlage +/* expected: + SID_TEMPLATE_NAME : In: StringItem, Name of Template + SID_TEMPLATE_FAMILY : In: Family of Template */ class SfxStyleFamilies; @@ -79,7 +79,7 @@ class SfxManageStyleSheetPage : public SfxTabPage String aBuf; sal_Bool bModified; - // initiale Daten des Styles + // initial data for the style String aName; String aFollow; String aParent; diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx index 22b2695ab16a..9ed76ede6039 100644 --- a/sfx2/inc/sfx2/minarray.hxx +++ b/sfx2/inc/sfx2/minarray.hxx @@ -60,7 +60,6 @@ public:\ const T& GetObject( sal_uInt16 nPos ) const; \ T& GetObject( sal_uInt16 nPos ); \ \ - void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\ void Insert( sal_uInt16 nPos, const T& rElem );\ void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\ void Append( const T& rElem );\ @@ -77,11 +76,6 @@ public:\ void Clear() { Remove( 0, Count() ); }\ };\ \ -inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\ -{\ - Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\ -}\ -\ inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\ {\ Insert( nPos, rElem, 1 );\ @@ -282,7 +276,7 @@ void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \ if ( nUnused == 0 ) \ { \ \ - /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \ + /* increase (round up) to the next Grow-limit */ \ sal_uInt16 nNewSize; \ for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \ /* empty loop */; \ diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 7fd7618ea3ea..49ff8fa47d84 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -57,9 +57,9 @@ class SfxMenuManager { friend class SfxPopupMenuManager; - SfxVirtualMenu* pMenu; // das eigentliche Menu + SfxVirtualMenu* pMenu; // the actual Menu SfxVirtualMenu* pOldMenu; // only while reconfiguring - sal_Bool bMenuBar; // Popup oder MenuBar + sal_Bool bMenuBar; // Popup or MenuBar SfxBindings* pBindings; ResMgr* pResMgr; sal_uInt32 nType; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index f13fcabcecfe..c4d914b93453 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -36,42 +36,51 @@ //-------------------------------------------------------------------- -#define SFX_SLOT_CACHABLE 0x0001L // exklusiv zu VOLATILE, default -#define SFX_SLOT_VOLATILE 0x0002L // per Timer alle 2s neu geholt, exklusiv zu CACHABLE -#define SFX_SLOT_TOGGLE 0x0004L // invertiert bei Execute alten Wert -#define SFX_SLOT_AUTOUPDATE 0x0008L // invalidiert den Status nach Execute automatisch - -#define SFX_SLOT_SYNCHRON 0x0010L // exklusiv zu ASYNCHRON, default -#define SFX_SLOT_ASYNCHRON 0x0020L // via Post-Message, exklusiv zu SYNCHRON - -#define SFX_SLOT_HASCOREID 0x0040L // Slot-ID/Which-ID Mappting durchf"uhren -#define SFX_SLOT_HASDIALOG 0x0080L // Punkte fuer Dialog nach recofig - -#define SFX_SLOT_NORECORD 0x0100L // kein Recording -#define SFX_SLOT_RECORDPERITEM 0x0200L // je Item ein Statement -#define SFX_SLOT_RECORDPERSET 0x0400L // das ganze Set ist ein Statement, def. -#define SFX_SLOT_RECORDMANUAL 0x0800L // Recording vom Applikationsentwickler iss-default - -#define SFX_SLOT_RECORDABSOLUTE 0x1000000L // Recording mit absolutem Target +#define SFX_SLOT_CACHABLE 0x0001L // exclusiv to VOLATILE, default +#define SFX_SLOT_VOLATILE 0x0002L // per Timer every 2s get new, + // exclusiv to CACHABLE +#define SFX_SLOT_TOGGLE 0x0004L // inverted for Execute old value +#define SFX_SLOT_AUTOUPDATE 0x0008L // invalidated the status automatically + // after execute + +#define SFX_SLOT_SYNCHRON 0x0010L // exclusiv to ASYNCHRON, default +#define SFX_SLOT_ASYNCHRON 0x0020L // via Post-Message, exclusiv + // to SYNCHRON + +#define SFX_SLOT_HASCOREID 0x0040L // Slot-ID/Which-ID execute mapping +#define SFX_SLOT_HASDIALOG 0x0080L // Coordinates for dialogue after recofig + +#define SFX_SLOT_NORECORD 0x0100L // no recording +#define SFX_SLOT_RECORDPERITEM 0x0200L // each item, one statement +#define SFX_SLOT_RECORDPERSET 0x0400L // The whole Set is a Statement, default +#define SFX_SLOT_RECORDMANUAL 0x0800L // Recording by the application + // developer is default + +#define SFX_SLOT_RECORDABSOLUTE 0x1000000L // Recording with absolute Target #define SFX_SLOT_STANDARD ( SFX_SLOT_CACHABLE | \ SFX_SLOT_SYNCHRON | \ SFX_SLOT_RECORDPERSET ) -#define SFX_SLOT_PROPGET 0x1000L // abfragbares Property -#define SFX_SLOT_PROPSET 0x2000L // setzbares Property, exklusiv zu SFX_SLOT_METHOD -#define SFX_SLOT_METHOD 0x4000L // Methode, exklusiv zu SFX_SLOT_PROPSET +#define SFX_SLOT_PROPGET 0x1000L // get property +#define SFX_SLOT_PROPSET 0x2000L // set property, exclusiv to + // SFX_SLOT_METHOD +#define SFX_SLOT_METHOD 0x4000L // Method, exclusiv to SFX_SLOT_PROPSET -#define SFX_SLOT_FASTCALL 0x8000L // vor Execute keine Pr"ufung, ob disabled +#define SFX_SLOT_FASTCALL 0x8000L // No test if disabled before Execute -#define SFX_SLOT_STATUSBARCONFIG 0x10000L // konfigurierbar in Statuszeile -#define SFX_SLOT_MENUCONFIG 0x20000L // konfigurierbar im Men"u -#define SFX_SLOT_TOOLBOXCONFIG 0x40000L // konfigurierbar in Toolboxen -#define SFX_SLOT_ACCELCONFIG 0x80000L // konfigurierbar auf Tasten +#define SFX_SLOT_STATUSBARCONFIG 0x10000L // configurable status row +#define SFX_SLOT_MENUCONFIG 0x20000L // configurable Menu +#define SFX_SLOT_TOOLBOXCONFIG 0x40000L // configurable Toolboxen +#define SFX_SLOT_ACCELCONFIG 0x80000L // configurable keys -#define SFX_SLOT_CONTAINER 0x100000L // beim InPlace vom Container bedient -#define SFX_SLOT_READONLYDOC 0x200000L // auch bei readonly-Docs verf"ugbar -#define SFX_SLOT_IMAGEROTATION 0x400000L // bei Vertical/Bidi writing Image drehen -#define SFX_SLOT_IMAGEREFLECTION 0x800000L // bei Vertical/Bidi writing Image spiegeln +#define SFX_SLOT_CONTAINER 0x100000L // Operated by the container at + // InPlace +#define SFX_SLOT_READONLYDOC 0x200000L // also available for + // read-only Documents +#define SFX_SLOT_IMAGEROTATION 0x400000L // Rotate image on Vertical/ + // Bi-directional writing +#define SFX_SLOT_IMAGEREFLECTION 0x800000L // Mirror image on Vertical/ + // Bi-directional writing //-------------------------------------------------------------------- @@ -239,9 +248,9 @@ class SfxPoolItem; struct SfxFormalArgument { - const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse) - const char* pName; // Name des Parameters - sal_uInt16 nSlotId;// Slot-Id zur Identifikation des Parameters + const SfxType* pType; // Type of the parameter (SfxPoolItem subclass) + const char* pName; // Name of the sParameters + sal_uInt16 nSlotId; // Slot-Id for identification of the Parameters const TypeId& Type() const { return pType->aTypeId; } @@ -254,29 +263,30 @@ struct SfxFormalArgument class SfxSlot { public: - sal_uInt16 nSlotId; // in Shell eindeutige Slot-Id - sal_uInt16 nGroupId; // f"ur Konfigurations-Bereich - sal_uIntPtr nHelpId; // i.d.R. == nSlotId - sal_uIntPtr nFlags; // artihm. veroderte Flags - - sal_uInt16 nMasterSlotId; // Enum-Slot bzw. Which-Id - sal_uInt16 nValue; // Wert, falls Enum-Slot - - SfxExecFunc fnExec; // Funktion zum Ausf"uhren - SfxStateFunc fnState; // Funktion f"ur Status - - const SfxType* pType; // SfxPoolItem-Typ (Status) - const char* pName; // Name des Slots - const char* pMethodName; // Name der Method falls anders - - const SfxSlot* pLinkedSlot; // Master-Slot f"ur Enum-Werte - const SfxSlot* pNextSlot; // mit derselben Status-Methode - - const SfxFormalArgument* pFirstArgDef; // erste formale Argument-Definition - sal_uInt16 nArgDefCount; // Anzahl der formalen Argumente - long nDisableFlags; // DisableFlags, die vorhanden sein - // m"ussen, damit der Slot enabled ist - const char* pUnoName; // UnoName des Slots + sal_uInt16 nSlotId; // Unique slot-ID in Shell + sal_uInt16 nGroupId; // for configuration region + sal_uIntPtr nHelpId; // Usually == nSlotId + sal_uIntPtr nFlags; // artihmetic ordered Flags + + sal_uInt16 nMasterSlotId; // Enum-Slot for example Which-Id + sal_uInt16 nValue; // Value, in case of Enum-Slot + + SfxExecFunc fnExec; // Function to be excecuted + SfxStateFunc fnState; // Function for Status + + const SfxType* pType; // SfxPoolItem-Type (Status) + const char* pName; // Name of the Slots + const char* pMethodName; // Name of the Method if different + + const SfxSlot* pLinkedSlot; // Master-Slot for Enum value + const SfxSlot* pNextSlot; // with the same Status-Method + + const SfxFormalArgument* pFirstArgDef; // first formal Argument-Definition + sal_uInt16 nArgDefCount; // Number of formal Argumentents + long nDisableFlags; // DisableFlags that need to be + // present, so that the Slot + // can be enabled + const char* pUnoName; // UnoName for the Slots public: diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx index d97ee529b3c3..23d2444f6722 100644 --- a/sfx2/inc/sfx2/new.hxx +++ b/sfx2/inc/sfx2/new.hxx @@ -82,9 +82,8 @@ public: SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); ~SfxNewFileDialog(); - // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist - // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen - // erfragt werden + // Returns sal_False, when '- No -' is set as Template + // Template names can only be obtained when IsTemplate() returns sal_True. sal_Bool IsTemplate() const; String GetTemplateRegion() const; String GetTemplateName() const; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index a3ad4fbf917c..4ba6c57e1a2b 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -93,7 +93,7 @@ class Point; // From embobj.hxx #define ASPECT_CONTENT 1 -#define ASPECT_THUMBNAIL 2 /* 120 * 120, 6 Farben DIB in MetaFile */ +#define ASPECT_THUMBNAIL 2 /* 120 * 120, 6 Colors DIB in MetaFile */ #define ASPECT_ICON 4 #define ASPECT_DOCPRINT 8 #define ASPECT_ALL (ASPECT_CONTENT | ASPECT_THUMBNAIL | ASPECT_ICON | ASPECT_DOCPRINT) @@ -148,7 +148,7 @@ typedef sal_uInt32 SfxObjectShellFlags; #define SFX_TITLE_CAPTION 5 #define SFX_TITLE_PICKLIST 6 #define SFX_TITLE_HISTORY 7 -#define SFX_TITLE_MAXLEN 10 // ab hier sind das L"angenbegrenzungen +#define SFX_TITLE_MAXLEN 10 // this gives the limits on length #define SFX_LOADED_MAINDOCUMENT 1 #define SFX_LOADED_IMAGES 2 @@ -182,9 +182,9 @@ enum SfxObjectCreateMode /*==================================================================== -Die Klasse SfxObjectShell ist die Basisklasse f"ur SFx-Objekte, also -f"ur Dokumente und Teile von Dokumenten, die als selbst"andige Objekte -in fremde Objekte integriert werden k"onnen. +The class SfxObjectShell is the base class for SFx-objects, ie documents +and parts of documents that can be integrated as separate objects +into foreign objects. ----------------------------------------------------------------------*/ @@ -199,13 +199,15 @@ friend struct ModifyBlocker_Impl; friend class SfxObjectShellLock; private: - struct SfxObjectShell_Impl* pImp; // interne Daten + struct SfxObjectShell_Impl* pImp; // internal data - SfxMedium * pMedium; // Beschreibung der Datei bzw. des Storage, in dem sich das Objekt befindet + SfxMedium * pMedium; // Description of the file for example + // storage that contains the object SfxStyleSheetBasePool* pStyleSheetPool; // StyleSheets - SfxObjectCreateMode eCreateMode; // Zweck des Objekts - sal_Bool bHasName :1, // sal_True := bestehendes Objekt, sal_False := es ist ein neues Objekt - bIsTmp :1; // temp. Storage + SfxObjectCreateMode eCreateMode; // Purpose of the object + sal_Bool bHasName :1, // sal_True := existing object, + // sal_False := new object + bIsTmp :1; // temporary Storage private: SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference< @@ -465,7 +467,7 @@ public: // Naming Interface void SetTitle( const String& rTitle ); String GetTitle( sal_uInt16 nMaxLen = 0 ) const; - void InvalidateName(); // Zuruecksetzen auf unbenannt + void InvalidateName(); // Re-set to unnamed // DDE-Interface virtual long DdeExecute( const String& rCmd ); @@ -482,10 +484,10 @@ public: // Contents virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - void SetStyleSheetPool( SfxStyleSheetBasePool *pBasePool ) { + void SetStyleSheetPool(SfxStyleSheetBasePool *pBasePool ) { pStyleSheetPool = pBasePool; } - //determine the position of the "Automatic" filter in the stylist + // Determine the position of the "Automatic" filter in the stylist void SetAutoStyleFilterIndex(sal_uInt16 nSet); sal_uInt16 GetAutoStyleFilterIndex(); virtual sal_Bool HasBasic() const; @@ -496,7 +498,7 @@ public: GetDialogContainer(); StarBASIC* GetBasic() const; - // Interface Dok-Inhalte, Organizer + // Interface Document content, Organizer #define INDEX_IGNORE USHRT_MAX #define CONTENT_STYLE 0 @@ -550,18 +552,18 @@ public: void ReadNote( INote * ); void UpdateNote( INote * ); - // F"ur Docs, die zum Formatieren die Viewgr"o\se - // ben"otigen + // Documents, for which to format the view size + virtual SfxObjectShell* GetObjectShell(); virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; - // Nur uebergangsweise fuer die Applikationen !!! + // Only temporarily for the applications! void SetBaseModel( SfxBaseModel* pModel ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const; - // Nur uebergangsweise fuer die Applikationen !!! + // Only temporarily for the applications! virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames(); @@ -710,7 +712,7 @@ public: SAL_DLLPRIVATE void ExecView_Impl(SfxRequest &); SAL_DLLPRIVATE void StateView_Impl(SfxItemSet &); - // Laden-speichern public internals + // Load/Save public internals SAL_DLLPRIVATE sal_Bool ImportFromGeneratedStream_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 3141c862db39..9a03eb3afacb 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -48,9 +48,9 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser String aScriptType; SfxMedium* pMedium; - SfxMedium *pDLMedium; // Medium fuer Download von Files + SfxMedium *pDLMedium; // Medium for Download Files - sal_uInt16 nMetaTags; // Anzahl der bisher gelesenen Meta-Tags + sal_uInt16 nMetaTags; // Number of previously read Meta-Tags ScriptType eScriptType; SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* ); @@ -62,9 +62,9 @@ protected: virtual ~SfxHTMLParser(); public: - // Lesen der Optionen einer Image-Map - // <MAP>: sal_True = Image-Map hat einen Namen - // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr + // Read the options of an image map + // <MAP>: sal_True = Image-Map has a name + // <AREA>: sal_True = Image-Map has now one Region more static sal_Bool ParseMapOptions(ImageMap * pImageMap, const HTMLOptions * pOptions ); sal_Bool ParseMapOptions(ImageMap * pImageMap) @@ -83,35 +83,31 @@ public: const String& aNumStr, SvNumberFormatter& rFormatter ); protected: - - // Start eines File-Downloads. Dieser erfolgt synchron oder asynchron. - // Im synchronen Fall befindet sich der Parser nach dem Aufruf im - // Working-Zustand. Die gelesene Datei kann dann direkt mit - // FinishFileDownload abgeholt werden. - // Im asynchronen Fall befindet sich der Parser nach dem Aufruf im - // Pending-Zustand. Der Parser muss dann ueber das Continue verlassen - // werden (ohne Reschedule!). Wenn die Datei geladen ist, wird - // ein Continue mit dem uebergebenen Token aufgerufen. Die Datei kann - // dann wiederum mit FinishFileDownload abgeholt werden. - // Zum Abbrechen des Dwonloads sollte eine Shell uebergeben werden. - // Es kann nur ein einziger Download gleichzeitig existieren. Fuer jeden - // gestarteten Download muss FinshFileDownload aufgerufen werden. + // Start a file download. This is done asynchronously or synchronously. + // In the synchronous case, the parser is in the the working state after + // it has been called. The read file can then be picked up directly with + // FinishFileDownload. In the asynchronous case, the parser is in the + // pending state after it hs been called. The parser then has to leave + // over the Continue (without Reschedule!). If the file is loaded, + // a Continue is called with passed on token. The file can then be picked + // up by FinishFileDownload. To cancel the download should a shell be + // left. It can only exist a single download at the same time, For every + // started download FinshFileDownload must be called. void StartFileDownload( const String& rURL, int nToken, SfxObjectShell *pSh=0 ); - // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn - // der Download geklappt hat. Das gelesene File befindet sich dann in - // dem uebergeben String. + // End of an asynchronous file download. Returns TRUE if the download + // was successful. The read file is then passed into String. sal_Bool FinishFileDownload( String& rStr ); - // Gibt sal_True zurueck, wenn ein File downloaded wurde und - // FileDownloadFinished noch nicht gerufen wurde. + // Returns TRUE if a file was downloaded and if FileDownloadFinished + // has not yet been called sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; } SfxMedium *GetMedium() { return pMedium; } const SfxMedium *GetMedium() const { return pMedium; } - // Default (auch ohne Iterator) ist JavaScript + // Default (without iterator) is JavaScript ScriptType GetScriptType( SvKeyValueIterator* ) const; const String& GetScriptTypeString( SvKeyValueIterator* ) const; }; diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 268c8f9a671f..594c2691d894 100755 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -65,7 +65,7 @@ #define SID_SETUPPRINTER (SID_SFX_START + 302) #define SID_EXITANDRETURN (SID_SFX_START + 303) -// SID_TITLE steht unter diesem Wert in chaos/cntids.hrc!! +// SID_TITLE, this value below is given in chaos/cntids.hrc!! //#define SID_TITLE (SID_SFX_START + 307) #define SID_CONTEXT (SID_SFX_START + 310) @@ -108,7 +108,7 @@ #define SID_PROGFILENAME (SID_SFX_START + 342) #define SID_SELECTION (SID_SFX_START + 346) -// 360-400 siehe SID_MAIL_... +// 360-400 see SID_MAIL_... // default-ids for help #define SID_HELPONHELP (SID_SFX_START + 400) @@ -186,7 +186,7 @@ #define SID_BROWSER (SID_SFX_START + 1318) #define SID_MACROEXECMODE (SID_SFX_START + 1319) -// die Id steht mit diesem Wert in chaos/cntids.hrc!! +// The Id value is given in chaos/cntids.hrc!! //#define SID_INTERNET_ONLINE (SID_SFX_START + 1370) #define SID_FILTER_DATA (SID_SFX_START + 1375) @@ -380,7 +380,7 @@ #define SID_JSCALL (SID_SFX_START + 1382) #define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -// Floating Window Vorlagen +// Floating Window Template #define SID_STYLE_DESIGNER (SID_SFX_START + 539) // Organizer @@ -500,7 +500,7 @@ #define SID_COPY (SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) -// steht unter diesem Wert in chaos/cntids.hrc!!! +// Value below given in chaos/cntids.hrc!!! //#define SID_DELETE (SID_SFX_START + 713) #define SID_BACKSPACE (SID_SFX_START + 714) @@ -583,7 +583,7 @@ #define SID_AUTOHIDE (SID_SFX_START + 932) #define SID_TOGGLENAVBAR (SID_SFX_START + 1603) -// Item-Id f"ur die Ereigniszuweisen-Tabpage +// Item-Id for the assinged event Tabpage #define SID_ATTR_MACROITEM (SID_SFX_START + 934) #define SID_SAVECONFIG (SID_SFX_START + 930) @@ -830,7 +830,7 @@ #define SID_SAVEREL_INET (SID_OPTIONS_START + 30) #define SID_SAVEREL_FSYS (SID_OPTIONS_START + 31) -// Automatisches update von Styles - Verwalten-TabPage +// Automatic update of Styles - manage TabPage #define SID_ATTR_AUTO_STYLE_UPDATE (SID_OPTIONS_START + 65) #define SID_SECURE_URL (SID_OPTIONS_START + 66) @@ -887,7 +887,7 @@ #define FID_SVX_START (SID_LIB_START + 500) #define FID_SEARCH_NOW (FID_SVX_START + 2) -// SlotIds f"ur Basic ------------------------------------------------------- +// SlotIds for Basic ------------------------------------------------------- #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) #define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 ) @@ -938,7 +938,7 @@ #define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 ) #define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 ) -// SlotIds f"ur Apps -------------------------------------------------------- +// SlotIds for Apps -------------------------------------------------------- #define FN_PARAM (SID_SW_START + 1100) #define FN_PARAM_1 (FN_PARAM+60) #define FN_PARAM_2 (FN_PARAM+61) @@ -948,7 +948,7 @@ #define FN_PARAM_6 (FN_PARAM+65) #define FN_PARAM_7 (FN_PARAM+66) #define FN_PARAM_8 (FN_PARAM+67) -#define FN_FAX (SID_SW_START + 28) /* Faxen */ +#define FN_FAX (SID_SW_START + 28) /* Fax */ #define SID_KEYFUNC_START (SID_SC_START + 521) #define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index b97e76c66954..1b933a90778f 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -36,7 +36,6 @@ #include <tools/rtti.hxx> #include <svl/brdcst.hxx> -#include <tools/ownlist.hxx> #include <tools/unqid.hxx> #include <tools/string.hxx> diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index c426476cbf02..fc240fc2f2eb 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -58,7 +58,7 @@ class SfxBindings; #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/ typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Wert +typedef sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; class SfxUs_Impl; @@ -122,9 +122,9 @@ friend class SfxTabDialogController; protected: virtual short Ok(); - // wird im Sfx gel"oscht! + // Is deleted in Sfx! virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); - // wird *nicht* im Sfx gel"oscht! + // Is not deleted in Sfx! virtual const SfxItemSet* GetRefreshedSet(); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual long Notify( NotifyEvent& rNEvt ); @@ -152,18 +152,18 @@ public: void AddTabPage( sal_uInt16 nId, CreateTabPage pCreateFunc, // != 0 - GetTabPageRanges pRangesFunc, // darf 0 sein + GetTabPageRanges pRangesFunc, // can be 0 sal_Bool bItemsOnDemand = sal_False); void AddTabPage( sal_uInt16 nId, const String &rRiderText, CreateTabPage pCreateFunc, // != 0 - GetTabPageRanges pRangesFunc, // darf 0 sein + GetTabPageRanges pRangesFunc, // can be 0 sal_Bool bItemsOnDemand = sal_False, sal_uInt16 nPos = TAB_APPEND); void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, CreateTabPage pCreateFunc, // != 0 - GetTabPageRanges pRangesFunc, // darf 0 sein + GetTabPageRanges pRangesFunc, // can be 0 sal_Bool bItemsOnDemand = sal_False, sal_uInt16 nPos = TAB_APPEND); @@ -185,7 +185,7 @@ public: { return aTabCtrl.GetCurPageId(); } void ShowPage( sal_uInt16 nId ); - // liefert ggf. per Map konvertierte lokale Slots + // may provide local slots converted by Map const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } @@ -284,12 +284,11 @@ public: { bHasExchangeSupport = bNew; } enum sfxpg { - KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln - // 2. F"ullen eines ItemSets f"ur die Aktualilsierung - // "ubergeordneter Beispiele; dieser Pointer kann immer - // NULL sein!! + KEEP_PAGE = 0x0000, // Error handling; page does not change + // 2. Fill an itemset for update + // parent examples, this pointer can be NULL all the time! LEAVE_PAGE = 0x0001, - // Set aktualisieren und andere Page aktualisieren + // Set, refresh and update other Page REFRESH_SET = 0x0002 }; diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 858dafb657a9..cef2730687d5 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -104,9 +104,9 @@ class SfxFrameStatusListener : public svt::FrameStatusListener //------------------------------------------------------------------ -/* FloatingWindows, die aus ToolBoxen abgerissen werden k"onnen, sollten - dieser Klasse abgeleitet werden. Da sie ebenfalls von SfxControllerItem - abgeleitet ist, erhalten ihre Instanzen auch die StateChanged Aufrufe. +/* Floating windows that can be torn from tool boxes should be derived from + this class. Since it is also derived from SfxControllerItem, its instances + will also receive the StateChanged calls. */ class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface @@ -183,14 +183,13 @@ public: static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) -/* F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder - aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass - eine Subclass von SfxTooBoxControl implementiert werden. +/* For special ToolBox controls, such as a font selection box or toolbox + tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl + has to be implemented. - Diese Klasse mu"s in SfxApplication::Init() mit der statischen Methode - RegisterControl() registriert werden. Der SFx erzeugt dann automatisch - diese Controls in ToolBoxen, wenn die dazugeh"origen Slots von dem - angegebenen Typ sind. + This class has to be registered in SfxApplication:Init() with the static + control method RegisterControl(). The SFx then automatically creates these + controls in the toolbox, if the associated slots are of the specific type. */ struct SfxToolBoxControl_Impl; @@ -337,10 +336,10 @@ public: class SfxAppToolBoxControl_Impl : public SfxToolBoxControl -/* [Beschreibung] +/* [Description] - Interne Hilfsklasse f"ur um das Popup-Menu <AppMenu_Impl> unter Neu - im SDT zu starten. + Internal helper class for the pop-up menu <AppMenu_Impl> under new + start in the SDT. */ { diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 135506bc6133..c904e8d1d28e 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -71,7 +71,7 @@ class Dialog; class Menu; class NotifyEvent; -#define SFX_PRINTER_PRINTER 1 // ohne JOBSETUP => temporaer +#define SFX_PRINTER_PRINTER 1 // without JOB SETUP => Temporary #define SFX_PRINTER_JOBSETUP 2 #define SFX_PRINTER_OPTIONS 4 #define SFX_PRINTER_CHG_ORIENTATION 8 @@ -92,7 +92,7 @@ enum SfxScrollingMode SCROLLING_DEFAULT }; -// "Geeicht" mit www.apple.com und Netscape 3.01 +// "Verified" using www.apple.com and Netscape 3.01 #define DEFAULT_MARGIN_WIDTH 8 #define DEFAULT_MARGIN_HEIGHT 12 @@ -100,19 +100,19 @@ enum SfxScrollingMode // @[SfxViewShell-Flags] -#define SFX_VIEW_HAS_PRINTOPTIONS 0x0010 /* Options-Button und Options- - Dialog im PrintDialog */ -#define SFX_VIEW_CAN_PRINT 0x0020 /* enabled Printing ohne Printer - erzeugen zu m"ussen */ -#define SFX_VIEW_NO_SHOW 0x0040 /* Window der ViewShell darf nicht - automatisch geshowed werden */ -#define SFX_VIEW_NO_NEWWINDOW 0x0100 /* keine weitere View erlauben */ +#define SFX_VIEW_HAS_PRINTOPTIONS 0x0010 /* Options-Button and Options- + Dialog in PrintDialog */ +#define SFX_VIEW_CAN_PRINT 0x0020 /* Printing enabled without having + to create a Printer */ +#define SFX_VIEW_NO_SHOW 0x0040 /* Window of the ViewShell shall + not be showed automatically */ +#define SFX_VIEW_NO_NEWWINDOW 0x0100 /* Allow N View */ -/* [Beschreibung] +/* [Description] - Die SfxViewShell-Flags steuern das Verhalten der SfxViewShell f"ur die - Dauer ihrer Lebenszeit. Sie werden im Konstruktor der <SfxViewShell> - angegeben. + The SfxViewShell flags control the behavior of SfxViewShell for the + duration of its lifetime. They are defined in the constructor of + <SfxViewShell>. */ //========================================================================= @@ -186,7 +186,7 @@ public: static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController ); - // Ctoren/Dtoren Initialisierung + // Initialize Constructors/Destructors TYPEINFO(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH) @@ -208,7 +208,7 @@ public: virtual void JumpToMark( const String& rMark ); void VisAreaChanged(const Rectangle& rRect); - // Verhaltens-Flags + // Behavior Flags SfxScrollingMode GetScrollingMode() const; void SetScrollingMode( SfxScrollingMode eMode ); @@ -250,7 +250,7 @@ public: virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; - // Workingset + // Working set virtual void WriteUserData( String&, sal_Bool bBrowse = sal_False ); virtual void ReadUserData( const String&, sal_Bool bBrowse = sal_False ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -338,19 +338,18 @@ public: inline void SfxViewShell::LostFocus() const -/* [Beschreibung] +/* [Description] - Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn - das Edit-Window den Focus verloren hat. Der SFx hat so z.B. die - M"oglichkeit, den Accelerator auszuschalten, damit in bestimmten - Floating-Windows die Cursor-Tasten, die Delete-Taste etc. funktionieren, - obwohl sie "uber den Accelerator umdefiniert sind. + This method has to be called by the application developer, if the edit + window has lost the focus. The SFx has for example the ability to turn off + the accelerator, so that the cursor keys, the Delete button, etc. work in + certain Floating-Windows, even though they are redefined by the + Accelerator. + [Note] - [Anmerkung] - - <StarView> liefert leider keine M"oglichkeit, solche Events - 'von der Seite' einzuh"angen. + <StarView> unfortunatly does not provide the possibility to define + such events 'from the side'. */ { @@ -360,16 +359,14 @@ inline void SfxViewShell::LostFocus() const inline SfxViewFrame* SfxViewShell::GetViewFrame() const -/* [Bechreibung] - - Diese Methode liefert einen Pointer auf die <SfxViewFrame>-Instanz, - in der diese SfxViewShell dargestellt wird. Dieses ist die Instanz, - die imKonstruktor durchgereicht wurde. Es ist gew"ahrleistet, da\s - der zur"uckgegebene Pointer auf eine g"ultige SfxViewFrame-Instanz - zeigt. +/* [Description] + This method returns a pointer to the <SfxViewFrame> Instance in which + this SfxViewShell is displayed. This is the instance that was passed + on in the constructor. It is guaranteed that the returned pointer + points on the valid SfxViewFrame instance. - [Querverweise] + [Cross-reference] <SfxShell::GetFrame()const> */ diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index f37530aba726..c64cd7022e25 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -781,6 +781,7 @@ public class UndoManager m_currentTestCase.doSingleModification(); assertEquals( "when the Undo manager is locked, no implicit additions should happen", 0, m_undoListener.getUndoActionsAdded() ); + assertTrue( "Undo manager gets unlocked as a side effect of performing a simple operation", i_undoManager.isLocked() ); i_undoManager.unlock(); assertEquals( "unlock is not expected to add collected actions - they should be discarded", 0, m_undoListener.getUndoActionsAdded() ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b954e9f5e7a9..c69b3939ee99 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -121,7 +121,7 @@ #include <sfx2/mnuitem.hxx> #endif -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) #define DDE_AVAILABLE #endif @@ -147,125 +147,119 @@ #include <framework/addonsoptions.hxx> #include <svtools/ttprops.hxx> #include <unotools/extendedsecurityoptions.hxx> +#include <rtl/instance.hxx> using namespace ::com::sun::star; // Static member SfxApplication* SfxApplication::pApp = NULL; static BasicDLL* pBasic = NULL; +static SfxHelp* pSfxHelp = NULL; -class SfxPropertyHandler : public PropertyHandler +namespace { - virtual void Property( ApplicationProperty& ); -}; - -static SfxPropertyHandler* pPropertyHandler = 0; - -SfxPropertyHandler* GetOrCreatePropertyHandler() -{ - if ( !pPropertyHandler ) + class SfxPropertyHandler : public PropertyHandler { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pPropertyHandler ) - pPropertyHandler = new SfxPropertyHandler; - } - - return pPropertyHandler; -} + virtual void Property( ApplicationProperty& ); + }; -void SfxPropertyHandler::Property( ApplicationProperty& rProp ) -{ - TTProperties* pTTProperties = PTR_CAST( TTProperties, &rProp ); - if ( pTTProperties ) + void SfxPropertyHandler::Property( ApplicationProperty& rProp ) { - pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION; - switch ( pTTProperties->nActualPR ) + TTProperties* pTTProperties = PTR_CAST( TTProperties, &rProp ); + if ( pTTProperties ) { - case TT_PR_SLOTS: + pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION; + switch ( pTTProperties->nActualPR ) { - pTTProperties->nSidOpenUrl = SID_OPENURL; - pTTProperties->nSidFileName = SID_FILE_NAME; - pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT; - pTTProperties->nSidCopy = SID_COPY; - pTTProperties->nSidPaste = SID_PASTE; - pTTProperties->nSidSourceView = SID_SOURCEVIEW; - pTTProperties->nSidSelectAll = SID_SELECTALL; - pTTProperties->nSidReferer = SID_REFERER; - pTTProperties->nActualPR = 0; - } - break; - case TT_PR_DISPATCHER: - { - // interface for TestTool - SfxViewFrame* pViewFrame=0; - SfxDispatcher* pDispatcher=0; - pViewFrame = SfxViewFrame::Current(); - if ( !pViewFrame ) - pViewFrame = SfxViewFrame::GetFirst(); - if ( pViewFrame ) - pDispatcher = pViewFrame->GetDispatcher(); - else - pDispatcher = NULL; - if ( !pDispatcher ) - pTTProperties->nActualPR = TT_PR_ERR_NODISPATCHER; - else + case TT_PR_SLOTS: + { + pTTProperties->nSidOpenUrl = SID_OPENURL; + pTTProperties->nSidFileName = SID_FILE_NAME; + pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT; + pTTProperties->nSidCopy = SID_COPY; + pTTProperties->nSidPaste = SID_PASTE; + pTTProperties->nSidSourceView = SID_SOURCEVIEW; + pTTProperties->nSidSelectAll = SID_SELECTALL; + pTTProperties->nSidReferer = SID_REFERER; + pTTProperties->nActualPR = 0; + } + break; + case TT_PR_DISPATCHER: { - pDispatcher->SetExecuteMode(EXECUTEMODE_DIALOGASYNCHRON); - if ( pTTProperties->mnSID == SID_NEWDOCDIRECT - || pTTProperties->mnSID == SID_OPENDOC ) + // interface for TestTool + SfxViewFrame* pViewFrame=0; + SfxDispatcher* pDispatcher=0; + pViewFrame = SfxViewFrame::Current(); + if ( !pViewFrame ) + pViewFrame = SfxViewFrame::GetFirst(); + if ( pViewFrame ) + pDispatcher = pViewFrame->GetDispatcher(); + else + pDispatcher = NULL; + if ( !pDispatcher ) + pTTProperties->nActualPR = TT_PR_ERR_NODISPATCHER; + else { - SfxPoolItem** pArgs = pTTProperties->mppArgs; - SfxAllItemSet aSet( SFX_APP()->GetPool() ); - if ( pArgs && *pArgs ) + pDispatcher->SetExecuteMode(EXECUTEMODE_DIALOGASYNCHRON); + if ( pTTProperties->mnSID == SID_NEWDOCDIRECT + || pTTProperties->mnSID == SID_OPENDOC ) { - for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg ) - aSet.Put( **pArg ); - } - if ( pTTProperties->mnSID == SID_NEWDOCDIRECT ) - { - String aFactory = String::CreateFromAscii("private:factory/"); + SfxPoolItem** pArgs = pTTProperties->mppArgs; + SfxAllItemSet aSet( SFX_APP()->GetPool() ); if ( pArgs && *pArgs ) { - SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False ); - if ( pFactoryName ) - aFactory += pFactoryName->GetValue(); + for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg ) + aSet.Put( **pArg ); + } + if ( pTTProperties->mnSID == SID_NEWDOCDIRECT ) + { + String aFactory = String::CreateFromAscii("private:factory/"); + if ( pArgs && *pArgs ) + { + SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False ); + if ( pFactoryName ) + aFactory += pFactoryName->GetValue(); + else + aFactory += String::CreateFromAscii("swriter"); + } else aFactory += String::CreateFromAscii("swriter"); + + aSet.Put( SfxStringItem( SID_FILE_NAME, aFactory ) ); + aSet.ClearItem( SID_NEWDOCDIRECT ); + pTTProperties->mnSID = SID_OPENDOC; } - else - aFactory += String::CreateFromAscii("swriter"); - aSet.Put( SfxStringItem( SID_FILE_NAME, aFactory ) ); - aSet.ClearItem( SID_NEWDOCDIRECT ); - pTTProperties->mnSID = SID_OPENDOC; + aSet.Put( SfxStringItem( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") ) ); + if ( pDispatcher->ExecuteFunction( pTTProperties->mnSID, aSet, pTTProperties->mnMode ) + == EXECUTE_NO ) + pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE; + else + pTTProperties->nActualPR = 0; } - - aSet.Put( SfxStringItem( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") ) ); - if ( pDispatcher->ExecuteFunction( pTTProperties->mnSID, aSet, pTTProperties->mnMode ) - == EXECUTE_NO ) - pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE; else - pTTProperties->nActualPR = 0; - } - else - { - if ( pDispatcher->ExecuteFunction( - pTTProperties->mnSID, pTTProperties->mppArgs, pTTProperties->mnMode ) - == EXECUTE_NO ) - pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE; - else - pTTProperties->nActualPR = 0; + { + if ( pDispatcher->ExecuteFunction( + pTTProperties->mnSID, pTTProperties->mppArgs, pTTProperties->mnMode ) + == EXECUTE_NO ) + pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE; + else + pTTProperties->nActualPR = 0; + } } } + break; + default: + { + pTTProperties->nPropertyVersion = 0; + } } - break; - default: - { - pTTProperties->nPropertyVersion = 0; - } + return; } - return; } + + class thePropertyHandler + : public rtl::Static<SfxPropertyHandler, thePropertyHandler> {}; } #include <framework/imageproducer.hxx> @@ -305,7 +299,6 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel ); - SfxHelp* pSfxHelp = new SfxHelp; Application::SetHelp( pSfxHelp ); if ( SvtHelpOptions().IsHelpTips() ) Help::EnableQuickHelp(); @@ -325,12 +318,11 @@ SfxApplication::SfxApplication() RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SfxApplication" ); SetName( DEFINE_CONST_UNICODE("StarOffice") ); - GetpApp()->SetPropertyHandler( GetOrCreatePropertyHandler() ); + GetpApp()->SetPropertyHandler( &thePropertyHandler::get() ); SvtViewOptions::AcquireOptions(); pAppData_Impl = new SfxAppData_Impl( this ); - pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() ); pAppData_Impl->m_xImeStatusWindow->init(); pApp->PreInit(); @@ -352,6 +344,8 @@ SfxApplication::SfxApplication() #endif #endif + pSfxHelp = new SfxHelp; + pBasic = new BasicDLL; StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" ); @@ -365,6 +359,9 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); + delete pSfxHelp; + Application::SetHelp( NULL ); + // delete global options SvtViewOptions::ReleaseOptions(); delete pBasic; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 4d0454bf90bb..7c399b32ad2c 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -384,23 +384,14 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) { ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs(); - List aList; + std::vector<String> aList; sal_uInt32 nCount = seqURLs.getLength(); sal_uInt32 nURL; for( nURL=0; nURL<nCount; ++nURL ) - { - aList.Insert( new String( seqURLs[nURL] ), LIST_APPEND ); - } - if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), - &aList ) ) ) - { + aList.push_back(seqURLs[nURL]); + + if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), &aList ) ) ) bRet = sal_False; - } - for( nURL=0; nURL<nCount; ++nURL ) - { - delete (String*)aList.GetObject(nURL); - } - aList.Clear(); } } break; @@ -774,13 +765,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) DELETEZ(pAppData_Impl->pSecureURLs); DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected"); - const List *pList = ((SfxStringListItem*)pItem)->GetList(); - sal_uInt32 nCount = pList->Count(); + const std::vector<String> &aList = ((SfxStringListItem*)pItem)->GetList(); + sal_uInt32 nCount = aList.size(); ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs(nCount); for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition) - { - seqURLs[nPosition] = *(const String*)(pList->GetObject(nPosition)); - } + seqURLs[nPosition] = aList[nPosition]; + aSecurityOptions.SetSecureURLs( seqURLs ); } diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index bd3c1b3f846b..3838526a9eb1 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -151,20 +151,6 @@ SfxAppData_Impl::~SfxAppData_Impl() delete pBasMgrListener; } -void SfxAppData_Impl::UpdateApplicationSettings( sal_Bool bDontHide ) -{ - AllSettings aAllSet = Application::GetSettings(); - StyleSettings aStyleSet = aAllSet.GetStyleSettings(); - sal_uInt32 nStyleOptions = aStyleSet.GetOptions(); - if ( bDontHide ) - nStyleOptions &= ~STYLE_OPTION_HIDEDISABLED; - else - nStyleOptions |= STYLE_OPTION_HIDEDISABLED; - aStyleSet.SetOptions( nStyleOptions ); - aAllSet.SetStyleSettings( aStyleSet ); - Application::SetSettings( aAllSet ); -} - SfxDocumentTemplates* SfxAppData_Impl::GetDocumentTemplates() { if ( !pTemplates ) diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index c52009fb4ffb..4f4f3a1ebe6a 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -255,17 +255,18 @@ bool SfxApplication::Initialize_Impl() #ifdef DBG_UTIL // The SimplerErrorHandler is for debugging. In the Product errors // not processed are given to SFX as Errorcode 1. - new SimpleErrorHandler; + pAppData_Impl->m_pSimpleErrorHdl = new SimpleErrorHandler; #endif + pAppData_Impl->m_pToolsErrorHdl = new SfxErrorHandler( + RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1); + pAppData_Impl->pBasicResMgr = CreateResManager("sb"); pAppData_Impl->pSvtResMgr = CreateResManager("svt"); - new SfxErrorHandler( RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1 ); - new SfxErrorHandler( RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr ); - new SfxErrorHandler( RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr ); - - // diverse Pointer - SfxPickList::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) ); + pAppData_Impl->m_pSoErrorHdl = new SfxErrorHandler( + RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr ); + pAppData_Impl->m_pSbxErrorHdl = new SfxErrorHandler( + RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr ); DBG_ASSERT( !pAppData_Impl->pAppDispat, "AppDispatcher already exists" ); pAppData_Impl->pAppDispat = new SfxDispatcher((SfxDispatcher*)0); diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 93abf1c813f8..8233ae0b5dd8 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -296,8 +296,8 @@ static bool impl_loadBitmap( // Use graphic class to also support more graphic formats (bmp,png,...) Graphic aGraphic; - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW ); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); + rGF.ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW ); // Default case, we load the intro bitmap from a seperate file // (e.g. staroffice_intro.bmp or starsuite_intro.bmp) diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index fa5d2c8356d2..c8f3cb7c11d8 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -154,8 +154,17 @@ void SfxApplication::Deinitialize() //TODO/CLEANTUP //ReleaseArgs could be used instead! pAppData_Impl->pPool = NULL; + NoChaos::ReleaseItemPool(); + DELETEZ(pAppData_Impl->pBasicResMgr); DELETEZ(pAppData_Impl->pSvtResMgr); + + delete pAppData_Impl->m_pSbxErrorHdl; + delete pAppData_Impl->m_pSoErrorHdl; + delete pAppData_Impl->m_pToolsErrorHdl; +#ifdef DBG_UTIL + delete pAppData_Impl->m_pSimpleErrorHdl; +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index a3eb43bd6f9b..95d32df52f1a 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -189,7 +189,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, break; default: - if( aGrf.GetGDIMetaFile().GetActionCount() ) + if( aGrf.GetGDIMetaFile().GetActionSize() ) { GDIMetaFile aMeta( aGrf.GetGDIMetaFile() ); aMeta.Write( aMemStm ); @@ -313,10 +313,10 @@ sal_Bool SvFileObject::LoadFile_Impl() sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) { - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - const sal_uInt16 nFilter = sFilter.Len() && pGF->GetImportFormatCount() - ? pGF->GetImportFormatNumber( sFilter ) + const sal_uInt16 nFilter = sFilter.Len() && rGF.GetImportFormatCount() + ? rGF.GetImportFormatNumber( sFilter ) : GRFILTER_FORMAT_DONTKNOW; String aEmptyStr; @@ -329,16 +329,16 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) if( !pStream ) nRes = xMed.Is() ? GRFILTER_OPENERROR - : pGF->ImportGraphic( rGrf, INetURLObject(sFileNm), + : rGF.ImportGraphic( rGrf, INetURLObject(sFileNm), nFilter ); else if( !pDownLoadData ) { pStream->Seek( STREAM_SEEK_TO_BEGIN ); - nRes = pGF->ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter ); + nRes = rGF.ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter ); } else { - nRes = pGF->ImportGraphic( pDownLoadData->aGrf, aEmptyStr, + nRes = rGF.ImportGraphic( pDownLoadData->aGrf, aEmptyStr, *pStream, nFilter ); if( pDownLoadData ) diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 092ace28428b..ca1f2c3592cb 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -53,6 +53,44 @@ #include "vcl/svapp.hxx" #include "osl/mutex.hxx" +//TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver +class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star::beans::XPropertyChangeListener> +{ + private: + com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener> mxOwner; + + public: + WeakPropertyChangeListener(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner) + : mxOwner(xOwner) + { + } + + virtual ~WeakPropertyChangeListener() + { + } + + virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent &rEvent ) + throw(com::sun::star::uno::RuntimeException) + { + com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), + com::sun::star::uno::UNO_QUERY); + if (xOwner.is()) + xOwner->propertyChange(rEvent); + + } + + // lang.XEventListener + virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) + throw(com::sun::star::uno::RuntimeException) + { + com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), + com::sun::star::uno::UNO_QUERY); + if (xOwner.is()) + xOwner->disposing(rEvent); + + } +}; + namespace css = com::sun::star; using sfx2::appl::ImeStatusWindow; @@ -133,13 +171,13 @@ bool ImeStatusWindow::canToggle() const ImeStatusWindow::~ImeStatusWindow() { - if (m_xConfig.is()) + if (m_xConfig.is() && m_xConfigListener.is()) // We should never get here, but just in case... try { m_xConfig->removePropertyChangeListener( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), - this); + m_xConfigListener); } catch (css::uno::Exception &) { @@ -221,12 +259,15 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() xConfig = m_xConfig; } if (bAdd) + { // Exceptions here could be handled individually, to support graceful // degradation (no update notification mechanism in this case---but also // no dispose notifications): + m_xConfigListener = new WeakPropertyChangeListener(this); xConfig->addPropertyChangeListener( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), - this); + m_xConfigListener); + } return xConfig; } diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index 184cdc721a6b..a0a350ce6809 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -118,6 +118,8 @@ private: osl::Mutex m_aMutex; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > m_xConfig; + com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > + m_xConfigListener; bool m_bDisposed; }; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 598b08988cbb..0f2488cfe3d5 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -160,6 +160,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType ) //-------------------------------------------------------------------------- SvBaseLink::SvBaseLink( const String& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj ) + : pImpl(0) { bVisible = bSynchron = bUseCache = sal_True; bWasLastEditOK = sal_False; @@ -209,6 +210,7 @@ SvBaseLink::~SvBaseLink() } delete pImplData; + delete pImpl; } IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName ) @@ -625,14 +627,14 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pItemStt ) *pItemStt = nTokenPos; - DdeTopics& rTopics = pService->GetTopics(); + std::vector<DdeTopic*>& rTopics = pService->GetTopics(); for( int i = 0; i < 2; ++i ) { - for( DdeTopic* pTopic = rTopics.First(); pTopic; - pTopic = rTopics.Next() ) - if( pTopic->GetName() == sTopic ) - return pTopic; + for( std::vector<DdeTopic*>::iterator iterTopic = rTopics.begin(); + iterTopic != rTopics.end(); ++iterTopic ) + if( (*iterTopic)->GetName() == sTopic ) + return *iterTopic; // Topic not found? // then we try once to create it diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 62e7f0547808..8048e4b85a55 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -357,10 +357,11 @@ void SfxModule::DestroyModules_Impl() { SfxModuleArr_Impl& rModules = *pModules; for( sal_uInt16 nPos = rModules.Count(); nPos--; ) - { - SfxModule* pMod = rModules.GetObject(nPos); - delete pMod; - } + { + SfxModule* pMod = rModules.GetObject(nPos); + delete pMod; + } + delete pModules, pModules = 0; } } diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 0eb111dae184..25d9857c53c4 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -127,12 +127,12 @@ short SvxOpenGraphicDialog::Execute() { if( GetPath().Len() ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aObj( GetPath() ); // check whether we can load the graphic String aCurFilter( GetCurrentFilter() ); - sal_uInt16 nFormatNum = pFilter->GetImportFormatNumber( aCurFilter ); + sal_uInt16 nFormatNum = rFilter.GetImportFormatNumber( aCurFilter ); sal_uInt16 nRetFormat = 0; sal_uInt16 nFound = USHRT_MAX; @@ -144,23 +144,23 @@ short SvxOpenGraphicDialog::Execute() SvStream* pStream = aMed.GetInStream(); if( pStream ) - nImpRet = pFilter->CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, nFormatNum, &nRetFormat ); + nImpRet = rFilter.CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, nFormatNum, &nRetFormat ); else - nImpRet = pFilter->CanImportGraphic( aObj, nFormatNum, &nRetFormat ); + nImpRet = rFilter.CanImportGraphic( aObj, nFormatNum, &nRetFormat ); if ( GRFILTER_OK != nImpRet ) { if ( !pStream ) - nImpRet = pFilter->CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat ); + nImpRet = rFilter.CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat ); else - nImpRet = pFilter->CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, + nImpRet = rFilter.CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, GRFILTER_FORMAT_DONTKNOW, &nRetFormat ); } } else { - if( (nImpRet=pFilter->CanImportGraphic( aObj, nFormatNum, &nRetFormat )) != GRFILTER_OK ) - nImpRet = pFilter->CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat ); + if( (nImpRet=rFilter.CanImportGraphic( aObj, nFormatNum, &nRetFormat )) != GRFILTER_OK ) + nImpRet = rFilter.CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat ); } if ( GRFILTER_OK == nImpRet ) @@ -175,9 +175,9 @@ short SvxOpenGraphicDialog::Execute() else { // setup appropriate filter (so next time, it will work) - if( pFilter->GetImportFormatCount() ) + if( rFilter.GetImportFormatCount() ) { - String aFormatName(pFilter->GetImportFormatName(nFound)); + String aFormatName(rFilter.GetImportFormatName(nFound)); SetCurrentFilter(aFormatName); } @@ -211,7 +211,7 @@ void SvxOpenGraphicDialog::EnableLink( sal_Bool state ) { mpImpl->xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, state ); } - catch(IllegalArgumentException) + catch(const IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot enable \"link\" checkbox" ); @@ -230,7 +230,7 @@ void SvxOpenGraphicDialog::AsLink(sal_Bool bState) Any aAny; aAny <<= bState; mpImpl->xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aAny ); } - catch(IllegalArgumentException) + catch(const IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot check \"link\" checkbox" ); @@ -251,7 +251,7 @@ sal_Bool SvxOpenGraphicDialog::IsAsLink() const return aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_False; } } - catch(IllegalArgumentException) + catch(const IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot access \"link\" checkbox" ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 6ab161be9f33..09f9abfd1e01 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -788,7 +788,7 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S if ( rURL.Search( sHelpIdScheme ) != 0 ) sKeyword = ::rtl::OUString( rURL ); - if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { // no help found -> try with parent help id. Window* pParent = pWindow->GetParent(); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 727241fd299e..ed4c98638440 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -58,6 +58,8 @@ #include "objshimp.hxx" #include <sfx2/docfilt.hxx> +#include <rtl/instance.hxx> + #include <algorithm> // ---------------------------------------------------------------------------- @@ -68,7 +70,6 @@ using namespace ::com::sun::star::util; // ---------------------------------------------------------------------------- -osl::Mutex* SfxPickList::pMutex = 0; SfxPickList* SfxPickList::pUniqueInstance = 0; // ---------------------------------------------------------------------------- @@ -87,20 +88,6 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > } }; -// ---------------------------------------------------------------------------- - -osl::Mutex* SfxPickList::GetOrCreateMutex() -{ - if ( !pMutex ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pMutex ) - pMutex = new osl::Mutex; - } - - return pMutex; -} - void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURLString, sal_uInt32 nNo ) { String aPickEntry; @@ -159,9 +146,15 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons pMenu->SetAccessibleName( nItemId, aAccessibleName ); } +namespace +{ + class thePickListMutex + : public rtl::Static<osl::Mutex, thePickListMutex> {}; +} + void SfxPickList::RemovePickListEntries() { - ::osl::MutexGuard aGuard( GetOrCreateMutex() ); + ::osl::MutexGuard aGuard( thePickListMutex::get() ); for ( sal_uInt32 i = 0; i < m_aPicklistVector.size(); i++ ) delete m_aPicklistVector[i]; m_aPicklistVector.clear(); @@ -177,28 +170,10 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex ) return 0; } -SfxPickList* SfxPickList::GetOrCreate( const sal_uInt32 nMenuSize ) +SfxPickList& SfxPickList::Get() { - if ( !pUniqueInstance ) - { - ::osl::MutexGuard aGuard( GetOrCreateMutex() ); - if ( !pUniqueInstance ) - pUniqueInstance = new SfxPickList( nMenuSize ); - } - - return pUniqueInstance; -} - -SfxPickList* SfxPickList::Get() -{ - ::osl::MutexGuard aGuard( GetOrCreateMutex() ); - return pUniqueInstance; -} - -void SfxPickList::Delete() -{ - ::osl::MutexGuard aGuard( GetOrCreateMutex() ); - DELETEZ( pUniqueInstance ); + static SfxPickList aUniqueInstance(SvtHistoryOptions().GetSize(ePICKLIST)); + return aUniqueInstance; } SfxPickList::SfxPickList( sal_uInt32 nAllowedMenuSize ) : @@ -265,9 +240,9 @@ void SfxPickList::CreatePickListEntries() void SfxPickList::CreateMenuEntries( Menu* pMenu ) { - static sal_Bool bPickListMenuInitializing = sal_False; + ::osl::MutexGuard aGuard( thePickListMutex::get() ); - ::osl::MutexGuard aGuard( GetOrCreateMutex() ); + static sal_Bool bPickListMenuInitializing = sal_False; if ( bPickListMenuInitializing ) // method is not reentrant! return; @@ -300,9 +275,9 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu ) void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) { - ::osl::ClearableMutexGuard aGuard( GetOrCreateMutex() ); + ::osl::ClearableMutexGuard aGuard( thePickListMutex::get() ); - PickListEntry *pPick = SfxPickList::Get()->GetPickListEntry( nIndex ); + PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex ); if ( pPick ) { @@ -334,7 +309,7 @@ void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId ) String SfxPickList::GetMenuEntryTitle( sal_uInt32 nIndex ) { - PickListEntry *pPick = SfxPickList::Get()->GetPickListEntry( nIndex ); + PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex ); if ( pPick ) return pPick->aTitle; diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index abbcc16e388f..dd55835fb958 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -727,19 +727,6 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : /* Create a sub-classed instance - foo */ ShutdownIcon::pShutdownIcon = this; initSystray(); -#ifdef OS2 - // above win32 starts the quickstart thread, but we have - // quickstart running only when -quickstart is specified - // on command line (next boot). - // so if -quickstart was not specified, we cannot issue - // quickstart veto on shutdown. - if (bQuickstart) - { - // disable shutdown - ShutdownIcon::getInstance()->SetVeto( true ); - ShutdownIcon::getInstance()->addTerminateListener(); - } -#endif } catch(const ::com::sun::star::lang::IllegalArgumentException&) { @@ -774,8 +761,6 @@ void ShutdownIcon::LeaveModalMode() #ifdef WNT // defined in shutdowniconw32.cxx -#elif defined(OS2) -// defined in shutdowniconOs2.cxx #elif defined QUARTZ // defined in shutdowniconaqua.cxx #else @@ -856,9 +841,7 @@ rtl::OUString ShutdownIcon::getShortcutName() bool ShutdownIcon::GetAutostart( ) { -#if defined(OS2) - return GetAutostartOs2( ); -#elif defined QUARTZ +#if defined QUARTZ return true; #else bool bRet = false; @@ -925,8 +908,6 @@ void ShutdownIcon::SetAutostart( bool bActivate ) } #endif } -#elif defined OS2 - SetAutostartOs2( bActivate ); #else (void)bActivate; // unused variable #endif // ENABLE_QUICKSTART_APPLET diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index 7ce6c1e8918d..d9e6e17bf802 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -149,10 +149,6 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static void EnableAutostartW32( const rtl::OUString &aShortcutName ); static rtl::OUString GetAutostartFolderNameW32(); #endif -#ifdef OS2 - static void SetAutostartOs2( bool bActivate ); - static bool GetAutostartOs2( ); -#endif }; extern "C" { diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index d8c33ecbb67a..5e70016d1ff1 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -90,10 +90,10 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId ) Bitmap pInSalBitmap = aIcon.GetBitmap(); AlphaMask pInSalAlpha = aIcon.GetAlpha(); - BitmapReadAccess* pSalBitmap = pInSalBitmap.AcquireReadAccess(); - BitmapReadAccess* pSalAlpha = pInSalAlpha.AcquireReadAccess(); + Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap); + AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha); - g_return_val_if_fail( pSalBitmap != NULL, NULL ); + g_return_val_if_fail( pSalBitmap, NULL ); Size aSize( pSalBitmap->Width(), pSalBitmap->Height() ); if (pSalAlpha) @@ -123,10 +123,6 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId ) } } - pInSalBitmap.ReleaseAccess( pSalBitmap ); - if( pSalAlpha ) - pInSalAlpha.ReleaseAccess( pSalAlpha ); - return gdk_pixbuf_new_from_data( pPixbufData, GDK_COLORSPACE_RGB, sal_True, 8, aSize.Width(), aSize.Height(), diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 6e734f523c19..5d2042eca984 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -130,29 +130,6 @@ typedef struct tagMYITEM // ------------------------------- -static bool isNT() -{ - static bool bInitialized = false; - static bool bWnt = false; - - if( !bInitialized ) - { - bInitialized = true; - - OSVERSIONINFO aVerInfo; - aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo ); - if ( GetVersionEx( &aVerInfo ) ) - { - if ( aVerInfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) - bWnt = true; - } - } - return bWnt; -} - - -// ------------------------------- - static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw, const OUString& module ) { MENUITEMINFOW mi; @@ -889,22 +866,7 @@ static bool FileExistsW( LPCWSTR lpPath ) bool ShutdownIcon::IsQuickstarterInstalled() { wchar_t aPath[_MAX_PATH]; - if( isNT() ) - { - GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); - } - else - { - char szPathA[_MAX_PATH]; - GetModuleFileNameA( NULL, szPathA, _MAX_PATH-1); - - // calc the string wcstr len - int nNeededWStrBuffSize = MultiByteToWideChar( CP_ACP, 0, szPathA, -1, NULL, 0 ); - - // copy the string if necessary - if ( nNeededWStrBuffSize > 0 ) - MultiByteToWideChar( CP_ACP, 0, szPathA, -1, aPath, nNeededWStrBuffSize ); - } + GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); OUString aOfficepath( reinterpret_cast<const sal_Unicode*>(aPath) ); int i = aOfficepath.lastIndexOf((sal_Char) '\\'); @@ -920,20 +882,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut ) { wchar_t aPath[_MAX_PATH]; - if( isNT() ) - GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); - else - { - char szPathA[_MAX_PATH]; - GetModuleFileNameA( NULL, szPathA, _MAX_PATH-1); - - // calc the string wcstr len - int nNeededWStrBuffSize = MultiByteToWideChar( CP_ACP, 0, szPathA, -1, NULL, 0 ); - - // copy the string if necessary - if ( nNeededWStrBuffSize > 0 ) - MultiByteToWideChar( CP_ACP, 0, szPathA, -1, aPath, nNeededWStrBuffSize ); - } + GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); OUString aOfficepath( reinterpret_cast<const sal_Unicode*>(aPath) ); int i = aOfficepath.lastIndexOf((sal_Char) '\\'); diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index 1a462c8133e2..6dead7468b30 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -228,8 +228,8 @@ BitSet& BitSet::operator=( sal_uInt16 nBit ) sal_uIntPtr nBitVal = 1L << (nBit % 32); nCount = 1; - pBitmap = new sal_uIntPtr[nBlocks]; - memset( pBitmap + nBlocks, 0, 4 * nBlocks ); + pBitmap = new sal_uIntPtr[nBlocks + 1]; + memset( pBitmap, 0, 4 * (nBlocks + 1) ); *(pBitmap+nBlocks) = nBitVal; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 533320e64acd..348399b34a6a 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -92,6 +92,7 @@ #include <tools/urlobj.hxx> #include <rtl/logfile.hxx> +#include <rtl/instance.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -122,13 +123,21 @@ using namespace ::com::sun::star::beans; #include <sfx2/appuno.hxx> #include <sfx2/viewfrm.hxx> +#include <boost/ptr_container/ptr_vector.hpp> +#include <functional> + +namespace +{ + class theSfxFilterListener : public rtl::Static<SfxFilterListener, theSfxFilterListener> {}; +} + static SfxFilterList_Impl* pFilterArr = 0; static sal_Bool bFirstRead = sal_True; static void CreateFilterArr() { pFilterArr = new SfxFilterList_Impl; - new SfxFilterListener(); + theSfxFilterListener::get(); } //---------------------------------------------------------------- @@ -182,6 +191,7 @@ SfxFilterContainer::SfxFilterContainer( const String& rName ) SfxFilterContainer::~SfxFilterContainer() { + delete pImpl; } //---------------------------------------------------------------- @@ -248,9 +258,6 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName //---------------------------------------------------------------- -class SfxFilterMatcherArr_Impl; -static SfxFilterMatcherArr_Impl* pImplArr = 0; - // Impl-Data is shared between all FilterMatchers of the same factory class SfxFilterMatcher_Impl { @@ -258,52 +265,75 @@ public: ::rtl::OUString aName; SfxFilterList_Impl* pList; // is created on demand - void InitForIterating() const; - void Update(); - SfxFilterMatcher_Impl() - : pList(0) - {} + void InitForIterating() const; + void Update(); + SfxFilterMatcher_Impl(const ::rtl::OUString &rName) + : aName(rName) + , pList(0) + { + } }; -DECL_PTRARRAY( SfxFilterMatcherArr_Impl, SfxFilterMatcher_Impl*, 2, 2 ) - -SfxFilterMatcher::SfxFilterMatcher( const String& rName ) - : pImpl( 0 ) +namespace { - if ( !pImplArr ) - // keep track of created filter matchers to recycle the FilterLists - pImplArr = new SfxFilterMatcherArr_Impl; + typedef boost::ptr_vector<SfxFilterMatcher_Impl> SfxFilterMatcherArr_Impl; + static SfxFilterMatcherArr_Impl aImplArr; + static int nSfxFilterMatcherCount; - String aName = SfxObjectShell::GetServiceNameFromFactory( rName ); - DBG_ASSERT(aName.Len(), "Found boes type :-)"); - for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ ) + class hasName : + public std::unary_function<SfxFilterMatcher_Impl, bool> { - // find the impl-Data of any comparable FilterMatcher that was created before - SfxFilterMatcher_Impl* pImp = pImplArr->GetObject(n); - if ( String(pImp->aName) == aName ) - pImpl = pImp; - } + private: + const rtl::OUString& mrName; + public: + hasName(const rtl::OUString &rName) : mrName(rName) {} + bool operator() (const SfxFilterMatcher_Impl& rImpl) const + { + return rImpl.aName == mrName; + } + }; - if ( !pImpl ) + SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const rtl::OUString &rName) { + rtl::OUString aName; + + if (rName.getLength()) + aName = SfxObjectShell::GetServiceNameFromFactory(rName); + + // find the impl-Data of any comparable FilterMatcher that was created + // previously + SfxFilterMatcherArr_Impl::iterator aEnd = aImplArr.end(); + SfxFilterMatcherArr_Impl::iterator aIter = + std::find_if(aImplArr.begin(), aEnd, hasName(rName)); + if (aIter != aEnd) + return *aIter; + // first Matcher created for this factory - pImpl = new SfxFilterMatcher_Impl; - pImpl->aName = aName; - pImplArr->Insert( pImplArr->Count(), pImpl ); + SfxFilterMatcher_Impl *pImpl = new SfxFilterMatcher_Impl(aName); + aImplArr.push_back(pImpl); + return *pImpl; } } +SfxFilterMatcher::SfxFilterMatcher( const String& rName ) + : m_rImpl( getSfxFilterMatcher_Impl(rName) ) +{ + ++nSfxFilterMatcherCount; +} + SfxFilterMatcher::SfxFilterMatcher() + : m_rImpl( getSfxFilterMatcher_Impl(::rtl::OUString()) ) { - // global FilterMatcher always uses global filter array (also created on demand) - pImpl = new SfxFilterMatcher_Impl; + // global FilterMatcher always uses global filter array (also created on + // demand) + ++nSfxFilterMatcherCount; } SfxFilterMatcher::~SfxFilterMatcher() { - if ( !pImpl->aName.getLength() ) - // only the global Matcher owns his ImplData - delete pImpl; + --nSfxFilterMatcherCount; + if (nSfxFilterMatcherCount == 0) + aImplArr.clear(); } void SfxFilterMatcher_Impl::Update() @@ -345,10 +375,10 @@ void SfxFilterMatcher_Impl::InitForIterating() const const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - pImpl->InitForIterating(); - for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i ) + m_rImpl.InitForIterating(); + for ( size_t i = 0, n = m_rImpl.pList->size(); i < n; ++i ) { - const SfxFilter* pFilter = pImpl->pList->at( i ); + const SfxFilter* pFilter = m_rImpl.pList->at( i ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) ) return pFilter; @@ -379,7 +409,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( if ( sTypeName.getLength() ) { // make sure filter list is initialized - pImpl->InitForIterating(); + m_rImpl.InitForIterating(); *ppFilter = GetFilter4EA( sTypeName, nMust, nDont ); } @@ -438,8 +468,8 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c aDescriptor[::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] <<= xInStream; aDescriptor[::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= rMedium.GetInteractionHandler(); - if ( pImpl->aName.getLength() ) - aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<= pImpl->aName; + if ( m_rImpl.aName.getLength() ) + aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<= m_rImpl.aName; if ( pOldFilter ) { @@ -613,14 +643,14 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: // pFilter == 0: if preferred filter is a Writer filter, but Writer module is not installed continue; - if ( pImpl->aName.getLength() ) + if ( m_rImpl.aName.getLength() ) { // if this is not the global FilterMatcher: check if filter matches the document type ::rtl::OUString aService; - if ( pFilter->GetServiceName() != String(pImpl->aName) ) + if ( pFilter->GetServiceName() != String(m_rImpl.aName) ) { // preferred filter belongs to another document type; now we must search the filter - pImpl->InitForIterating(); + m_rImpl.InitForIterating(); aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] >>= aValue; pFilter = GetFilter4EA( aValue, nMust, nDont ); if ( pFilter ) @@ -640,11 +670,11 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const String& rMediaType,SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - if ( pImpl->pList ) + if ( m_rImpl.pList ) { - for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i ) + for ( size_t i = 0, n = m_rImpl.pList->size(); i < n; ++i ) { - const SfxFilter* pFilter = pImpl->pList->at( i ); + const SfxFilter* pFilter = m_rImpl.pList->at( i ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetMimeType() == rMediaType ) return pFilter; @@ -661,12 +691,12 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const String& rMediaType,SfxF const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - if ( pImpl->pList ) + if ( m_rImpl.pList ) { const SfxFilter* pFirst = 0; - for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i ) + for ( size_t i = 0, n = m_rImpl.pList->size(); i < n; ++i ) { - const SfxFilter* pFilter = pImpl->pList->at( i ); + const SfxFilter* pFilter = m_rImpl.pList->at( i ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetTypeName() == rType ) { @@ -690,11 +720,11 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - if ( pImpl->pList ) + if ( m_rImpl.pList ) { - for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i ) + for ( size_t i = 0, n = m_rImpl.pList->size(); i < n; ++i ) { - const SfxFilter* pFilter = pImpl->pList->at( i ); + const SfxFilter* pFilter = m_rImpl.pList->at( i ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) ) { @@ -743,11 +773,11 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil const SfxFilter* SfxFilterMatcher::GetFilter4UIName( const String& rName, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - pImpl->InitForIterating(); + m_rImpl.InitForIterating(); const SfxFilter* pFirstFilter=0; - for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i ) + for ( size_t i = 0, n = m_rImpl.pList->size(); i < n; ++i ) { - const SfxFilter* pFilter = pImpl->pList->at( i ); + const SfxFilter* pFilter = m_rImpl.pList->at( i ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetUIName() == rName ) @@ -801,7 +831,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf } } - SfxFilterList_Impl* pList = pImpl->pList; + SfxFilterList_Impl* pList = m_rImpl.pList; if ( !pList ) pList = pFilterArr; @@ -828,14 +858,14 @@ IMPL_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String*, pString ) //---------------------------------------------------------------- SfxFilterMatcherIter::SfxFilterMatcherIter( - const SfxFilterMatcher* pMatchP, + const SfxFilterMatcher& rMatcher, SfxFilterFlags nOrMaskP, SfxFilterFlags nAndMaskP ) : nOrMask( nOrMaskP ), nAndMask( nAndMaskP ), - nCurrent(0), pMatch( pMatchP->pImpl) + nCurrent(0), m_rMatch(rMatcher.m_rImpl) { if( nOrMask == 0xffff ) //Due to falty build on s nOrMask = 0; - pMatch->InitForIterating(); + m_rMatch.InitForIterating(); } //---------------------------------------------------------------- @@ -843,9 +873,9 @@ SfxFilterMatcherIter::SfxFilterMatcherIter( const SfxFilter* SfxFilterMatcherIter::Find_Impl() { const SfxFilter* pFilter = 0; - while( nCurrent < pMatch->pList->size() ) + while( nCurrent < m_rMatch.pList->size() ) { - pFilter = pMatch->pList->at( nCurrent++ ); + pFilter = m_rMatch.pList->at( nCurrent++ ); SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if( ((nFlags & nOrMask) == nOrMask ) && !(nFlags & nAndMask ) ) break; @@ -1146,11 +1176,12 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate ) DBG_ASSERT( sal_False, "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached.\n" ); } - if ( pImplArr && bUpdate ) + if ( bUpdate ) { - // global filter arry was modified, factory specific ones might need an update too - for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ ) - pImplArr->GetObject(n)->Update(); + // global filter arry was modified, factory specific ones might need an + // update too + std::for_each(aImplArr.begin(), aImplArr.end(), + std::mem_fun_ref(&SfxFilterMatcher_Impl::Update)); } } diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 3fc966c45d8e..16f1ccf64d20 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -49,6 +49,39 @@ //***************************************************************************************************************** using namespace ::com::sun::star; + +class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util::XRefreshListener> +{ + private: + SfxFilterListener *m_pOwner; + + public: + SfxRefreshListener(SfxFilterListener *pOwner) + : m_pOwner(pOwner) + { + } + + virtual ~SfxRefreshListener() + { + } + + // util.XRefreshListener + virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& rEvent ) + throw(com::sun::star::uno::RuntimeException) + { + m_pOwner->refreshed(rEvent); + } + + // lang.XEventListener + virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) + throw(com::sun::star::uno::RuntimeException) + { + m_pOwner->disposing(rEvent); + } +}; + + + //***************************************************************************************************************** // definitions //***************************************************************************************************************** @@ -85,7 +118,8 @@ SfxFilterListener::SfxFilterListener() if( xNotifier.is() == sal_True ) { m_xFilterCache = xNotifier; - m_xFilterCache->addRefreshListener( this ); + m_xFilterCacheListener = new SfxRefreshListener(this); + m_xFilterCache->addRefreshListener( m_xFilterCacheListener ); } } } diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx index 02af4663037c..e7d010bbbcd7 100644 --- a/sfx2/source/bastyp/fltlst.hxx +++ b/sfx2/source/bastyp/fltlst.hxx @@ -42,28 +42,23 @@ #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/uno/RuntimeException.hpp> -//***************************************************************************************************************** -// declarations -//***************************************************************************************************************** -class SfxFilterListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XRefreshListener > +class SfxFilterListener { - // member private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xFilterCache; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > m_xFilterCacheListener; - // c++ interface public: - SfxFilterListener(); - ~SfxFilterListener(); + SfxFilterListener(); + ~SfxFilterListener(); - // uno interface public: // XRefreshListener virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); -}; // SfxFilterListener +}; #endif // _SFX_FLTLST_HXX diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx index 80991dcc492b..b20a23266353 100644 --- a/sfx2/source/bastyp/misc.cxx +++ b/sfx2/source/bastyp/misc.cxx @@ -33,7 +33,7 @@ //-------------------------------------------------------------------- -#if defined(DBG_UTIL) && ( defined(WNT) || defined(OS2) ) +#if defined(DBG_UTIL) && defined(WNT) unsigned SfxStack::nLevel = 0; #endif diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index ce3b19725727..ede1f873d6bc 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -80,15 +80,12 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc, pMedium( pMed ), pDLMedium( 0 ), nMetaTags( 0 ) { - DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ), + DBG_ASSERT( RTL_TEXTENCODING_UTF8 == GetSrcEncoding( ), "SfxHTMLParser::SfxHTMLParser: From where comes ZS?" ); + DBG_ASSERT( !IsSwitchToUCS2(), "SfxHTMLParser::SfxHTMLParser: Switch to UCS2?" ); - // Altough the real default encoding is ISO8859-1, we use MS-1252 - // as default encoding. - SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); - // If the file starts with a BOM, switch to UCS2. SetSwitchToUCS2( sal_True ); } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 88e284ea4e27..b2e1b9c36b54 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" + +#include <boost/scoped_ptr.hpp> + #include <vcl/msgbox.hxx> #include <tools/resary.hxx> #include <svl/lstner.hxx> @@ -256,9 +259,9 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const { xEvents->replaceByName( aEventName, aEventData ); } - catch( ::com::sun::star::lang::IllegalArgumentException ) + catch( const ::com::sun::star::lang::IllegalArgumentException& ) { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ); } - catch( ::com::sun::star::container::NoSuchElementException ) + catch( const ::com::sun::star::container::NoSuchElementException& ) { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ); } } else { @@ -270,17 +273,10 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const //-------------------------------------------------------------------------------------------------------- void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { - SvxMacro *pMacro = NULL; + boost::scoped_ptr<SvxMacro> pMacro; if ( rMacro.GetMacName().Len() ) - pMacro = new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), rMacro.GetScriptType() ); - if ( pDoc ) - { - PropagateEvent_Impl( pDoc, aName, pMacro ); - } - else - { - PropagateEvent_Impl( NULL, aName, pMacro ); - } + pMacro.reset( new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), rMacro.GetScriptType() ) ); + PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() ); } // ------------------------------------------------------------------------------------------------------- diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 5e685dfa4bfd..3f837323a1fd 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1173,6 +1173,8 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem* DeleteItemOnIdle( pVoid ); return pVoid; } + else if ( pCache && bDeleteCache ) // just in case it was created, but GetDispatch() is 0 + DELETEZ( pCache ); // slot is handled internally by SfxDispatcher if ( pImp->bMsgDirty ) diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index f6acd615074d..59dfe7fd75f0 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2028,15 +2028,11 @@ void SfxDispatcher::SetSlotFilter //-------------------------------------------------------------------- EXTERN_C -#if defined( PM2 ) -int _stdcall -#else #ifdef WNT int _cdecl #else int #endif -#endif SfxCompareSIDs_Impl( const void* pSmaller, const void* pBigger ) { diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index e69c11fa2377..6570a27b956e 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -47,15 +47,11 @@ DBG_NAME(SfxInterface) //==================================================================== EXTERN_C -#if defined( PM2 ) -int _stdcall -#else #ifdef WNT int _cdecl #else int #endif -#endif SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger ) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index cd60b7a2ec5b..50011820f4bf 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -410,7 +410,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow ) if ( pInternalController ) pInternalController->StateChanged( nId, eState, pState ); - if ( !bDeleteItem ) + if ( bDeleteItem ) delete pState; } } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 03e7ef58ea03..059c57667a25 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -990,12 +990,8 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink ) #ifdef WNT int __cdecl BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) #else -#if defined(OS2) && defined(ICC) -int _Optlink BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) -#else extern "C" int BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) #endif -#endif { return *(sal_uInt16*)p1 - *(sal_uInt16*)p2; } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 01e6e70e87f8..411ee30e124f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -438,7 +438,7 @@ sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _ } } } - catch( Exception& ) + catch( const Exception& ) { } } @@ -618,7 +618,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow ) TimeOutHdl_Impl( NULL ); } } - catch( Exception ) + catch( const Exception& ) { DBG_ERRORFILE( "FileDialogHelper_Impl::updatePreviewState: caught an exception!" ); } @@ -657,7 +657,7 @@ void FileDialogHelper_Impl::updateVersions() for ( sal_Int32 i=0; i<xVersions.getLength(); i++ ) aEntries[ i + 1 ] = xVersions[i].Identifier; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } } @@ -671,7 +671,7 @@ void FileDialogHelper_Impl::updateVersions() xDlg->setValue( ExtendedFilePickerElementIds::LISTBOX_VERSION, ControlActions::DELETE_ITEMS, aValue ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} sal_Int32 nCount = aEntries.getLength(); @@ -688,7 +688,7 @@ void FileDialogHelper_Impl::updateVersions() xDlg->setValue( ExtendedFilePickerElementIds::LISTBOX_VERSION, ControlActions::SET_SELECT_ITEM, aPos ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } } @@ -760,7 +760,7 @@ IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG ) // clear the preview window xFilePicker->setImage( FilePreviewImageFormats::BITMAP, aAny ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { } @@ -1108,7 +1108,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( xExtDlg->setLabel( CommonFilePickerElementIds::PUSHBUTTON_OK, OUString( String( SfxResId( STR_SFX_EXPLORERFILE_BUTTONINSERT ) ) ) ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } } @@ -1160,7 +1160,7 @@ void SAL_CALL PickerThread_Impl::run() sal_Int16 n = mxPicker->execute(); SetReturnValue( n ); } - catch( RuntimeException& ) + catch( const RuntimeException& ) { SetReturnValue( ExecutableDialogResults::CANCEL ); DBG_ERRORFILE( "RuntimeException caught" ); @@ -1496,7 +1496,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, if ( aValue >>= bSelection ) rpSet->Put( SfxBoolItem( SID_SELECTION, bSelection ) ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { OSL_FAIL( "FileDialogHelper_Impl::execute: caught an IllegalArgumentException!" ); } @@ -1517,7 +1517,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, if ( ( aValue >>= bReadOnly ) && bReadOnly ) rpSet->Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { OSL_FAIL( "FileDialogHelper_Impl::execute: caught an IllegalArgumentException!" ); } @@ -1534,7 +1534,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, // open a special version; 0 == current version rpSet->Put( SfxInt16Item( SID_VERSION, (short)nVersion ) ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } // set the filter @@ -1622,7 +1622,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, } } } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } SaveLastUsedFilter(); @@ -1752,7 +1752,7 @@ void FileDialogHelper_Impl::setFilter( const OUString& rFilter ) { xFltMgr->setCurrentFilter( maCurFilter ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } } @@ -1812,7 +1812,7 @@ void FileDialogHelper_Impl::addFilters( sal_Int64 nFlags, { xResult = xFilterCont->createSubSetEnumerationByQuery(sQuery.makeStringAndClear()); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { DBG_ERRORFILE( "Could not get filters from the configuration!" ); } @@ -1852,7 +1852,7 @@ void FileDialogHelper_Impl::addFilter( const OUString& rFilterName, if ( !maSelectFilter.getLength() ) maSelectFilter = rFilterName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { #ifdef DBG_UTIL ByteString aMsg( "Could not append Filter" ); @@ -1909,7 +1909,7 @@ void FileDialogHelper_Impl::addGraphicFilter() xFltMgr->appendFilter( aAllFilterName, aExtensions ); maSelectFilter = aAllFilterName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { DBG_ERRORFILE( "Could not append Filter" ); } @@ -1938,7 +1938,7 @@ void FileDialogHelper_Impl::addGraphicFilter() { xFltMgr->appendFilter( aName, aExt ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { DBG_ERRORFILE( "Could not append Filter" ); } @@ -1981,7 +1981,7 @@ void FileDialogHelper_Impl::saveConfig() aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } else { @@ -2007,7 +2007,7 @@ void FileDialogHelper_Impl::saveConfig() aUserData.SetToken( 0, ' ', String::CreateFromInt32( (sal_Int32) bAutoExt ) ); bWriteConfig = sal_True; } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if ( ! mbIsSaveDlg ) @@ -2033,7 +2033,7 @@ void FileDialogHelper_Impl::saveConfig() aUserData.SetToken( 2, ' ', String::CreateFromInt32( (sal_Int32) bSelection ) ); bWriteConfig = sal_True; } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if ( bWriteConfig ) @@ -2068,7 +2068,7 @@ namespace ::ucbhelper::Content aContent( sPathCheck, uno::Reference< ucb::XCommandEnvironment >() ); bValid = aContent.isFolder(); } - catch( Exception& ) {} + catch( const Exception& ) {} } if ( !bValid ) @@ -2125,7 +2125,7 @@ void FileDialogHelper_Impl::loadConfig() // set the member so we know that we have to show the preview mbShowPreview = bShowPreview; } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if ( !maPath.getLength() ) @@ -2158,7 +2158,7 @@ void FileDialogHelper_Impl::loadConfig() { xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if( mbHasSelectionBox ) @@ -2169,7 +2169,7 @@ void FileDialogHelper_Impl::loadConfig() { xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, aValue ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if ( !maPath.getLength() ) @@ -2188,7 +2188,7 @@ void FileDialogHelper_Impl::setDefaultValues() { xFltMgr->setCurrentFilter( maSelectFilter ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) {} } @@ -2596,7 +2596,7 @@ static int impl_isFolder( const OUString& rPath ) xHandler.set( xFactory->createInstance( DEFINE_CONST_OUSTRING( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY_THROW ); } - catch ( Exception const & ) + catch ( const Exception & ) { } @@ -2611,7 +2611,7 @@ static int impl_isFolder( const OUString& rPath ) return 0; } - catch ( Exception const & ) + catch ( const Exception & ) { } diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index c4a3a7622d07..4f8ca6c43af2 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -972,7 +972,7 @@ namespace sfx2 if ( !_rFirstNonEmpty.getLength() ) _rFirstNonEmpty = sUIName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { #ifdef DBG_UTIL ByteString aMsg( "Could not append DefaultFilter" ); @@ -996,7 +996,7 @@ namespace sfx2 if ( !_rFirstNonEmpty.getLength() ) _rFirstNonEmpty = sUIName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { #ifdef DBG_UTIL ByteString aMsg( "Could not append Filter" ); @@ -1093,7 +1093,7 @@ namespace sfx2 if ( xFilterGroupManager.is() ) { // Add both html/pdf filter as a filter group to get a separator between both groups - if ( aImportantFilterGroup.size() > 0 ) + if ( !aImportantFilterGroup.empty() ) { Sequence< StringPair > aFilters( aImportantFilterGroup.size() ); for ( sal_Int32 i = 0; i < (sal_Int32)aImportantFilterGroup.size(); i++ ) @@ -1108,12 +1108,12 @@ namespace sfx2 { xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { } } - if ( aFilterGroup.size() > 0 ) + if ( !aFilterGroup.empty() ) { Sequence< StringPair > aFilters( aFilterGroup.size() ); for ( sal_Int32 i = 0; i < (sal_Int32)aFilterGroup.size(); i++ ) @@ -1128,7 +1128,7 @@ namespace sfx2 { xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { } } @@ -1150,7 +1150,7 @@ namespace sfx2 _rFirstNonEmpty = sUIName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { #ifdef DBG_UTIL ByteString aMsg( "Could not append Filter" ); @@ -1172,7 +1172,7 @@ namespace sfx2 _rFirstNonEmpty = sUIName; } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { #ifdef DBG_UTIL ByteString aMsg( "Could not append Filter" ); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 16e2881ec77a..b583dc98bd76 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -59,8 +59,8 @@ SfxStyleDialog::SfxStyleDialog SfxTabDialog( pParent, rResId, rStyle.GetItemSet().Clone(), - // auch ohne ParentSupport TRUE "ubergeben, aber erweitert - // um den StandardButton zu unterdr"ucken + // return TRUE also without ParentSupport , but extended + // to suppress the standardButton rStyle.HasParentSupport() ? sal_True : 2, pUserBtnTxt ), diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 86362938acab..94897e75356c 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1559,7 +1559,6 @@ const SfxItemSet* SfxTabDialog::GetOutputItemSet ( sal_uInt16 nId // the Id, under which the page was added at AddTabPage(). - // hinzugefügt wurde. ) const { Data_Impl* pDataObject = Find( *pImpl->pData, nId ); @@ -1594,12 +1593,8 @@ int SfxTabDialog::FillOutputItemSet() #ifdef WNT int __cdecl TabDlgCmpUS_Impl( const void* p1, const void* p2 ) #else -#if defined(OS2) && defined(ICC) -int _Optlink TabDlgCmpUS_Impl( const void* p1, const void* p2 ) -#else extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 ) #endif -#endif /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 21ca852d547e..27263d5631de 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" +#include <boost/scoped_ptr.hpp> + #include <vcl/menu.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> @@ -1334,11 +1336,9 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) aFmtLb.SetUpdateMode(sal_False); aFmtLb.Clear(); - nPos = 0; for(nPos = 0 ; nPos < nCount ; ++nPos ) - { aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, sal_False, nPos); - } + aFmtLb.SetUpdateMode(true); } // Selects the current style if any @@ -2562,7 +2562,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) TIB_DROPDOWN == (pBox->GetItemBits(nEntry)&TIB_DROPDOWN)) { //create a popup menu in Writer - PopupMenu *pMenu = new PopupMenu; + boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu); uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()-> createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -2607,7 +2607,6 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) catch(uno::Exception&) { } - delete pMenu; pBox->Invalidate(); } return 0; diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 45c03df2a644..f79c7c908b12 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -148,6 +148,7 @@ SfxObjectFactory::~SfxObjectFactory() for ( sal_uInt16 i = 0; i < nCount; ++i ) delete pImpl->aFilterArr[i]; delete pImpl->pNameResId; + delete pImpl->pFilterContainer; delete pImpl; } @@ -351,7 +352,7 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const { sal_uInt16 nVersion=0; SfxFilterMatcher aMatcher ( String::CreateFromAscii( pShortName ) ); - SfxFilterMatcherIter aIter( &aMatcher ); + SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter *pFilter = 0; const SfxFilter *pTemp = aIter.First(); while ( pTemp ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index e5c575298a87..2a1bc48c0b5e 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -416,7 +416,7 @@ void SfxMedium::AddLog( const ::rtl::OUString& aMessage ) if ( aContext.is() ) pImp->m_xLogRing.set( aContext.getSingleton( "com.sun.star.logging.DocumentIOLogRing" ), UNO_QUERY_THROW ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } @@ -475,7 +475,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) {} } } @@ -500,7 +500,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= pImp->m_aDateTime; pImp->m_bGotDateTime = sal_True; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { } } @@ -526,7 +526,7 @@ Reference < XContent > SfxMedium::GetContent() const { pImp->aContent = ::ucbhelper::Content( xContent, xEnv ); } - catch ( Exception& ) + catch ( const Exception& ) { } } @@ -560,7 +560,7 @@ Reference < XContent > SfxMedium::GetContent() const Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI" )) ); aAny >>= aBaseURL; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { } @@ -890,7 +890,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() { ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( pImp->xStorage, aEncryptionData ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "It must be possible to set a common password for the storage" ); // TODO/LATER: set the error code in case of problem @@ -1067,7 +1067,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv ); aContent.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ) ) >>= bContentReadonly; } - catch( uno::Exception ) + catch( const uno::Exception& ) {} #if EXTRA_ACL_CHECK @@ -1120,7 +1120,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) { bResult = aLockFile.CreateOwnLockFile(); } - catch ( ucb::InteractiveIOException& e ) + catch ( const ucb::InteractiveIOException& e ) { // exception means that the lock file can not be successfuly accessed // in this case it should be ignored if system file locking is anyway active @@ -1152,7 +1152,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) } } } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { // exception means that the lock file can not be successfuly accessed // in this case it should be ignored if system file locking is anyway active @@ -1183,7 +1183,9 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) // impossibility to get data is no real problem aData = aLockFile.GetLockData(); } - catch( uno::Exception ) {} + catch( const uno::Exception& ) + { + } sal_Bool bOwnLock = sal_False; @@ -1216,7 +1218,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) bHandleSysLocked = sal_False; } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } } while( !bResult && bUIStatus == LOCK_UI_TRY ); @@ -1247,7 +1249,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( bResult && DocNeedsFileDateCheck() ) GetInitFileDate( sal_True ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "Unexpected problem by locking, high probability, that the content could not be created" ); } @@ -1328,7 +1330,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf ::comphelper::OStorageHelper::GetStorageFactory()->createInstanceWithArguments( aArgs ), uno::UNO_QUERY ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // impossibility to create the storage is no error } @@ -1441,7 +1443,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool pImp->m_xZipStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( ZIP_STORAGE_FORMAT_STRING, pImp->xInputStream ); } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "No possibility to get readonly version of storage from medium!\n" ); } @@ -1460,7 +1462,7 @@ void SfxMedium::CloseZipStorage_Impl() { try { pImp->m_xZipStorage->dispose(); - } catch( uno::Exception& ) + } catch( const uno::Exception& ) {} pImp->m_xZipStorage = uno::Reference< embed::XStorage >(); @@ -1478,7 +1480,7 @@ void SfxMedium::CloseStorage() { try { xComp->dispose(); - } catch( uno::Exception& ) + } catch( const uno::Exception& ) { OSL_FAIL( "Medium's storage is already disposed!\n" ); } @@ -1536,7 +1538,7 @@ sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalCont aOriginalContent.writeStream( aOrigInput, sal_True ); return sal_True; } - catch( Exception& ) + catch( const Exception& ) { // in case of failure here the backup file should not be removed // TODO/LATER: a message should be used to let user know about the backup @@ -1568,7 +1570,7 @@ sal_Bool SfxMedium::StorageCommit_Impl() CloseZipStorage_Impl(); bResult = sal_True; } - catch ( embed::UseBackupException& aBackupExc ) + catch ( const embed::UseBackupException& aBackupExc ) { // since the temporary file is created always now, the scenario is close to be impossible if ( !pImp->pTempFile ) @@ -1595,7 +1597,7 @@ sal_Bool SfxMedium::StorageCommit_Impl() SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { //TODO/LATER: improve error handling SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); @@ -1621,11 +1623,11 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, { aOriginalContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv ); } - catch ( ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const ::com::sun::star::ucb::CommandAbortedException& ) { eError = ERRCODE_ABORT; } - catch ( ::com::sun::star::ucb::CommandFailedException& ) + catch ( const ::com::sun::star::ucb::CommandFailedException& ) { eError = ERRCODE_ABORT; } @@ -1689,15 +1691,15 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, bResult = sal_True; } } - catch ( ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const ::com::sun::star::ucb::CommandAbortedException& ) { eError = ERRCODE_ABORT; } - catch ( ::com::sun::star::ucb::CommandFailedException& ) + catch ( const ::com::sun::star::ucb::CommandFailedException& ) { eError = ERRCODE_ABORT; } - catch ( ::com::sun::star::ucb::InteractiveIOException& r ) + catch ( const ::com::sun::star::ucb::InteractiveIOException& r ) { if ( r.Code == IOErrorCode_ACCESS_DENIED ) eError = ERRCODE_IO_ACCESSDENIED; @@ -1708,7 +1710,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, else eError = ERRCODE_IO_GENERAL; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { eError = ERRCODE_IO_GENERAL; } @@ -1793,7 +1795,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& return sal_True; } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } } @@ -1868,7 +1870,7 @@ void SfxMedium::Transfer_Impl() pImp->pTempFile = NULL; } } - catch( Exception& ) + catch( const Exception& ) {} } } @@ -1916,7 +1918,7 @@ void SfxMedium::Transfer_Impl() xTrans->commit(); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { //TODO/MBA: error handling } @@ -2000,15 +2002,15 @@ void SfxMedium::Transfer_Impl() if (!aTransferContent.transferContent( aSourceContent, ::ucbhelper::InsertOperation_COPY, aFileName, nNameClash )) eError = ERRCODE_IO_GENERAL; } - catch ( ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const ::com::sun::star::ucb::CommandAbortedException& ) { eError = ERRCODE_ABORT; } - catch ( ::com::sun::star::ucb::CommandFailedException& ) + catch ( const ::com::sun::star::ucb::CommandFailedException& ) { eError = ERRCODE_ABORT; } - catch ( ::com::sun::star::ucb::InteractiveIOException& r ) + catch ( const ::com::sun::star::ucb::InteractiveIOException& r ) { if ( r.Code == IOErrorCode_ACCESS_DENIED ) eError = ERRCODE_IO_ACCESSDENIED; @@ -2019,7 +2021,7 @@ void SfxMedium::Transfer_Impl() else eError = ERRCODE_IO_GENERAL; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { eError = ERRCODE_IO_GENERAL; } @@ -2070,7 +2072,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont pImp->m_bRemoveBackup = sal_True; } } - catch( Exception& ) + catch( const Exception& ) {} } @@ -2157,7 +2159,7 @@ void SfxMedium::DoBackup_Impl() pImp->m_bRemoveBackup = sal_False; } } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { } } @@ -2682,7 +2684,7 @@ void SfxMedium::UnlockFile( sal_Bool bReleaseLockStream ) if ( xOutStream.is() ) xOutStream->closeOutput(); } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } @@ -2698,7 +2700,7 @@ void SfxMedium::UnlockFile( sal_Bool bReleaseLockStream ) // TODO/LATER: A warning could be shown in case the file is not the own one aLockFile.RemoveFile(); } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } } @@ -2731,7 +2733,7 @@ void SfxMedium::CloseAndReleaseStreams_Impl() if ( xOutToClose.is() ) xOutToClose->closeOutput(); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { } } @@ -3127,7 +3129,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content-type")), aContentType ) ); } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { } } @@ -3168,7 +3170,7 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR { pImp->aVersions = xReader->load( GetStorage() ); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { } } @@ -3190,7 +3192,7 @@ uno::Sequence < util::RevisionTag > SfxMedium::GetVersionList( const uno::Refere { return xReader->load( xStorage ); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { } } @@ -3279,7 +3281,7 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ ) xWriter->store( GetStorage(), pImp->aVersions ); return sal_True; } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { } } @@ -3324,17 +3326,17 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL ) ::osl::DirectoryItem aDirItem; if ( ::osl::DirectoryItem::get( aURL, aDirItem ) == ::osl::FileBase::E_None ) { - ::osl::FileStatus aFileStatus( FileStatusMask_Attributes ); + ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Attributes ); if ( aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None - && aFileStatus.isValid( FileStatusMask_Attributes ) ) + && aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) ) { sal_uInt64 nAttributes = aFileStatus.getAttributes(); - nAttributes &= ~(Attribute_OwnWrite | - Attribute_GrpWrite | - Attribute_OthWrite | - Attribute_ReadOnly); - nAttributes |= Attribute_OwnWrite; + nAttributes &= ~(osl_File_Attribute_OwnWrite | + osl_File_Attribute_GrpWrite | + osl_File_Attribute_OthWrite | + osl_File_Attribute_ReadOnly); + nAttributes |= osl_File_Attribute_OwnWrite; bResult = ( osl::File::setAttributes( aURL, nAttributes ) == ::osl::FileBase::E_None ); } @@ -3392,7 +3394,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) } } } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} if ( bTransferSuccess ) @@ -3492,7 +3494,7 @@ void SfxMedium::CreateTempFileNoCopy() pImp->aCharset = pCharset->m_sValue; } } - catch ( ::com::sun::star::uno::Exception& ) + catch ( const ::com::sun::star::uno::Exception& ) { } } @@ -3595,7 +3597,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: } } } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { OSL_FAIL( "Couldn't use signing functionality!\n" ); } @@ -3611,7 +3613,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: else xSigner->showDocumentContentSignatures( GetZipStorageToSign_Impl(), uno::Reference< io::XInputStream >() ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "Couldn't use signing functionality!\n" ); } @@ -3679,7 +3681,7 @@ sal_Bool SfxMedium::IsOpen() const aResult = aNewTempFileURL; } } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } } @@ -3766,7 +3768,7 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction pImp->xStorage = xStorage; aResult = aNewURL; } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } @@ -3828,7 +3830,7 @@ sal_Bool SfxMedium::SwitchDocumentToFile( ::rtl::OUString aURL ) pImp->xStorage = xStorage; bResult = sal_True; } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} } diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 9b1ebfeb799e..6765c222fd22 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -235,7 +235,7 @@ IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG } } } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } if ( SFXWB_EXPORT == ( m_nDlgFlags & SFXWB_EXPORT ) ) @@ -247,7 +247,7 @@ IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG if ( aValue >>= bSelection ) m_pItemSet->Put( SfxBoolItem( SID_SELECTION, bSelection ) ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { OSL_FAIL( "FileDialogHelper_Impl::execute: caught an IllegalArgumentException!" ); } @@ -268,7 +268,7 @@ IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG if ( ( aValue >>= bReadOnly ) && bReadOnly ) m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); } - catch( IllegalArgumentException ) + catch( const IllegalArgumentException& ) { OSL_FAIL( "FileDialogHelper_Impl::execute: caught an IllegalArgumentException!" ); } @@ -286,7 +286,7 @@ IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG // open a special version; 0 == current version m_pItemSet->Put( SfxInt16Item( SID_VERSION, (short)nVersion ) ); } - catch( IllegalArgumentException ){} + catch( const IllegalArgumentException& ){} } } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 03897b24531a..dedc88f183b5 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/beans/StringPair.hpp> +#include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/document/XStandaloneDocumentInfo.hpp> @@ -593,11 +594,45 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); + uno::Reference< XComponentContext > xCtx; + uno::Reference< util::XMacroExpander > xExpander; + uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); + const rtl::OUString aPrefix( + RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) ); + + if ( xPropSet.is() ) + { + xPropSet->getPropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) + >>= xCtx; + } + + if ( xCtx.is() ) + { + xCtx->getValueByName( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "/singletons/com.sun.star.util.theMacroExpander" ) ) ) + >>= xExpander; + + OSL_ENSURE( xExpander.is(), + "Unable to obtain macro expander singleton!" ); + } + for ( sal_uInt16 i=0; i<nCount; i++ ) { aURL.SetSmartProtocol( INET_PROT_FILE ); aURL.SetURL( aDirs.GetToken( i, C_DELIM ) ); maTemplateDirs[i] = aURL.GetMainURL( INetURLObject::NO_DECODE ); + + sal_Int32 nIndex = maTemplateDirs[i].indexOf( aPrefix ); + if ( nIndex != -1 && xExpander.is() ) + { + maTemplateDirs[i] = maTemplateDirs[i].replaceAt(nIndex, + aPrefix.getLength(), + rtl::OUString()); + maTemplateDirs[i] = xExpander->expandMacros( maTemplateDirs[i] ); + } } aValue <<= maTemplateDirs; diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 425470219a2c..4a81f92e2c4c 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -718,7 +718,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox, pChildIter = NextSibling(pChildIter); // If possible, fill in Items onDemand ++i; - if(p[i+1] != INDEX_IGNORE && + if(i < 2 && p[i+1] != INDEX_IGNORE && pChildIter->HasChildsOnDemand() && !GetModel()->HasChilds(pChildIter)) RequestingChilds(pChildIter); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index c23ddde17f51..ff02c3c442ea 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -303,7 +303,7 @@ public: sal_Bool bSetStandardName, ::rtl::OUString& aSuggestedName, sal_Bool bPreselectPassword, - const ::rtl::OUString& aSuggestedDir, + ::rtl::OUString& aSuggestedDir, sal_Int16 nDialog, const ::rtl::OUString& rStandardDir, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList @@ -808,7 +808,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, sal_Bool bSetStandardName, ::rtl::OUString& aSuggestedName, sal_Bool bPreselectPassword, - const ::rtl::OUString& aSuggestedDir, + ::rtl::OUString& aSuggestedDir, sal_Int16 nDialog, const ::rtl::OUString& rStandardDir, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) @@ -1016,6 +1016,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, INetURLObject aURL( pFileDlg->GetPath() ); // the path should be provided outside since it might be used for further calls to the dialog aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); + aSuggestedDir = pFileDlg->GetDisplayDirectory(); // old filter options should be cleared in case different filter is used @@ -1501,10 +1502,8 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& sal_Bool bExit = sal_False; while ( !bExit ) { + // in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList ); - - // in case the dialog is opend a second time the folder should be the same as before, not what was handed over by parameters - aSuggestedDir = ::rtl::OUString(); if ( nStoreMode == SAVEAS_REQUESTED ) { // in case of saving check filter for possible alien warning diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 38f9b7a08f84..80401876d05f 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -163,10 +163,10 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const pFile->Record( &aDevice ); LanguageType eLang; - SvtCTLOptions* pCTLOptions = new SvtCTLOptions; - if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions->GetCTLTextNumerals() ) + SvtCTLOptions aCTLOptions; + if ( SvtCTLOptions::NUMERALS_HINDI == aCTLOptions.GetCTLTextNumerals() ) eLang = LANGUAGE_ARABIC_SAUDI_ARABIA; - else if ( SvtCTLOptions::NUMERALS_ARABIC == pCTLOptions->GetCTLTextNumerals() ) + else if ( SvtCTLOptions::NUMERALS_ARABIC == aCTLOptions.GetCTLTextNumerals() ) eLang = LANGUAGE_ENGLISH; else eLang = (LanguageType) Application::GetSettings().GetLanguage(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index fc4c9c0556a8..b43001e03c69 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -285,7 +285,7 @@ void SfxObjectShell::SetTemplate(sal_Bool bIs) { pImp->bIsTemplate=bIs; SfxFilterMatcher aMatcher( GetFactory().GetFactoryName() ); - SfxFilterMatcherIter aIter( &aMatcher, SFX_FILTER_TEMPLATEPATH ); + SfxFilterMatcherIter aIter( aMatcher, SFX_FILTER_TEMPLATEPATH ); SfxMedium* pMed = GetMedium(); if( pMed ) pMed->SetFilter( aIter.First() ); } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d5104a0f7a56..7d825b6fa846 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -134,12 +134,6 @@ #include "appbaslib.hxx" #include "appdata.hxx" -#ifdef OS2 -#include <osl/file.hxx> -#include <stdio.h> -#include <sys/ea.h> -#endif - #include "../appl/app.hrc" extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell*, SfxItemPool&, SfxMedium* ); @@ -1744,66 +1738,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl catch( Exception& ) { } - -#ifdef OS2 - { -#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer - // Header for a single-valued ASCII EA data item - typedef struct _EA_ASCII_header { - sal_uInt16 usAttr; /* value: EAT_ASCII */ - sal_uInt16 usLen; /* length of data */ - CHAR szType[_MAX_PATH]; /* ASCII data fits in here ... */ - } EA_ASCII_HEADER; - char filePath[_MAX_PATH]; - char fileExt[_MAX_PATH]; - char docType[_MAX_PATH]; - int rc; - oslFileError eRet; - ::rtl::OUString aSystemFileURL; - const ::rtl::OUString aFileURL = rMedium.GetName(); - // close medium - rMedium.Close(); - - // convert file URL to system path - if (osl::FileBase::getSystemPathFromFileURL( aFileURL, aSystemFileURL) == osl::FileBase::E_None) { - EA_ASCII_HEADER eaAscii; - struct _ea eaType; - strcpy( filePath, CHAR_POINTER( aSystemFileURL)); - strcpy( docType, CHAR_POINTER( rMedium.GetFilter()->GetServiceName())); -#if OSL_DEBUG_LEVEL > 1 - printf( "file name: %s\n", filePath); - printf( "filter name: %s\n", CHAR_POINTER(rMedium.GetFilter()->GetFilterName())); - printf( "service name: %s\n", docType); -#endif - // initialize OS/2 EA data structure - eaAscii.usAttr = EAT_ASCII; - _splitpath ( filePath, NULL, NULL, NULL, fileExt); - if (!stricmp( fileExt, ".pdf")) - strcpy( eaAscii.szType, "Acrobat Document"); - else if (!strcmp( docType, "com.sun.star.text.TextDocument")) - strcpy( eaAscii.szType, "OpenOfficeOrg Writer Document"); - else if (!strcmp( docType, "com.sun.star.sheet.SpreadsheetDocument")) - strcpy( eaAscii.szType, "OpenOfficeOrg Calc Document"); - else if (!strcmp( docType, "com.sun.star.presentation.PresentationDocument")) - strcpy( eaAscii.szType, "OpenOfficeOrg Impress Document"); - else if (!strcmp( docType, "com.sun.star.drawing.DrawingDocument")) - strcpy( eaAscii.szType, "OpenOfficeOrg Draw Document"); - else - strcpy( eaAscii.szType, "OpenOfficeOrg Document"); - eaAscii.usLen = strlen( eaAscii.szType); - // fill libc EA data structure - eaType.flags = 0; - eaType.size = sizeof(sal_uInt16)*2 + eaAscii.usLen; - eaType.value = &eaAscii; - // put EA to file - rc = _ea_put( &eaType, filePath, 0, ".TYPE"); -#if OSL_DEBUG_LEVEL > 1 - printf( "ea name: %s, rc %d, errno %d\n", eaAscii.szType, rc, errno); -#endif - } - } -#endif - } return bOk; diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index 639692894267..cd14844a73d7 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -205,7 +205,7 @@ void Copy( const uno::Reference < document::XStandaloneDocumentInfo >& rSource, // it is possible that the propertysets from XML and binary files differ; we shouldn't break then xTarget->setPropertyValue( pProps[i].Name, aValue ); } - catch ( uno::Exception& ) {} + catch ( const uno::Exception& ) {} } sal_Int16 nCount = rSource->getUserFieldCount(); @@ -218,7 +218,7 @@ void Copy( const uno::Reference < document::XStandaloneDocumentInfo >& rSource, rTarget->setUserFieldValue( nInd, aPropVal ); } } - catch ( uno::Exception& ) {} + catch ( const uno::Exception& ) {} } class MixedPropertySetInfo : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > @@ -401,9 +401,9 @@ void SfxDocumentInfoObject_Impl::Reset(uno::Reference<document::XDocumentPropert xPropContainer->addProperty(name, beans::PropertyAttribute::REMOVEABLE, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")))); - } catch (uno::RuntimeException) { + } catch (const uno::RuntimeException&) { throw; - } catch (uno::Exception) { + } catch (const uno::Exception&) { // ignore } } @@ -1082,9 +1082,9 @@ sal_Int16 SAL_CALL SfxDocumentInfoObject::getUserFieldCount() throw( ::com::sun try { xPropSet->getPropertyValue(name) >>= val; return val; - } catch (uno::RuntimeException &) { + } catch (const uno::RuntimeException &) { throw; - } catch (uno::Exception &) { + } catch (const uno::Exception &) { return ::rtl::OUString(); // ignore } } else @@ -1115,26 +1115,26 @@ void SAL_CALL SfxDocumentInfoObject::setUserFieldName(sal_Int16 nIndex, const : xPropContainer->addProperty(aName, beans::PropertyAttribute::REMOVEABLE, value); _pImp->m_UserDefined[nIndex] = aName; - } catch (beans::UnknownPropertyException) { + } catch (const beans::UnknownPropertyException&) { try { xPropContainer->addProperty(aName, beans::PropertyAttribute::REMOVEABLE, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")))); _pImp->m_UserDefined[nIndex] = aName; - } catch (beans::PropertyExistException) { + } catch (const beans::PropertyExistException&) { _pImp->m_UserDefined[nIndex] = aName; // ignore } - } catch (beans::PropertyExistException) { + } catch (const beans::PropertyExistException&) { try { xPropContainer->addProperty(name, beans::PropertyAttribute::REMOVEABLE, value); - } catch (beans::PropertyExistException) { + } catch (const beans::PropertyExistException&) { // bugger... } - } catch (uno::RuntimeException &) { + } catch (const uno::RuntimeException &) { throw; - } catch (uno::Exception &) { + } catch (const uno::Exception &) { // ignore everything else; xPropSet _may_ be corrupted } } @@ -1162,19 +1162,19 @@ void SAL_CALL SfxDocumentInfoObject::setUserFieldValue( sal_Int16 nIndex, const if (value != aAny) { xPropSet->setPropertyValue(name, aAny); } - } catch (beans::UnknownPropertyException) { + } catch (const beans::UnknownPropertyException&) { try { // someone removed it, add it back again xPropContainer->addProperty(name, beans::PropertyAttribute::REMOVEABLE, aAny); - } catch (uno::RuntimeException &) { + } catch (const uno::RuntimeException &) { throw; - } catch (uno::Exception &) { + } catch (const uno::Exception &) { // ignore everything else } - } catch (uno::RuntimeException &) { + } catch (const uno::RuntimeException &) { throw; - } catch (uno::Exception &) { + } catch (const uno::Exception &) { // ignore everything else } } @@ -1293,7 +1293,7 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin _pImp->Reset(_pImp->m_xDocProps); bOK = sal_True; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } } @@ -1333,15 +1333,15 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::storeIntoURL(const ::rtl::OUStri _pImp->m_xDocProps->storeToStorage(xStorage, medium); bOK = sal_True; } - catch( io::IOException & ) + catch( const io::IOException & ) { throw; } - catch( uno::RuntimeException& ) + catch( const uno::RuntimeException& ) { throw; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index f7167b442501..afa666c168f2 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -210,7 +210,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even mpDoc->OwnerLock(sal_False); } else if ( !mpDoc->Get_Impl()->bClosing ) - // GCC stuerzt ab, wenn schon im dtor, also vorher Flag abfragen + // GCC crashes when already in the destructor, so first query the Flag mpDoc->DoClose(); } diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 10ba8dc4ede3..475aab6ce5ab 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -116,14 +116,13 @@ throw( uno::RuntimeException ) pWin->SetBackground(); pWin->Show(); - sal_uIntPtr nCount = maCmdList.Count(); + size_t nCount = maCmdList.size(); uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount ); ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); - for( sal_uIntPtr i = 0; i < nCount; i++ ) + for( size_t i = 0; i < nCount; i++ ) { - SvCommand & rCmd = maCmdList.GetObject( i ); - pCmds[i] = rCmd.GetCommand(); - pArgs[i] = rCmd.GetArgument(); + pCmds[i] = maCmdList[ i ].GetCommand(); + pArgs[i] = maCmdList[ i ].GetArgument(); } mxPlugin = xPMgr->createPluginFromURL( @@ -216,7 +215,7 @@ void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyNam } else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) ) { - maCmdList.Clear(); + maCmdList.clear(); uno::Sequence < beans::PropertyValue > aCommandSequence; if( aAny >>= aCommandSequence ) maCmdList.FillFromSequence( aCommandSequence ); diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 87da2295a09e..dfcf9bacc09d 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -32,6 +32,7 @@ #include <svl/lstner.hxx> #include <vcl/timer.hxx> #include <tools/string.hxx> +#include <svtools/ehdl.hxx> #include "rtl/ref.hxx" #include <com/sun/star/frame/XModel.hpp> @@ -112,6 +113,12 @@ public: SfxFilterMatcher* pMatcher; ResMgr* pBasicResMgr; ResMgr* pSvtResMgr; +#ifdef DBG_UTIL + SimpleErrorHandler *m_pSimpleErrorHdl; +#endif + SfxErrorHandler *m_pToolsErrorHdl; + SfxErrorHandler *m_pSoErrorHdl; + SfxErrorHandler *m_pSbxErrorHdl; SfxStatusDispatcher* pAppDispatch; SfxDocumentTemplates* pTemplates; @@ -165,7 +172,6 @@ public: SfxAppData_Impl( SfxApplication* ); ~SfxAppData_Impl(); - void UpdateApplicationSettings( sal_Bool bDontHide ); SfxDocumentTemplates* GetDocumentTemplates(); void DeInitDDE(); diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 458b5c7a7b71..2ac9d8b2d2c5 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -53,7 +53,6 @@ class SfxPickList : public SfxListener }; static SfxPickList* pUniqueInstance; - static osl::Mutex* pMutex; std::vector< PickListEntry* > m_aPicklistVector; sal_uInt32 m_nAllowedMenuSize; @@ -62,17 +61,13 @@ class SfxPickList : public SfxListener SfxPickList( sal_uInt32 nMenuSize ); ~SfxPickList(); - static osl::Mutex* GetOrCreateMutex(); - void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURL, sal_uInt32 nNo ); PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); void CreatePickListEntries(); void RemovePickListEntries(); public: - static SfxPickList* GetOrCreate( const sal_uInt32 nMenuSize ); - static SfxPickList* Get(); - static void Delete(); + static SfxPickList& Get(); sal_uInt32 GetAllowedMenuSize() { return m_nAllowedMenuSize; } sal_uInt32 GetNumOfEntries() const { return m_aPicklistVector.size(); } diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 94bef6d9a1dd..41f060e4fad7 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -104,7 +104,7 @@ String SfxShellIdent_Impl( const SfxShell *pSh ); //------------------------------------------------------------------------ -#if defined(DBG_UTIL) && ( defined(WNT) || defined(OS2) ) +#if defined(DBG_UTIL) && defined(WNT) class SfxStack { diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index da576c4d316e..e427b052b2b4 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -840,7 +840,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) { pAddonMenu = framework::AddonMenuManager::CreateAddonMenu( xFrame ); } - catch ( ::com::sun::star::lang::WrappedTargetException ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } @@ -899,7 +899,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) // ggf. Pick-Menu erzeugen if ( pParent && pSVMenu == pParent->pPickMenu ) { - SfxPickList::Get()->CreateMenuEntries( pParent->pPickMenu ); + SfxPickList::Get().CreateMenuEntries( pParent->pPickMenu ); } else pPickMenu = pSVMenu->GetPopupMenu(SID_PICKLIST); @@ -1068,7 +1068,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) } else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST ) { - SfxPickList::Get()->ExecuteMenuEntry( nSlotId ); + SfxPickList::Get().ExecuteMenuEntry( nSlotId ); return sal_True; } diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 9d1031034a7a..31c0850f873e 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -31,6 +31,7 @@ #include <stdio.h> #include <boost/unordered_map.hpp> +#include <boost/shared_ptr.hpp> #include "sfx2/imgmgr.hxx" #include <sfx2/sfx.hrc> @@ -60,54 +61,46 @@ struct ToolBoxInf_Impl class SfxImageManager_Impl { public: - sal_Int16 m_nSymbolsSize; SvtMiscOptions m_aOpt; std::vector< ToolBoxInf_Impl* > m_aToolBoxes; + sal_Int16 m_nSymbolsSize; ImageList* m_pImageList[IMAGELIST_COUNT]; SfxModule* m_pModule; + bool m_bAppEventListener; ImageList* GetImageList( bool bBig ); Image GetImage( sal_uInt16 nId, bool bBig ); void SetSymbolsSize_Impl( sal_Int16 ); DECL_LINK( OptionsChanged_Impl, void* ); - DECL_LINK( SettingsChanged_Impl, void* ); + DECL_LINK( SettingsChanged_Impl, VclWindowEvent* ); SfxImageManager_Impl( SfxModule* pModule ); ~SfxImageManager_Impl(); }; -typedef boost::unordered_map< sal_Int64, sal_Int64 > SfxImageManagerMap; - -// global image lists -static SfxImageManager_Impl* pGlobalImageManager = 0; -static SfxImageManagerMap m_ImageManager_ImplMap; -static SfxImageManagerMap m_ImageManagerMap; - static SfxImageManager_Impl* GetImageManager( SfxModule* pModule ) { SolarMutexGuard aGuard; if ( pModule == 0 ) { - if ( !pGlobalImageManager ) - pGlobalImageManager = new SfxImageManager_Impl( 0 ); - return pGlobalImageManager; + static SfxImageManager_Impl aGlobalImageManager(0); + return &aGlobalImageManager; } else { + typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap; + static SfxImageManagerImplMap m_ImageManager_ImplMap; SfxImageManager_Impl* pImpl( 0 ); - SfxImageManagerMap::const_iterator pIter = m_ImageManager_ImplMap.find( sal::static_int_cast< sal_Int64>( reinterpret_cast< sal_IntPtr >( pModule ))); + SfxImageManagerImplMap::const_iterator pIter = m_ImageManager_ImplMap.find(pModule); if ( pIter != m_ImageManager_ImplMap.end() ) - pImpl = reinterpret_cast< SfxImageManager_Impl* >( sal::static_int_cast< sal_IntPtr >( pIter->second )); + pImpl = pIter->second.get(); else { - pImpl = new SfxImageManager_Impl( pModule ); - m_ImageManager_ImplMap.insert( - SfxImageManagerMap::value_type( - sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule )), - sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pImpl )) )); + m_ImageManager_ImplMap[pModule].reset(new SfxImageManager_Impl(pModule)); + pImpl = m_ImageManager_ImplMap[pModule].get(); } return pImpl; } @@ -145,15 +138,18 @@ static sal_Int16 impl_convertBools( sal_Bool bLarge ) //========================================================================= -SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) : - m_nSymbolsSize( SvtMiscOptions().GetCurrentSymbolsSize() ), - m_pModule( pModule ) +SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) + : m_pModule(pModule) + , m_bAppEventListener(false) { + m_nSymbolsSize = m_aOpt.GetCurrentSymbolsSize(); + for ( sal_uInt32 i = 0; i < IMAGELIST_COUNT; i++ ) m_pImageList[i] = 0; m_aOpt.AddListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) ); Application::AddEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); + m_bAppEventListener = true; } //------------------------------------------------------------------------- @@ -161,8 +157,8 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) : SfxImageManager_Impl::~SfxImageManager_Impl() { m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) ); - Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); - + if (m_bAppEventListener) + Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); for ( sal_uInt32 i = 0; i < m_aToolBoxes.size(); i++ ) delete m_aToolBoxes[i]; } @@ -243,18 +239,37 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) IMPL_LINK( SfxImageManager_Impl, OptionsChanged_Impl, void*, EMPTYARG ) { - SetSymbolsSize_Impl( SvtMiscOptions().GetCurrentSymbolsSize() ); + SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); return 0L; } //------------------------------------------------------------------------- -IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, void*, EMPTYARG ) +IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent) { - // Check if toolbar button size have changed and we have to use system settings - sal_Int16 nSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); - if ( m_nSymbolsSize != nSymbolsSize ) - SetSymbolsSize_Impl( nSymbolsSize ); + if (pEvent) + { + switch (pEvent->GetId()) + { + case VCLEVENT_OBJECT_DYING: + if (m_bAppEventListener) + { + Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); + m_bAppEventListener = false; + } + break; + case VCLEVENT_APPLICATION_DATACHANGED: + // Check if toolbar button size have changed and we have to use system settings + { + sal_Int16 nSymbolsSize = m_aOpt.GetCurrentSymbolsSize(); + if (m_nSymbolsSize != nSymbolsSize) + SetSymbolsSize_Impl(nSymbolsSize); + } + break; + default: + break; + } + } return 0L; } @@ -278,19 +293,20 @@ SfxImageManager::~SfxImageManager() SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule ) { SolarMutexGuard aGuard; + SfxImageManager* pSfxImageManager(0); + + typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap; + static SfxImageManagerMap m_ImageManagerMap; - SfxImageManagerMap::const_iterator pIter = - m_ImageManagerMap.find( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule ))); + SfxImageManagerMap::const_iterator pIter = m_ImageManagerMap.find(pModule); if ( pIter != m_ImageManagerMap.end() ) - return reinterpret_cast< SfxImageManager* >( sal::static_int_cast< sal_IntPtr >( pIter->second )); + pSfxImageManager = pIter->second.get(); else { - SfxImageManager* pSfxImageManager = new SfxImageManager( pModule ); - m_ImageManagerMap.insert( SfxImageManagerMap::value_type( - sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule )), - sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pSfxImageManager )) )); - return pSfxImageManager; + m_ImageManagerMap[pModule].reset(new SfxImageManager(pModule)); + pSfxImageManager = m_ImageManagerMap[pModule].get(); } + return pSfxImageManager; } //------------------------------------------------------------------------- diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 938165549bf4..7b429e5bcf58 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -48,7 +48,7 @@ #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> -// wg. pTopFrames +// due to pTopFrames #include "appdata.hxx" #include <sfx2/app.hxx> #include <sfx2/event.hxx> diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 2ed26e48cde3..b33684a4e6f4 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -491,26 +491,22 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller, if ( pGroupToDelete ) { sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) ); - sal_uInt16 nToDeleteNum = 0; - SvLBoxEntry **pEntriesToDelete = new SvLBoxEntry*[nItemNum]; + typedef std::deque<SvLBoxEntry*> BoxEntries; + BoxEntries pEntriesToDelete; sal_uInt16 nInd = 0; for ( nInd = 0; nInd < nItemNum; nInd++ ) - pEntriesToDelete[nInd] = NULL; - - for ( nInd = 0; nInd < nItemNum; nInd++ ) { // TODO/LATER: check that nInd is the same index that is used in pTemplates if ( pTemplates->Delete( nRegion, nInd ) ) { bModified = 1; - pEntriesToDelete[nToDeleteNum++] = pCaller->SvLBox::GetEntry( pGroupToDelete, nInd ); + pEntriesToDelete.push_back( pCaller->SvLBox::GetEntry( pGroupToDelete, nInd ) ); } } - for ( nInd = 0; nInd < nToDeleteNum; nInd++ ) - if ( pEntriesToDelete[nInd] ) - pCaller->GetModel()->Remove( pEntriesToDelete[nInd] ); + for ( BoxEntries::const_iterator aIt( pEntriesToDelete.begin() ), aEnd( pEntriesToDelete.end() ); aIt != aEnd; ++aIt ) + pCaller->GetModel()->Remove( *aIt ); if ( !pCaller->GetModel()->GetChildCount( pGroupToDelete ) ) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 6895190d0c32..f7950f650e5d 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -3110,9 +3110,9 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) if ( !aMiscOptions.IsExperimentalMode() || ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) ) { - rSet.DisableItem( nWhich ); - rSet.Put(SfxVisibilityItem(nWhich, sal_False)); - break; + rSet.DisableItem( nWhich ); + rSet.Put(SfxVisibilityItem(nWhich, sal_False)); + break; } ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier")); diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx index 7f4f45f4e6e7..7f67b65d698c 100644 --- a/sfx2/workben/custompanel/ctp_services.cxx +++ b/sfx2/workben/custompanel/ctp_services.cxx @@ -74,7 +74,7 @@ namespace sd { namespace colortoolpanel extern "C" { //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -86,7 +86,7 @@ extern "C" } //------------------------------------------------------------------------------------------------------------------ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries ); } diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 915d26aba006..37de9ca89368 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -33,9 +33,7 @@ #pragma warning (disable : 4786 4503 4917) #endif -#ifndef OS2 #include <tchar.h> -#endif #ifdef _AMD64_ #define MODULE_NAME TEXT("shlxthdl_x64.dll") diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx index 3d1650c559bc..6a7dc594af60 100644 --- a/shell/inc/internal/contentreader.hxx +++ b/shell/inc/internal/contentreader.hxx @@ -38,7 +38,6 @@ class CContentReader : public CBaseReader public: virtual ~CContentReader(); - //CContentReader( const std::string& DocumentName ); CContentReader( const std::string& DocumentName, LocaleSet_t const & DocumentLocale ); CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa ); diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx deleted file mode 100644 index 0fe72b4aceb2..000000000000 --- a/shell/inc/internal/dbgmacros.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- 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 - * - * 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. - * - ************************************************************************/ - -#ifndef DBGMACROS_HXX_INCLUDED -#define DBGMACROS_HXX_INCLUDED - -void DbgAssert(bool condition, const char* message); - -#if OSL_DEBUG_LEVEL > 0 - #define PRE_CONDITION(x, msg) DbgAssert(x, msg) - #define POST_CONDITION(x, msg) DbgAssert(x, msg) - #define ENSURE(x ,msg) DbgAssert(x, msg) -#else // OSL_DEBUG_LEVEL == 0 - #define PRE_CONDITION(x, msg) ((void)0) - #define POST_CONDITION(x, msg) ((void)0) - #define ENSURE(x, msg) ((void)0) -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx index b711c34b8b1d..a87510958f08 100644 --- a/shell/inc/internal/global.hxx +++ b/shell/inc/internal/global.hxx @@ -32,13 +32,10 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif -#ifndef OS2 #include <windows.h> -#endif #if defined _MSC_VER #pragma warning(pop) #endif -#include "internal/dbgmacros.hxx" extern long g_DllRefCnt; diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx index af0844d2654f..710efc062ab5 100644 --- a/shell/inc/internal/i_xml_parser_event_handler.hxx +++ b/shell/inc/internal/i_xml_parser_event_handler.hxx @@ -44,7 +44,6 @@ typedef std::map<string_t, string_t> xml_tag_attribute_container_t; -//######################################### class i_xml_parser_event_handler { public: diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index bf6c5d1536f7..a806d02768dd 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -41,13 +41,10 @@ typedef std::vector<std::wstring> StringList_t; //+------------------------------------------------------------------------- -// // Declare: XmlTagAttributes_t, xml tag attribute struct // XmlTag_t, xml tag including content and attributes. // XmlTags_t, tags defined with tag name and xml tag. -// // Contents: Definitions of xml tag used in parser. -// //-------------------------------------------------------------------------- typedef std::wstring Name_t; typedef std::wstring Value_t; @@ -60,13 +57,10 @@ typedef std::map<Name_t, XmlTag_t> XmlTags_t; const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t()); //+------------------------------------------------------------------------- -// // Declare: Language_t, language of the Locale pair // Country_t, country of the Local pair // LocaleSet_t, Local pair -// // Contents: Definitions of Chunk properties. -// //-------------------------------------------------------------------------- typedef ::std::wstring Language_t; typedef ::std::wstring Country_t; @@ -80,12 +74,9 @@ const LocaleSet_t EMPTY_LOCALE = ::std::make_pair(::std::wstring(), ::std::wstri const Chunk_t EMPTY_CHUNK = ::std::make_pair( EMPTY_LOCALE, ::std::wstring()); //+------------------------------------------------------------------------- -// // Declare: StyleName_t, style name of a style-locale pair. // StyleLocaleMap, the map of Styple-Locale pair. -// // Contents: Definitions of Style Names. -// //-------------------------------------------------------------------------- typedef ::std::wstring StyleName_t; typedef ::std::pair <StyleName_t, LocaleSet_t> StyleLocalePair_t; diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index fd608d6d4870..2697c8002dc6 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -33,9 +33,7 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif -#ifndef OS2 #include <windows.h> -#endif #if defined _MSC_VER #pragma warning(pop) #endif @@ -91,9 +89,7 @@ bool HasOnlySpaces(const std::wstring& String); std::wstring getShortPathName( const std::wstring& aLongName ); -#ifndef OS2 LCID LocaleSetToLCID( const LocaleSet_t & Locale ); -#endif //---------------------------------------------------------- #ifdef DEBUG diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index d57110deaf29..fbf7cf2e03ce 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -66,13 +66,10 @@ class i_xml_parser_event_handler; class xml_parser { public: - //######################################################## xml_parser(const XML_Char* EncodingName = 0); - //######################################################## ~xml_parser(); - //######################################################## /** Parse a XML data stream @param pXmlData @@ -94,7 +91,6 @@ public: contains detailed information about the error. */ void parse(const char* XmlData, size_t Length, bool IsFinal = true); - //######################################################## /** Set a document handler @descr A document handler implements the interface i_xml_parser_event_handler. @@ -113,7 +109,6 @@ public: @postcond currently used document handler == pSaxDocumentHandler */ void set_document_handler(i_xml_parser_event_handler* event_handler); - //######################################################## /** Returns the currently used document handler or null if no document handler was set before. */ i_xml_parser_event_handler* get_document_handler() const; diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx index e929989bff48..5ff98ff75972 100644 --- a/shell/qa/i_xml_parser_event_handler.hxx +++ b/shell/qa/i_xml_parser_event_handler.hxx @@ -43,7 +43,6 @@ typedef std::map<string_t, string_t> xml_tag_attribute_container_t; -//######################################### class i_xml_parser_event_handler { public: diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx index f90154e24727..e0907dbff486 100644 --- a/shell/qa/recent_docs.cxx +++ b/shell/qa/recent_docs.cxx @@ -39,14 +39,12 @@ #include <stdlib.h> #include <iostream> -//######################################## using namespace osl; using ::rtl::OUString; namespace syssh = SystemShell; -//######################################## const OUString SXW_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.writer")); const OUString SXC_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.calc")); const OUString SXI_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress")); @@ -218,7 +216,6 @@ public: }; -//##################################### // register test suites CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs, "Test_AddToRecentDocs"); diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk index 66b185132fa6..b4cc34a42601 100755 --- a/shell/source/all/makefile.mk +++ b/shell/source/all/makefile.mk @@ -47,9 +47,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS_X64+=-D_WIN32_IE=0x501 .ENDIF # "$(BUILD_X64)"!="" .ENDIF -.IF "$(GUI)" == "OS2" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE -.ENDIF # --- Files -------------------------------------------------------- @@ -58,7 +55,7 @@ CFLAGS+=-DSYSTEM_EXPAT .ENDIF SLOFILES=$(SLO)$/xml_parser.obj - + .IF "$(BUILD_X64)"!="" SLOFILES_X64=$(SLO_X64)$/xml_parser.obj .ENDIF # "$(BUILD_X64)"!="" diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx index 39752fe70515..1b8c1391f8cc 100644 --- a/shell/source/all/ooofilereader/basereader.cxx +++ b/shell/source/all/ooofilereader/basereader.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" + +#include <osl/diagnose.h> + #include "internal/basereader.hxx" #include "internal/xml_parser.hxx" @@ -43,8 +46,6 @@ m_ZipFile( DocumentName ) } //------------------------------ -// -//------------------------------ CBaseReader::CBaseReader(void * sw, zlib_filefunc_def* fa): m_ZipFile( sw , fa ) @@ -52,24 +53,18 @@ m_ZipFile( sw , fa ) } //------------------------------ -// -//------------------------------ CBaseReader::~CBaseReader() { } //------------------------------ -// -//------------------------------ void CBaseReader::start_document() { } //------------------------------ -// -//------------------------------ void CBaseReader::end_document() { @@ -96,11 +91,11 @@ void CBaseReader::Initialize( const std::string& ContentName) #endif ) { - ENSURE( false, ex.what() ); + OSL_ENSURE( false, ex.what() ); } catch(...) { - ENSURE(false, "Unknown error"); + OSL_ENSURE(false, "Unknown error"); } } diff --git a/shell/source/all/ooofilereader/contentreader.cxx b/shell/source/all/ooofilereader/contentreader.cxx index 360d3dcfd3b6..e0213839cc9d 100644 --- a/shell/source/all/ooofilereader/contentreader.cxx +++ b/shell/source/all/ooofilereader/contentreader.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" + +#include <osl/diagnose.h> + #include "internal/contentreader.hxx" #include "dummytag.hxx" #include "simpletag.hxx" @@ -51,11 +54,11 @@ CBaseReader( DocumentName ) #endif ) { - ENSURE(false, ex.what()); + OSL_ENSURE(false, ex.what()); } catch(...) { - ENSURE(false, "Unknown error"); + OSL_ENSURE(false, "Unknown error"); } } @@ -73,11 +76,11 @@ try #endif ) { - ENSURE(false, ex.what()); + OSL_ENSURE(false, ex.what()); } catch(...) { - ENSURE(false, "Unknown error"); + OSL_ENSURE(false, "Unknown error"); } } diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk index bf6365526eec..67d29acaaf85 100755 --- a/shell/source/all/ooofilereader/makefile.mk +++ b/shell/source/all/ooofilereader/makefile.mk @@ -36,17 +36,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(GUI)" != "OS2" CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS_X64+=-D_WIN32_IE=0x501 -.ENDIF -.IF "$(GUI)" == "OS2" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE -.ENDIF # --- Files -------------------------------------------------------- diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx index be6ad746569d..71be05505127 100644 --- a/shell/source/all/ooofilereader/metainforeader.cxx +++ b/shell/source/all/ooofilereader/metainforeader.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" + +#include <osl/diagnose.h> + #include "internal/metainforeader.hxx" #include "dummytag.hxx" #include "simpletag.hxx" @@ -70,11 +73,11 @@ CBaseReader( DocumentName ) #endif ) { - ENSURE(false, ex.what()); + OSL_ENSURE(false, ex.what()); } catch(...) { - ENSURE(false, "Unknown error"); + OSL_ENSURE(false, "Unknown error"); } } @@ -111,11 +114,11 @@ try #endif ) { - ENSURE(false, ex.what()); + OSL_ENSURE(false, ex.what()); } catch(...) { - ENSURE(false, "Unknown error"); + OSL_ENSURE(false, "Unknown error"); } } diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index 71665ce9fd0d..10d7f88a8580 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -37,7 +37,6 @@ namespace /* private */ { - //###################################################### /* Extracts the local part of tag without namespace decoration e.g. meta:creator -> creator */ const XML_Char COLON = (XML_Char)':'; @@ -60,14 +59,12 @@ namespace /* private */ return p; } - //################################################ inline xml_parser* get_parser_instance(void* data) { return reinterpret_cast<xml_parser*>(XML_GetUserData( reinterpret_cast<XML_Parser>(data))); } - //################################################ bool has_only_whitespaces(const XML_Char* s, int len) { const XML_Char* p = s; @@ -77,7 +74,6 @@ namespace /* private */ } } -//################################################### xml_parser::xml_parser(const XML_Char* EncodingName) : document_handler_(0), xml_parser_(XML_ParserCreate(EncodingName)) @@ -85,17 +81,14 @@ xml_parser::xml_parser(const XML_Char* EncodingName) : init(); } -//################################################### xml_parser::~xml_parser() { XML_ParserFree(xml_parser_); } -//################################################### /* Callback functions will be called by the parser on different events */ -//################################################### extern "C" { @@ -123,7 +116,6 @@ static void xml_start_element_handler(void* UserData, const XML_Char* name, cons } } -//################################################### static void xml_end_element_handler(void* UserData, const XML_Char* name) { assert(UserData); @@ -134,7 +126,6 @@ static void xml_end_element_handler(void* UserData, const XML_Char* name) pDocHdl->end_element(reinterpret_cast<const char_t*>(name), reinterpret_cast<const char_t*>(get_local_name(name))); } -//################################################### static void xml_character_data_handler(void* UserData, const XML_Char* s, int len) { assert(UserData); @@ -150,7 +141,6 @@ static void xml_character_data_handler(void* UserData, const XML_Char* s, int le } } -//################################################### static void xml_comment_handler(void* UserData, const XML_Char* Data) { assert(UserData); @@ -163,7 +153,6 @@ static void xml_comment_handler(void* UserData, const XML_Char* Data) } // extern "C" -//################################################### void xml_parser::init() { XML_SetUserData(xml_parser_, this); @@ -188,7 +177,6 @@ void xml_parser::init() xml_comment_handler); } -//################################################### void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal) { if (0 == XML_Parse(xml_parser_, XmlData, Length, IsFinal)) @@ -200,14 +188,12 @@ void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal) XML_GetCurrentByteIndex(xml_parser_)); } -//################################################### void xml_parser::set_document_handler( i_xml_parser_event_handler* event_handler) { document_handler_ = event_handler; } -//################################################### i_xml_parser_event_handler* xml_parser::get_document_handler() const { return document_handler_; diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx index c5501d5b6213..5a5dcefc16ea 100644 --- a/shell/source/all/zipfile/zipexcptn.cxx +++ b/shell/source/all/zipfile/zipexcptn.cxx @@ -84,10 +84,8 @@ Win32Exception::Win32Exception(int Error) : */ Win32Exception::~Win32Exception() throw() { -#ifndef OS2 if (m_MsgBuff) LocalFree(m_MsgBuff); -#endif } //------------------------------------------ @@ -95,9 +93,6 @@ Win32Exception::~Win32Exception() throw() */ const char* Win32Exception::what() const throw() { -#ifdef OS2 - return "Win32Exception!"; -#else FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | @@ -110,7 +105,6 @@ const char* Win32Exception::what() const throw() NULL); return reinterpret_cast<char*>(m_MsgBuff); -#endif } //------------------------------------------ diff --git a/shell/source/all/zipfile/zipexcptn.hxx b/shell/source/all/zipfile/zipexcptn.hxx index 80ddfe9702bc..0b635448f482 100644 --- a/shell/source/all/zipfile/zipexcptn.hxx +++ b/shell/source/all/zipfile/zipexcptn.hxx @@ -1,7 +1,5 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // ZipException.h: interface for the ZipException class. -// -////////////////////////////////////////////////////////////////////// #ifndef ZIPEXCPTN_HXX_INCLUDED #define ZIPEXCPTN_HXX_INCLUDED diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx index 0b4ac7fd7fc2..c7ed65e5d177 100644 --- a/shell/source/all/zipfile/zipfile.cxx +++ b/shell/source/all/zipfile/zipfile.cxx @@ -38,12 +38,6 @@ #include <string.h> -#ifdef OS2 -#include <alloca.h> -#define _alloca alloca -#define ERROR_NOT_ENOUGH_MEMORY 8 -#endif - namespace internal { /* for case in-sensitive string comparison */ diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 61f37d9eef24..6fd80da7425f 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -277,12 +277,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 711f41dc7dff..ffd1aeacb145 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -228,12 +228,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 706785c50e53..018003ccb8ff 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -245,12 +245,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 0c374460a2ed..8ff27ebe6fc3 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -245,12 +245,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 340b4cf4fc06..cc929756f495 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -63,7 +63,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) { *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; @@ -71,7 +71,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" void *component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 584b4d3452d8..3c7b42e1e110 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -64,7 +64,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) { *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -72,7 +72,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 9cec4c199445..925193114b28 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -64,7 +64,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) { *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; @@ -72,7 +72,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" void *component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 578d67c85db6..a044dc49cf5f 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -57,8 +57,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -69,7 +67,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" @@ -79,7 +77,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -89,7 +87,7 @@ void SAL_CALL component_getImplementationEnvironment( // component_getFactory //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) { Reference< XSingleComponentFactory > xFactory; diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 6b0a37d31c21..36c934c85033 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -55,8 +55,6 @@ using namespace com::sun::star::uno; //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) throw (RuntimeException) @@ -66,8 +64,6 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ ::rtl::OUString SAL_CALL CmdMailMsg::getRecipient( ) throw (RuntimeException) @@ -77,8 +73,6 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) @@ -88,8 +82,6 @@ void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipie } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( ) throw (RuntimeException) @@ -99,8 +91,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) @@ -110,8 +100,6 @@ void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecip } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( ) throw (RuntimeException) @@ -121,8 +109,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) @@ -132,8 +118,6 @@ void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CmdMailMsg::getOriginator( ) throw (RuntimeException) @@ -143,8 +127,6 @@ OUString SAL_CALL CmdMailMsg::getOriginator( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) @@ -154,8 +136,6 @@ void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CmdMailMsg::getSubject( ) throw (RuntimeException) @@ -165,8 +145,6 @@ OUString SAL_CALL CmdMailMsg::getSubject( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachment ) throw (IllegalArgumentException, RuntimeException) @@ -176,8 +154,6 @@ void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAt } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( ) throw (RuntimeException) @@ -187,8 +163,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( ) } //------------------------------------------------ -// -//------------------------------------------------ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) @@ -218,8 +192,6 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) throw (::com::sun::star::uno::RuntimeException) @@ -252,8 +224,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) } //------------------------------------------------ -// -//------------------------------------------------ sal_Bool SAL_CALL CmdMailMsg::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) @@ -282,8 +252,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) } //------------------------------------------------ -// -//------------------------------------------------ Type SAL_CALL CmdMailMsg::getElementType( ) throw (RuntimeException) @@ -293,8 +261,6 @@ Type SAL_CALL CmdMailMsg::getElementType( ) } //------------------------------------------------ -// -//------------------------------------------------ sal_Bool SAL_CALL CmdMailMsg::hasElements( ) throw (RuntimeException) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index a01d75253726..2bd36e9e9e8d 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -95,8 +95,6 @@ namespace // private } // end private namespace //------------------------------------------------- -// -//------------------------------------------------- CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index c31685ac3ea5..350bb7949223 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -37,9 +37,7 @@ /** Simple command line abstraction */ -//################################ // Creation -//################################ CommandLine::CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix) : @@ -50,9 +48,7 @@ CommandLine::CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix } -//################################ // Query -//################################ /** Return the argument count @@ -144,9 +140,7 @@ std::string CommandLine::get_arg(const std::string& ArgumentName) const } -//################################ // Command -//################################ /** Set the prefix used to identify arguments in diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index c12f0fb31aba..efee314fa9e0 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -12,17 +12,13 @@ class CommandLine { public: - //################################ // Creation - //################################ CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix = std::string("-")); - //################################ // Query - //################################ /** Return the argument count @@ -70,9 +66,7 @@ public: std::string get_arg(const std::string& ArgumentName) const; - //################################ // Command - //################################ /** Set the prefix used to identify arguments in diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index ada243f1edd4..364ac49ba4bd 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -69,7 +69,6 @@ namespace /* private */ using rtl::OUString; using rtl::OString; -//########################################### void ShowUsage() { std::cout << "Usage: -ulf ulf_file -rc rc_output_file -rct rc_template_file -rch rch_file -rcf rcf_file" << std::endl; @@ -80,15 +79,12 @@ void ShowUsage() std::cout << "-rcf Name of the resource file footer" << std::endl; } -//########################################### inline OUString OStringToOUString(const OString& str) { return rtl::OStringToOUString(str, osl_getThreadTextEncoding()); } -//########################################### inline OString OUStringToOString(const OUString& str) { return rtl::OUStringToOString(str, osl_getThreadTextEncoding()); } -//########################################### /** Get the directory where the module is located as system directory, the returned directory has a trailing '\' */ @@ -102,7 +98,6 @@ OUString get_module_path() return module_path; } -//########################################### /** Make the absolute directory of a base and a relative directory, if the relative directory is absolute the the relative @@ -128,7 +123,6 @@ OUString get_absolute_path( return abs_sys_path; } -//########################################### OString get_absolute_file_path(const std::string& file_name) { OUString fp = get_absolute_path( @@ -136,7 +130,6 @@ OString get_absolute_file_path(const std::string& file_name) return OUStringToOString(fp); } -//########################################### /** A helper class, enables stream exceptions on construction, restors the old exception state on destruction */ @@ -163,7 +156,6 @@ private: typedef std::vector<std::string> string_container_t; -//########################################### class iso_lang_identifier { public: @@ -209,7 +201,6 @@ private: OString country_; }; -//########################################### /** Convert a OUString to the MS resource file format string e.g. OUString -> L"\x1A00\x2200\x3400" */ @@ -228,14 +219,12 @@ std::string make_winrc_unicode_string(const OUString& str) return oss.str(); } -//########################################### std::string make_winrc_unicode_string(const std::string& str) { return make_winrc_unicode_string( OUString::createFromAscii(str.c_str())); } -//################################################ /** A replacement table contains pairs of placeholders and the appropriate substitute */ class Substitutor @@ -323,7 +312,6 @@ private: typedef std::map< unsigned short , std::string , std::less< unsigned short > > shortmap; -//########################################### void add_group_entries( Config& aConfig, const ByteString& GroupName, @@ -365,7 +353,6 @@ void add_group_entries( } } -//########################################### void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) { // work-around for #i32420# @@ -405,7 +392,6 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) throw; } - //Config config(OStringToOUString(FileName.c_str()).getStr()); // end work-around for #i32420# @@ -415,7 +401,6 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) add_group_entries(config, config.GetGroupName(sal::static_int_cast<USHORT>(i)), Substitutor); } -//########################################### void read_file( const std::string& fname, string_container_t& string_container) @@ -436,7 +421,6 @@ void read_file( } } -//########################################### /** A simple helper function that appens the content of one file to another one */ void concatenate_files(std::ostream& os, std::istream& is) @@ -457,7 +441,6 @@ void concatenate_files(std::ostream& os, std::istream& is) } } -//########################################### bool is_placeholder(const std::string& str) { return ((str.length() > 1) && @@ -465,7 +448,6 @@ bool is_placeholder(const std::string& str) ('%' == str[str.length() - 1])); } -//########################################### void start_language_section( std::ostream_iterator<std::string>& ostream_iter, const iso_lang_identifier& iso_lang) { @@ -482,7 +464,7 @@ void start_language_section( // Esp. for spanish we don't want to distinguish between trad. // and internatinal sorting ( which leads to two different sub languages ) // Setting the sub language to neutral allows us to use one - // stringlist for all spanish variants ( see #123126# ) + // stringlist for all spanish variants if ( ( primLangID == LANG_SPANISH ) && ( subLangID == SUBLANG_SPANISH ) ) subLangID = SUBLANG_NEUTRAL; @@ -498,7 +480,6 @@ void start_language_section( ostream_iter = lang_section; } -//########################################### /** Iterate all languages in the substitutor, replace the all placeholder and append the result to the output file */ @@ -533,7 +514,7 @@ void inflate_rc_template_to_file( iss >> token; substitutor.substitute(token); - // #110274# HACK for partially merged + // HACK for partially merged // *.lng files where some strings have // a particular language that others // don't have in order to keep the @@ -551,7 +532,6 @@ void inflate_rc_template_to_file( } // namespace /* private */ -//#################################################### /* MAIN The file names provided via command line should be absolute or relative to the directory of this module. diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk index 1a26d377b142..4f07341f4dde 100755 --- a/shell/source/unix/exec/makefile.mk +++ b/shell/source/unix/exec/makefile.mk @@ -46,20 +46,16 @@ DLLPRE= SLOFILES=$(SLO)$/shellexec.obj\ $(SLO)$/shellexecentry.obj - + SHL1OBJS=$(SLOFILES) - + SHL1TARGET=syssh.uno -.IF "$(GUI)" == "OS2" -SHL1IMPLIB=i$(TARGET) -.ELSE SHL1IMPLIB= -.ENDIF SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) - + SHL1STDLIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB) diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 3ec2536af2ff..6629983fb410 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -93,18 +93,14 @@ void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL) { // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\' sal_Char c = rURL[n]; -#ifndef OS2 // YD shell does not support escaped chars if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' ) rBuffer.append( '\\' ); -#endif rBuffer.append( c ); } } //----------------------------------------------------------------------------------------- -// -//----------------------------------------------------------------------------------------- ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper2< XSystemShellExecute, XServiceInfo >(), @@ -129,8 +125,6 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : } //------------------------------------------------- -// -//------------------------------------------------- void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) @@ -204,19 +198,6 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar static_cast < XSystemShellExecute * > (this), ENOENT ); } -#ifdef OS2 - OStringBuffer aProg = OUStringToOString(aProgram, osl_getThreadTextEncoding()); - aProg.append("open-url.exe"); - OString aUrl = OUStringToOString(aURL, osl_getThreadTextEncoding()); - if ( -1 == spawnl(P_NOWAIT, aProg.getStr(), aProg.getStr(), aUrl.getStr() , NULL) ) - { - int nerr = errno; - throw SystemShellExecuteException(OUString::createFromAscii( strerror( nerr ) ), - static_cast < XSystemShellExecute * > (this), nerr ); - } - return; -#endif - OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding()); escapeForShell(aBuffer, aTmp); diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index d7816c2df66b..1abe558bb857 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -56,8 +56,6 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_REGKEY_NAME "/com.sun.star.comp.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -78,7 +76,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -88,7 +86,7 @@ void SAL_CALL component_getImplementationEnvironment( // component_getFactory //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) { Reference< XSingleComponentFactory > xFactory; diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c index b914cfcb7b5c..5fe39ea2dc3a 100755 --- a/shell/source/unix/misc/gnome-open-url.c +++ b/shell/source/unix/misc/gnome-open-url.c @@ -47,28 +47,6 @@ typedef enum { GNOME_VFS_OK } GnomeVFSResult; - -/* - * HACK: avoid error messages caused by not setting a GNOME program name - */ - -gchar* gnome_gconf_get_gnome_libs_settings_relative (const gchar *subkey) -{ - void* handle = dlopen("libglib-2.0.so.0", RTLD_LAZY); - - (void)subkey; /* avoid warning due to unused parameter */ - - if( NULL != handle ) - { - gchar* (* g_strdup)(const gchar*) = (gchar* (*)(const gchar*)) dlsym(handle, "g_strdup"); - - if( NULL != g_strdup) - return g_strdup("/apps/gnome-settings/gnome-open-url"); - } - - return NULL; -} - /* * Wrapper function which extracs gnome_url_show from libgnome */ diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index 6ad3797e6521..be4660db3e8c 100755 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -47,23 +47,6 @@ SCRIPTFILES = \ $(BIN)$/gnome-open-url \ $(BIN)$/kde-open-url -.IF "$(GUI)" == "OS2" - -APP1TARGET = open-url -APP1OBJS = \ - $(OBJ)$/open-url.obj \ - open-url.def -APP1LIBS = - -APP2TARGET = senddoc -APP2OBJS = \ - $(OBJ)$/senddoc.obj \ - senddoc.def -APP2LIBS = -APP2STDLIBS = - -.ELSE - APP1TARGET = gnome-open-url.bin APP1OBJS = \ $(OBJ)$/gnome-open-url.obj @@ -79,7 +62,6 @@ APP2LIBS = APP2STDLIBS = OBJFILES = $(APP1OBJS) $(APP2OBJS) -.ENDIF # --- Targets ------------------------------------------------------ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index 2656fdb8557e..60605ef0f3ff 100755 --- a/shell/source/unix/sysshell/makefile.mk +++ b/shell/source/unix/sysshell/makefile.mk @@ -48,11 +48,6 @@ SLOFILES=$(SLO)$/recently_used_file.obj \ $(SLO)$/recently_used_file_handler.obj SHL1TARGET=recentfile -.IF "$(GUI)" == "OS2" -SHL1IMPLIB=i$(TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -.ENDIF SHL1STDLIBS=$(EXPATASCII3RDLIB)\ $(SALLIB) diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx index b34da5bc86ae..da2c1865e9b3 100644 --- a/shell/source/unix/sysshell/recently_used_file.hxx +++ b/shell/source/unix/sysshell/recently_used_file.hxx @@ -32,7 +32,6 @@ #include <stdio.h> #include <unistd.h> -//################################## // simple wrapper around the recently_used_file class recently_used_file diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index b34bb3ad81a3..262cc34eb647 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -47,7 +47,6 @@ #include <string.h> namespace /* private */ { - //######################################## typedef std::vector<string_t> string_container_t; #define TAG_RECENT_FILES "RecentFiles" @@ -219,11 +218,9 @@ namespace /* private */ { typedef std::vector<recently_used_item*> recently_used_item_list_t; typedef void (recently_used_item::* SET_COMMAND)(const string_t&); - //######################################## // thrown if we encounter xml tags that we do not know class unknown_xml_format_exception {}; - //######################################## class recently_used_file_filter : public i_xml_parser_event_handler { public: @@ -475,7 +472,6 @@ namespace /* private */ { } // namespace private -//########################################### /* example (see http::www.freedesktop.org): <?xml version="1.0"?> diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 46ca21240d57..c5ef891911bb 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -189,7 +189,6 @@ namespace // private #define E_UNKNOWN_EXEC_ERROR -1 //----------------------------------------- - //----------------------------------------- bool is_system_path(const OUString& path_or_uri) { @@ -219,7 +218,6 @@ namespace // private } //----------------------------------------- - //----------------------------------------- bool is_existing_file(const OUString& file_name) { @@ -261,8 +259,6 @@ namespace // private } // end namespace //----------------------------------------------------------------------------------------- -// -//----------------------------------------------------------------------------------------- CSysShExec::CSysShExec( ) : WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ) @@ -279,8 +275,6 @@ CSysShExec::CSysShExec( ) : } //------------------------------------------------- -// -//------------------------------------------------- void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 514b7f84375f..a0ef37868bb2 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -58,8 +58,6 @@ using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_REGKEY_NAME "/com.sun.star.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -70,7 +68,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" @@ -80,7 +78,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; @@ -91,7 +89,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 20ba047f3844..7234b2eca495 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" + +#include <osl/diagnose.h> + #include "internal/global.hxx" #include "classfactory.hxx" #include "internal/infotips.hxx" @@ -42,14 +45,10 @@ using ::std::min; #include "internal/shlxthdl.hxx" //----------------------------- -// -//----------------------------- long CClassFactory::s_ServerLocks = 0; //----------------------------- -// -//----------------------------- CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), @@ -59,8 +58,6 @@ CClassFactory::CClassFactory(const CLSID& clsid) : } //----------------------------- -// -//----------------------------- CClassFactory::~CClassFactory() { @@ -87,8 +84,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) { @@ -96,8 +91,6 @@ ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CClassFactory::Release(void) { @@ -135,7 +128,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( else if (CLSID_THUMBVIEWER_HANDLER == m_Clsid) pUnk = static_cast<IExtractImage*>(new CThumbviewer()); - POST_CONDITION(pUnk != 0, "Could not create COM object"); + OSL_POSTCOND(pUnk != 0, "Could not create COM object"); if (0 == pUnk) return E_OUTOFMEMORY; @@ -149,8 +142,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { @@ -163,8 +154,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) } //----------------------------- -// -//----------------------------- bool CClassFactory::IsLocked() { diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 7531d14eb9ba..80f98b5a3119 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -39,8 +39,6 @@ #include <malloc.h> //---------------------------- -// -//---------------------------- namespace /* private */ { @@ -58,8 +56,6 @@ namespace /* private */ } //---------------------------- -// -//---------------------------- CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) @@ -68,8 +64,6 @@ CColumnInfo::CColumnInfo(long RefCnt) : } //---------------------------- -// -//---------------------------- CColumnInfo::~CColumnInfo() { @@ -96,8 +90,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) { @@ -105,8 +97,6 @@ ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CColumnInfo::Release( void) { @@ -145,14 +135,11 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO ZeroMemory(psci->wszTitle, sizeof(psci->wszTitle)); wcsncpy(psci->wszTitle, ColumnInfoTable[dwIndex].wszTitle, (sizeof(psci->wszTitle) - 1)); - //wcscpy(psci->wszTitle, ColumnInfoTable[dwIndex].wszTitle); return S_OK; } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) { @@ -219,8 +206,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL } //----------------------------- -// -//----------------------------- bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const { diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index b88defc42aa5..8c6d701b6e25 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -50,8 +50,6 @@ const std::wstring WSPACE = std::wstring(SPACE); //----------------------------- -// -//----------------------------- CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) @@ -61,8 +59,6 @@ CInfoTip::CInfoTip(long RefCnt) : } //----------------------------- -// -//----------------------------- CInfoTip::~CInfoTip() { @@ -98,8 +94,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) { @@ -107,8 +101,6 @@ ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CInfoTip::Release( void) { @@ -285,7 +277,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } catch (const std::exception&) { - //return E_FAIL; } //display file size, no matter other infomation is loaded successfully or not. @@ -321,8 +312,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { @@ -358,7 +347,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ std::string fnameA = WStringToString(fname); - // #115531# // ZeroMemory because strncpy doesn't '\0'-terminates the destination // string; reserve the last place in the buffer for the final '\0' // that's why '(sizeof(m_szFileName) - 1)' @@ -369,8 +357,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) { @@ -378,8 +364,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/) { @@ -387,8 +371,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fReme } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) { @@ -396,8 +378,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileName*/) { diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 98289cb06420..91c7592ac3de 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -31,16 +31,12 @@ //-------------------------------------------------------------------------- // File: ooofilt.cxx -// // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service -// // Summary: The OpenOffice.org filter reads OpenOffice.org files (with the // extension .sxw .sxi, etc) and extract their content, author, // keywords,subject,comments and title to be filtered. -// // Platform: Windows 2000, Windows XP -// //-------------------------------------------------------------------------- #include "internal/contentreader.hxx" #include "internal/metainforeader.hxx" @@ -48,9 +44,7 @@ #include "internal/fileextensions.hxx" //-------------------------------------------------------------------------- -// // Include file Purpose -// // windows.h Win32 declarations // string.h string wstring declarations // filter.h IFilter interface declarations @@ -59,7 +53,6 @@ // assert.h assertion function. // ooofilt.hxx OpenOffice.org filter declarations // propspec.hxx PROPSPEC -// //-------------------------------------------------------------------------- #if defined _MSC_VER @@ -86,22 +79,14 @@ using ::std::min; #include "internal/stream_helper.hxx" //C------------------------------------------------------------------------- -// // Class: COooFilter -// // Summary: Implements OpenOffice.org filter class -// //-------------------------------------------------------------------------- //M------------------------------------------------------------------------- -// // Method: COooFilter::COooFilter -// // Summary: Class constructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilter::COooFilter() : m_lRefs(1), @@ -124,15 +109,10 @@ COooFilter::COooFilter() : InterlockedIncrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilter::~COooFilter -// // Summary: Class destructor -// // Arguments: void -// // Purpose: Manages global instance count and file handle -// //-------------------------------------------------------------------------- COooFilter::~COooFilter() { @@ -147,21 +127,16 @@ COooFilter::~COooFilter() } //M------------------------------------------------------------------------- -// // Method: COooFilter::QueryInterface (IUnknown::QueryInterface) -// // Summary: Queries for requested interface -// // Arguments: riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // Interface is supported // E_NOINTERFACE // Interface is not supported -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( REFIID riid, @@ -188,30 +163,20 @@ SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::AddRef (IUnknown::AddRef) -// // Summary: Increments interface refcount -// // Arguments: void -// // Returns: Value of incremented interface refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilter::AddRef() { return InterlockedIncrement( &m_lRefs ); } //M------------------------------------------------------------------------- -// // Method: COooFilter::Release (IUnknown::Release) -// // Summary: Decrements interface refcount, deleting if unreferenced -// // Arguments: void -// // Returns: Value of decremented interface refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilter::Release() { @@ -222,11 +187,8 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() return ulTmp; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Init (IFilter::Init) -// // Summary: Initializes OpenOffice.org filter instance -// // Arguments: grfFlags // [in] Flags for filter behavior // cAttributes @@ -235,7 +197,6 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() // [in] Array of requested attribute strings // pFlags // [out] Pointer to return flags for additional properties -// // Returns: S_OK // Initialization succeeded // E_FAIL @@ -246,7 +207,6 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() // Unable to access file to be filtered // FILTER_E_PASSWORD // (not implemented) -// //-------------------------------------------------------------------------- const int COUNT_ATTRIBUTES = 5; @@ -339,11 +299,8 @@ SCODE STDMETHODCALLTYPE COooFilter::Init( return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetChunk (IFilter::GetChunk) -// // Summary: Gets the next chunk -// // Arguments: ppStat // [out] Pointer to description of current chunk // Returns: S_OK @@ -360,7 +317,6 @@ SCODE STDMETHODCALLTYPE COooFilter::Init( // (not implemented) // FILTER_E_PASSWORD // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) { @@ -445,24 +401,19 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) }//for(;;) } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetText (IFilter::GetText) -// // Summary: Retrieves UNICODE text for index -// // Arguments: pcwcBuffer // [in] Pointer to size of UNICODE buffer // [out] Pointer to count of UNICODE characters returned // awcBuffer // [out] Pointer to buffer to receive UNICODE text -// // Returns: S_OK // Text successfully retrieved, but text remains in chunk // FILTER_E_NO_MORE_TEXT // All of the text in the current chunk has been returned // FILTER_S_LAST_TEXT // Next call to GetText will return FILTER_E_NO_MORE_TEXT -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffer) { @@ -496,17 +447,12 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe } } //M------------------------------------------------------------------------- -// // Method: GetMetaInfoNameFromPropertyId -// // Summary: helper function to convert PropertyID into respective // MetaInfo names. -// // Arguments: ulPropID // [in] property ID -// // Returns: corresponding metainfo names. -// //-------------------------------------------------------------------------- ::std::wstring GetMetaInfoNameFromPropertyId( ULONG ulPropID ) @@ -522,19 +468,14 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe } } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetValue (IFilter::GetValue) -// // Summary: Retrieves properites for index -// // Arguments: ppPropValue // [out] Address that receives pointer to property value -// // Returns: FILTER_E_NO_VALUES // Always // FILTER_E_NO_MORE_VALUES // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) @@ -569,23 +510,18 @@ SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) return E_FAIL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::BindRegion (IFilter::BindRegion) -// // Summary: Creates moniker or other interface for indicated text -// // Arguments: origPos // [in] Description of text location and extent // riid // [in] Reference IID of specified interface // ppunk // [out] Address that receives requested interface pointer -// // Returns: E_NOTIMPL // Always // FILTER_W_REGION_CLIPPED // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::BindRegion( @@ -597,14 +533,10 @@ SCODE STDMETHODCALLTYPE COooFilter::BindRegion( return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetClassID (IPersist::GetClassID) -// // Summary: Retrieves the class id of the filter class -// // Arguments: pClassID // [out] Pointer to the class ID of the filter -// // Returns: S_OK // Always // E_FAIL @@ -616,18 +548,13 @@ SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID) return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::IsDirty (IPersistFile::IsDirty) -// // Summary: Checks whether file has changed since last save -// // Arguments: void -// // Returns: S_FALSE // Always // S_OK // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::IsDirty() { @@ -635,24 +562,19 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty() return S_FALSE; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Load (IPersistFile::Load) -// // Summary: Opens and initializes the specified file -// // Arguments: pszFileName // [in] Pointer to zero-terminated string // of absolute path of file to open // dwMode // [in] Access mode to open the file -// // Returns: S_OK // File was successfully loaded // E_OUTOFMEMORY // File could not be loaded due to insufficient memory // E_FAIL // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) { @@ -677,22 +599,17 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Save (IPersistFile::Save) -// // Summary: Saves a copy of the current file being filtered -// // Arguments: pszFileName // [in] Pointer to zero-terminated string of // absolute path of where to save file // fRemember // [in] Whether the saved copy is made the current file -// // Returns: E_FAIL // Always // S_OK // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRemember*/) { @@ -700,18 +617,13 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRememb return E_FAIL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::SaveCompleted (IPersistFile::SaveCompleted) -// // Summary: Determines whether a file save is completed -// // Arguments: pszFileName // [in] Pointer to zero-terminated string of // absolute path where file was previously saved -// // Returns: S_OK // Always -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) { @@ -720,20 +632,13 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) } //M------------------------------------------------------------------------- -// // Method: COooFilter::Load (IPersistStream::Load) -// // Summary: Initializes an object from the stream where it was previously saved -// // Arguments: pStm // [in] Pointer to stream from which object should be loaded -// -// // Returns: S_OK // E_OUTOFMEMORY // E_FAIL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) { @@ -759,56 +664,37 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetSizeMax (IPersistStream::GetSizeMax) -// // Summary: Returns the size in bytes of the stream neede to save the object. -// // Arguments: pcbSize // [out] Pointer to a 64 bit unsigned int indicating the size needed -// // Returns: E_NOTIMPL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/) { - // return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Save (IPersistStream::Save) -// // Summary: Save object to specified stream -// // Arguments: pStm // [in] Pointer to stream -// // fClearDirty // [in] Indicates whether to clear dirty flag -// // Returns: E_NOTIMPL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL ) { - // return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetCurFile (IPersistFile::GetCurFile) -// // Summary: Returns a copy of the current file name -// // Arguments: ppszFileName // [out] Address to receive pointer to zero-terminated // string for absolute path to current file -// // Returns: S_OK // A valid absolute path was successfully returned // S_FALSE @@ -818,7 +704,6 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL ) // E_FAIL // Operation failed due to some reason // other than insufficient memory -// //------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName) { @@ -830,15 +715,10 @@ SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName) } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::COooFilterCF -// // Summary: Class factory constructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilterCF::COooFilterCF() : m_lRefs(1) @@ -846,36 +726,26 @@ COooFilterCF::COooFilterCF() : InterlockedIncrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::~COooFilterCF -// // Summary: Class factory destructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilterCF::~COooFilterCF() { InterlockedDecrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::QueryInterface (IUnknown::QueryInterface) -// // Summary: Queries for requested interface -// // Arguments: riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // Interface is supported // E_NOINTERFACE // Interface is not supported -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvObject) { @@ -895,30 +765,20 @@ SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvOb return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::AddRef (IUknown::AddRef) -// // Summary: Increments interface refcount -// // Arguments: void -// // Returns: Value of incremented interface refcount -// //------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilterCF::AddRef() { return InterlockedIncrement( &m_lRefs ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::Release (IUnknown::Release) -// // Summary: Decrements interface refcount, deleting if unreferenced -// // Arguments: void -// // Returns: Value of decremented refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilterCF::Release() { @@ -929,18 +789,14 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release() return ulTmp; } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::CreateInstance (IClassFactory::CreateInstance) -// // Summary: Creates new OpenOffice.org filter object -// // Arguments: pUnkOuter // [in] Pointer to IUnknown interface of aggregating object // riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // OpenOffice.org filter object was successfully created // CLASS_E_NOAGGREGATION @@ -952,7 +808,6 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release() // due to insufficient memory // E_UNEXPECTED // Unsuccessful due to an unexpected condition -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( IUnknown * pUnkOuter, @@ -982,14 +837,10 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::LockServer (IClassFactory::LockServer) -// // Summary: Forces/allows filter class to remain loaded/be unloaded -// // Arguments: fLock // [in] TRUE to lock, FALSE to unlock -// // Returns: S_OK // Always // E_FAIL @@ -998,7 +849,6 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( // (not implemented) // E_UNEXPECTED // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) { @@ -1009,28 +859,20 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) return S_OK; } //+------------------------------------------------------------------------- -// // DLL: ooofilt.dll -// // Summary: Implements Dynamic Link Library functions for OpenOffice.org filter -// //-------------------------------------------------------------------------- //F------------------------------------------------------------------------- -// // Function: DllMain -// // Summary: Called from C-Runtime on process/thread attach/detach -// // Arguments: hInstance // [in] Handle to the DLL // fdwReason // [in] Reason for calling DLL entry point // lpReserve // [in] Details of DLL initialization and cleanup -// // Returns: TRUE // Always -// //-------------------------------------------------------------------------- extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, @@ -1043,18 +885,14 @@ extern "C" BOOL WINAPI DllMain( return TRUE; } //F------------------------------------------------------------------------- -// // Function: DllGetClassObject -// // Summary: Create OpenOffice.org filter class factory object -// // Arguments: cid // [in] Class ID of class that class factory creates // iid // [in] Reference IID of requested class factory interface // ppvObj // [out] Address that receives requested interface pointer -// // Returns: S_OK // Class factory object was created successfully // CLASS_E_CLASSNOTAVAILABLE @@ -1065,7 +903,6 @@ extern "C" BOOL WINAPI DllMain( // Insufficient memory to create the class factory object // E_UNEXPECTED // Unsuccessful due to an unexpected condition -// //------------------------------------------------------------------------- extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( REFCLSID cid, @@ -1095,18 +932,13 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( return S_OK; } //F------------------------------------------------------------------------- -// // Function: DllCanUnloadNow -// // Summary: Indicates whether it is possible to unload DLL -// // Arguments: void -// // Returns: S_OK // DLL can be unloaded now // S_FALSE // DLL must remain loaded -// //-------------------------------------------------------------------------- extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() { @@ -1116,12 +948,9 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() return S_FALSE; } //F------------------------------------------------------------------------- -// // Function: DllRegisterServer // DllUnregisterServer -// // Summary: Registers and unregisters DLL server -// // Returns: DllRegisterServer // S_OK // Registration was successful @@ -1147,14 +976,11 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() // (not implemented) // E_UNEXPECTED // (not implemented) -// //-------------------------------------------------------------------------- //F------------------------------------------------------------------------- -// // helper functions to register the Indexing Service. -// //-------------------------------------------------------------------------- namespace /* private */ @@ -1427,66 +1253,13 @@ namespace /* private */ STDAPI DllRegisterServer() { - /* - TCHAR ModuleFileName[MAX_PATH]; - - GetModuleFileName( - GetModuleHandle(MODULE_NAME_FILTER), - ModuleFileName, - sizeof(ModuleFileName)); - - HRESULT hr = S_OK; - - -// register search handler -#ifdef UNICODE - if (FAILED(RegisterSearchHandler(WStringToString(ModuleFileName).c_str()))) - hr = E_FAIL; - if (FAILED(AddOrRemoveDllsToRegisterList(WStringToString(ModuleFileName).c_str(), true))) - hr = E_FAIL; -#else - if (FAILED(RegisterSearchHandler(ModuleFileName))) - hr = E_FAIL; - if (FAILED(AddOrRemoveDllsToRegisterList(ModuleFileName, true))) - hr = E_FAIL; -#endif - - - return hr; - */ return S_OK; } //--------------------------- -// -//--------------------------- STDAPI DllUnregisterServer() { - /* - TCHAR ModuleFileName[MAX_PATH]; - - GetModuleFileName( - GetModuleHandle(MODULE_NAME_FILTER), - ModuleFileName, - sizeof(ModuleFileName)); - - HRESULT hr = S_OK; - - // unregister search handler - if (FAILED(UnregisterSearchHandler())) - hr = E_FAIL; - -#ifdef UNICODE - if (FAILED(AddOrRemoveDllsToRegisterList(WStringToString(ModuleFileName).c_str(),false))) - hr = E_FAIL; -#else - if (FAILED(AddOrRemoveDllsToRegisterList(ModuleFileName, false))) - hr = E_FAIL; -#endif - - return hr; - */ return S_OK; } diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index bc637a3be577..030a3e5d99ca 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -29,39 +29,29 @@ #include "internal/types.hxx" //+------------------------------------------------------------------------- -// // Contents: OpenOffice.org filter declarations -// // Platform: Windows 2000, Windows XP -// //-------------------------------------------------------------------------- #pragma once //+------------------------------------------------------------------------- -// // forward declaration -// //-------------------------------------------------------------------------- class CContentReader; class CMetaInfoReader; class CFullPropSpec; //+------------------------------------------------------------------------- -// // Global definitions -// //-------------------------------------------------------------------------- long g_lInstances = 0; // Global count of COooFilter and COooFilterCF instances GUID const guidStorage = PSGUID_STORAGE; // GUID for storage property set //C------------------------------------------------------------------------- -// // Class: COooFilter -// // Purpose: Implements interfaces of OpenOffice.org filter -// //-------------------------------------------------------------------------- // OooFilter Class ID @@ -180,11 +170,8 @@ private: }; //C------------------------------------------------------------------------- -// // Class: COooFilterCF -// // Purpose: Implements class factory for OpenOffice.org filter -// //-------------------------------------------------------------------------- class COooFilterCF : public IClassFactory diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index 33a2f1c42e60..24d4c22bc9ee 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -30,11 +30,8 @@ #include "precompiled_shell.hxx" //+------------------------------------------------------------------------- -// // File: propspec.cxx -// // Contents: C++ wrappers for FULLPROPSPEC -// //-------------------------------------------------------------------------- #if defined _MSC_VER #pragma warning(push, 1) @@ -50,12 +47,8 @@ #include "propspec.hxx" -//GUID CLSID_Storage = PSGUID_STORAGE; -// -// //refer to ms-help://MS.VSCC/MS.MSDNVS.2052/com/stgasstg_7agk.htm //FMTID_SummaryInformation -// //GUID CLSID_SummaryInforation = { // 0xF29F85E0, // 0x4FF9, @@ -63,13 +56,9 @@ // { 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9 } //}; //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Default constructor -// // Effects: Defines property with null guid and propid 0 -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec() @@ -79,14 +68,10 @@ CFullPropSpec::CFullPropSpec() _psProperty.propid = 0; } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Construct propid based propspec -// // Arguments: [guidPropSet] -- Property set // [pidProperty] -- Property -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : _guidPropSet( guidPropSet ) @@ -95,14 +80,10 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : _psProperty.propid = pidProperty; } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Construct name based propspec -// // Arguments: [guidPropSet] -- Property set // [wcsProperty] -- Property -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, WCHAR const * wcsProperty ) : @@ -112,13 +93,9 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, SetProperty( wcsProperty ); } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Copy constructor -// // Arguments: [src] -- Source property spec -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) : _guidPropSet( src._guidPropSet ) @@ -144,13 +121,9 @@ inline void * operator new( size_t /*size*/, void * p ) return( p ); } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::operator=, public -// // Synopsis: Assignment operator -// // Arguments: [Property] -- Source property -// //-------------------------------------------------------------------------- CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property ) { diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx index bfe6f8becab1..1c8a92b9f617 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx @@ -26,11 +26,8 @@ * ************************************************************************/ //+------------------------------------------------------------------------- -// // File: propspec.hxx -// // Contents: C++ wrapper(s) for FULLPROPSPEC -// //------------------------------------------------------------------------- #pragma once #if defined _MSC_VER @@ -43,30 +40,14 @@ #pragma warning(pop) #endif //+------------------------------------------------------------------------- -// // Declare: CLSID_SummaryInforation, GUID // CLSID_Storage, GUID -// // Contents: Definitions of OpenOffice.org Document properties -// //-------------------------------------------------------------------------- -//extern GUID CLSID_Storage; -// -//extern GUID CLSID_SummaryInformation; -//const PID_TITLE = PIDSI_TITLE; // 2; -//const PID_SUBJECT = PIDSI_SUBJECT; // 3; -//const PID_AUTHOR = PIDSI_AUTHOR; // 4; -//const PID_KEYWORDS = PIDSI_KEYWORDS; // 5; -//const PID_COMMENTS = PIDSI_COMMENTS; //6; -//const PID_REVNUMBER = PIDSI_REVNUMBER; //9; -//const PID_WORDCOUNT = PIDSI_WORDCOUNT; //f; //+------------------------------------------------------------------------- -// // Class: CFullPropertySpec -// // Purpose: Describes full (PropertySet\Property) name of a property. -// //-------------------------------------------------------------------------- class CFullPropSpec diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 9542eae8e381..729e8ba814ee 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -39,19 +39,6 @@ #include <stdio.h> #include <objidl.h> - -/*#include <string.h> -#include <filter.h> -#include <filterr.h> -#include <ntquery.h> -#include "assert.h" -#include "propspec.hxx" -#ifdef __MINGW32__ -#include <algorithm> -using ::std::min; -#endif -*/ - #include "internal/stream_helper.hxx" extern "C" { diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index dc8d8e4585fa..2a6bff0ef78f 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" + +#include <osl/diagnose.h> + #include "internal/global.hxx" #include "internal/PropertyHdl.hxx" #include "internal/fileextensions.hxx" @@ -50,9 +53,7 @@ long g_DllRefCnt = 0; HINSTANCE g_hModule = NULL; -// // Map of property keys to the locations of their value(s) in the .??? XML schema -// struct PROPERTYMAP { PROPERTYKEY key; @@ -72,8 +73,6 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP); //---------------------------- -// -//---------------------------- CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), @@ -84,8 +83,6 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : } //---------------------------- -// -//---------------------------- CPropertyHdl::~CPropertyHdl() { @@ -247,11 +244,6 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM OutputDebugStringFormat( "CPropertyHdl::Initialize: Caught exception [%s]", e.what() ); return E_FAIL; } -/* - // load extended properties and search content - _LoadExtendedProperties(); - _LoadSearchContent(); -*/ } return S_OK; @@ -396,7 +388,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( if ( CLSID_PROPERTY_HANDLER == m_Clsid ) pUnk = static_cast<IPropertyStore*>( new CPropertyHdl() ); - POST_CONDITION(pUnk != 0, "Could not create COM object"); + OSL_POSTCOND(pUnk != 0, "Could not create COM object"); if (0 == pUnk) return E_OUTOFMEMORY; diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx index 6f4587f85b3e..284f50850410 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx @@ -40,11 +40,9 @@ #include "internal/config.hxx" #include "internal/iso8601_converter.hxx" -//##################################### const bool READONLY = false; const bool WRITEABLE = true; -//##################################### document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) { File_Type_t file_type = get_file_type(document_name); @@ -58,17 +56,14 @@ document_statistic_reader_ptr create_document_statistic_reader(const std::string } -//##################################### document_statistic_reader::document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_name_(document_name), meta_info_accessor_(meta_info_accessor) {} -//##################################### document_statistic_reader::~document_statistic_reader() {} -//##################################### void document_statistic_reader::read(statistic_group_list_t* group_list) { group_list->clear(); @@ -76,13 +71,11 @@ void document_statistic_reader::read(statistic_group_list_t* group_list) fill_origin_section(meta_info_accessor_, group_list); } -//##################################### std::string document_statistic_reader::get_document_name() const { return document_name_; } -//##################################### void document_statistic_reader::fill_origin_section(CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { statistic_item_list_t il; @@ -100,12 +93,10 @@ void document_statistic_reader::fill_origin_section(CMetaInfoReader *meta_info_a group_list->push_back(statistic_group_t(GetResString(IDS_ORIGIN), il)); } -//##################################### writer_document_statistic_reader::writer_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//##################################### void writer_document_statistic_reader::fill_description_section(CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { statistic_item_list_t il; @@ -125,13 +116,11 @@ void writer_document_statistic_reader::fill_description_section(CMetaInfoReader group_list->push_back(statistic_group_t(GetResString(IDS_DESCRIPTION), il)); } -//####################################### calc_document_statistic_reader::calc_document_statistic_reader( const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//####################################### void calc_document_statistic_reader::fill_description_section( CMetaInfoReader *meta_info_accessor,statistic_group_list_t* group_list) { @@ -148,13 +137,11 @@ void calc_document_statistic_reader::fill_description_section( group_list->push_back(statistic_group_t(GetResString(IDS_DESCRIPTION), il)); } -//####################################### draw_impress_math_document_statistic_reader::draw_impress_math_document_statistic_reader( const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//####################################### void draw_impress_math_document_statistic_reader::fill_description_section( CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index ee884c94fe44..e15b62a0bc96 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -36,8 +36,6 @@ //------------------------------------ -// -//------------------------------------ struct statistic_item { @@ -58,16 +56,12 @@ struct statistic_item }; //------------------------------------ -// -//------------------------------------ typedef std::vector<statistic_item> statistic_item_list_t; typedef std::pair<std::wstring, statistic_item_list_t> statistic_group_t; typedef std::vector<statistic_group_t> statistic_group_list_t; //------------------------------------ -// -//------------------------------------ class document_statistic_reader; typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; @@ -75,8 +69,6 @@ typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); //------------------------------------ -// -//------------------------------------ class document_statistic_reader { @@ -103,8 +95,6 @@ private: }; //------------------------------------ -// -//------------------------------------ class writer_document_statistic_reader : public document_statistic_reader { @@ -118,8 +108,6 @@ protected: }; //------------------------------------ -// -//------------------------------------ class calc_document_statistic_reader : public document_statistic_reader { @@ -133,8 +121,6 @@ protected: }; //------------------------------------ -// -//------------------------------------ class draw_impress_math_document_statistic_reader : public document_statistic_reader { diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 9a2cedeb4e53..68a3b6903f3f 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -53,8 +53,6 @@ #include "internal/resource.h" //------------------------------------ -// -//------------------------------------ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) @@ -66,8 +64,6 @@ list_view_builder_ptr create_list_view_builder( } //------------------------------------ -// -//------------------------------------ list_view_builder::list_view_builder( HWND hwnd_list_view, @@ -81,16 +77,12 @@ list_view_builder::list_view_builder( } //------------------------------------ -// -//------------------------------------ list_view_builder::~list_view_builder() { } //------------------------------------ -// -//------------------------------------ void list_view_builder::build(statistic_group_list_t& gl) { @@ -113,8 +105,6 @@ void list_view_builder::build(statistic_group_list_t& gl) } //------------------------------------ -// -//------------------------------------ void list_view_builder::setup_list_view() { @@ -145,8 +135,6 @@ void list_view_builder::setup_list_view() } //------------------------------------ -// -//------------------------------------ void list_view_builder::insert_group(const std::wstring& /*title*/) { @@ -154,8 +142,6 @@ void list_view_builder::insert_group(const std::wstring& /*title*/) } //------------------------------------ -// -//------------------------------------ void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable) { @@ -189,8 +175,6 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin } //------------------------------------ -// -//------------------------------------ HWND list_view_builder::get_list_view() const { @@ -198,8 +182,6 @@ HWND list_view_builder::get_list_view() const } //------------------------------------ -// -//------------------------------------ winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, @@ -212,8 +194,6 @@ winxp_list_view_builder::winxp_list_view_builder( } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::setup_list_view() { @@ -223,8 +203,6 @@ void winxp_list_view_builder::setup_list_view() } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::insert_group(const std::wstring& name) { @@ -244,8 +222,6 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::insert_item( const std::wstring& title, const std::wstring& value, bool is_editable) diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index a66747903329..20f9fc5ec18b 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -46,8 +46,6 @@ #include "document_statistic.hxx" //------------------------------------ -// -//------------------------------------ class list_view_builder; typedef std::auto_ptr<list_view_builder> list_view_builder_ptr; @@ -57,8 +55,6 @@ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2); //------------------------------------ -// -//------------------------------------ class list_view_builder { @@ -91,8 +87,6 @@ private: }; //------------------------------------ -// -//------------------------------------ class winxp_list_view_builder : public list_view_builder { diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 7cf38d4fe7b5..4c371cf70e2f 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -61,8 +61,6 @@ ----------------------------------------------*/ //----------------------------- -// -//----------------------------- CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) @@ -72,8 +70,6 @@ CPropertySheet::CPropertySheet(long RefCnt) : } //----------------------------- -// -//----------------------------- CPropertySheet::~CPropertySheet() { @@ -110,8 +106,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) { @@ -120,8 +114,6 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CPropertySheet::Release(void) { @@ -259,8 +251,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) @@ -269,8 +259,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( } //----------------------------- -// -//----------------------------- UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) @@ -290,8 +278,6 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( //----------------------------- -// -//----------------------------- BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -310,8 +296,6 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM } //----------------------------- -// -//----------------------------- BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -329,7 +313,6 @@ BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPAR return FALSE; } -//################################## void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) { try diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index a72c8e04b561..cd573e38f7cf 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -289,7 +289,6 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **) { return E_NOTIMPL; } -//######################################### CThumbviewer::CThumbviewer(long RefCnt) : diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx deleted file mode 100644 index c657335e5eeb..000000000000 --- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- 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 - * - * 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_shell.hxx" - -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#include <stdio.h> -#include "internal/dbgmacros.hxx" - -void DbgAssert(bool /*condition*/, const char* /*message*/) -{ - - //if (!condition) - //{ - // char msg[1024]; - // - // sprintf(msg, "Assertion in file %s at line %d\n%s", __FILE__, __LINE__, message); - - // int nRet = MessageBoxA( - // 0, - // msg, - // "Assertion violation", - // MB_ICONEXCLAMATION | MB_ABORTRETRYIGNORE); - //} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 1e67bcf0e418..1093a96b826b 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -33,8 +33,6 @@ #include <sal/macros.h> //------------------------------------ -// -//------------------------------------ const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index 1fc6f52668cc..01a16db4ffa6 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -46,7 +46,6 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate ) if ( ws8601DateTime.length() == 19 ) { - //fill in the SYSTEMTIME structure; std::string asDateTime = WStringToString( ws8601DateTime ); SYSTEMTIME DateTime; DateTime.wYear = ( unsigned short )strtol( asDateTime.substr( 0, 4 ).c_str(), NULL, 10 ); @@ -170,14 +169,6 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat return result; #undef ADD_AS_PREFILLED -/* -#else - std::wostringstream oss; - oss << std::setw(2) << std::setfill('0') << hours << L":" << - std::setw(2) << std::setfill('0') << minutes << L":" << - std::setw(2) << std::setfill('0') << seconds; - return oss.str(); -*/ #endif } diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index 195bf9fac6fe..8d54e138f350 100755 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -45,14 +45,12 @@ CDEFS_X64+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- -SLOFILES=$(SLO)$/dbgmacros.obj\ - $(SLO)$/fileextensions.obj\ +SLOFILES=$(SLO)$/fileextensions.obj\ $(SLO)$/registry.obj\ $(SLO)$/utilities.obj\ $(SLO)$/iso8601_converter.obj -SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\ - $(SLO_X64)$/fileextensions.obj\ +SLOFILES_X64=$(SLO_X64)$/fileextensions.obj\ $(SLO_X64)$/registry.obj\ $(SLO_X64)$/utilities.obj\ $(SLO_X64)$/iso8601_converter.obj diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 4cf7184845a6..a38bcef99a83 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -37,7 +37,6 @@ #pragma warning(pop) #endif #include <malloc.h> -#include "internal/dbgmacros.hxx" #include "internal/registry.hxx" #if defined _MSC_VER @@ -49,15 +48,11 @@ #endif //--------------------------------------- -// -//--------------------------------------- // Size of a CLSID as a string const int CLSID_STRING_SIZE = 39; //--------------------------------------- -// -//--------------------------------------- bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, const char* Value) { @@ -79,8 +74,6 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co } //--------------------------------------- -// -//--------------------------------------- bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { @@ -180,8 +173,6 @@ std::string ClsidToString(const CLSID& clsid) } //--------------------------------------- -// -//--------------------------------------- bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index 278e4e29840b..7fd2fcdbb8ab 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" +#include <osl/diagnose.h> #include "internal/config.hxx" -#include "internal/dbgmacros.hxx" #include "internal/utilities.hxx" //----------------------------- @@ -85,7 +85,7 @@ std::wstring GetResString(int ResId) int rc = LoadStringW( GetModuleHandleW(MODULE_NAME), ResId, szResStr, sizeof(szResStr) ); OutputDebugStringFormat( "GetResString: read %d chars\n", rc ); - ENSURE(rc, "String resource not found"); + OSL_ENSURE(rc, "String resource not found"); return std::wstring(szResStr); } @@ -171,21 +171,6 @@ std::wstring getShortPathName( const std::wstring& aLongName ) return shortName; } -/** convert LocaleSet pair into Microsoft List of Locale ID (LCID) - according to ISO-639 and ISO-3166. - http://etext.lib.virginia.edu/tei/iso639.html - http://nl.ijs.si/gnusl/cee/std/ISO_3166.html - @param - Locale, LocaleSet - @returns - Windows Locale Identifier corresponding to input LocaleSet. - @Usage Sample - LocaleSet_t myDefaultLocale( ::std::wstring( L"zh" ),::std::wstring(L"HK") ); - DWORD myLCID = LocaleSetToLCID( myDefaultLocale ); - wchar_t buffer[20]; - _ultow( myLCID, buffer, 16 ); - MessageBox( NULL, buffer,L"the LCID is:",MB_OK ); -*/ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) { @@ -314,8 +299,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) else if ( wsLanguage == L"es" ) { usPrimaryLang = LANG_SPANISH; //Spanish - //else if ( wsCountry == L"ES" ) - // usSubLang = SUBLANG_SPANISH; // Spanish (Castilian) if ( wsCountry == L"MX" ) usSubLang = SUBLANG_SPANISH_MEXICAN; // Spanish (Mexican) else if ( wsCountry == L"ES" ) @@ -418,8 +401,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) usPrimaryLang = LANG_NORWEGIAN; //Norwegian if ( wsCountry == L"NO" ) usSubLang = SUBLANG_NORWEGIAN_BOKMAL; // Norwegian (Bokmal) - //else if ( wsCountry == L"NO" ) - // usSubLang = SUBLANG_NORWEGIAN_NYNORSK; // Norwegian (Nynorsk) else usSubLang = SUBLANG_DEFAULT; //default sub language } @@ -506,13 +487,7 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) else if ( wsLanguage == L"hy" ) usPrimaryLang = LANG_ARMENIAN; //Armenian else if ( wsLanguage == L"az" ) - { usPrimaryLang = LANG_AZERI; //Azeri - //if ( wsCountry == L" " ) - // usSubLang = SUBLANG_AZERI_LATIN; // Azeri (Latin) - //else if ( wsCountry == L" " ) - // usSubLang = SUBLANG_AZERI_CYRILLIC; // Azeri (Cyrillic) - } else if ( wsLanguage == L"eu" ) usPrimaryLang = LANG_BASQUE; //Basque else if ( wsLanguage == L"mk" ) @@ -585,14 +560,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) usPrimaryLang = LANG_KASHMIRI; //Not supported. else if ( wsLanguage == L"ne" ) usPrimaryLang = LANG_NEPALI; //Not supported. - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_MANIPURI; //Not supported. - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_KONKANI; //Konkani - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_SYRIAC; //Syriac - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_DIVEHI; //Divehi else return GetSystemDefaultLCID(); //System Default Locale diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index b1444dc30810..e4dd24dfb11b 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -264,7 +264,6 @@ void initParameter(int argc, char* argv[]) */ int main(int argc, char* argv[]) { - //MessageBox(NULL, "Debug", "Debug", MB_OK); initParameter(argc, argv); @@ -278,7 +277,7 @@ int main(int argc, char* argv[]) { CSimpleMapi mapi; - // #93007# we have to set the flag MAPI_NEW_SESSION, + // we have to set the flag MAPI_NEW_SESSION, // because in the case Outlook xxx (not Outlook Express!) // is installed as Exchange and Mail Client a Profile // selection dialog must appear because we specify no diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index e47a767c0aeb..52707b3cac19 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -271,7 +271,6 @@ void CSmplMailClient::validateParameter( static_cast<XSimpleMailClient*>(this), 1); - // #93077# OSL_ENSURE(!(aFlag & NO_LOGON_DIALOG), "Flag NO_LOGON_DIALOG has currently no effect"); // check the flags, the allowed range is 0 - (2^n - 1) diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 5acd36f50266..46d953597cac 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -58,8 +58,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_REGKEY_NAME "/com.sun.star.system.SimpleSystemMail/UNO/SERVICES/com.sun.star.system.SimpleSystemMail" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -70,7 +68,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" @@ -80,7 +78,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -91,7 +89,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 354485b38ef3..ad679d84e062 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -60,8 +60,6 @@ CSmplMailMsg::CSmplMailMsg( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) throw (RuntimeException) @@ -70,8 +68,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ ::rtl::OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) @@ -80,8 +76,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) @@ -90,8 +84,6 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) @@ -100,8 +92,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) @@ -110,8 +100,6 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) @@ -120,8 +108,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) @@ -130,8 +116,6 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) @@ -140,8 +124,6 @@ OUString SAL_CALL CSmplMailMsg::getOriginator( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) @@ -150,8 +132,6 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) @@ -160,8 +140,6 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) @@ -170,8 +148,6 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& a } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index 315a9ea49a39..237996bf2c08 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -50,8 +50,6 @@ public: CSmplMailMsg( ); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -60,8 +58,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -70,8 +66,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -80,8 +74,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); @@ -90,8 +82,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); @@ -100,8 +90,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 3ae26647309b..85c9167b88cc 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -109,7 +109,8 @@ ifeq ($(strip $(WITH_LANG)),) $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc echo copying $@ -mkdir -p $(WORKDIR)/inc/svx - cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc + cp $< $@ + $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) rm -f $(WORKDIR)/inc/svx/lastrun.mk else -include $(WORKDIR)/inc/svx/lastrun.mk @@ -125,6 +126,7 @@ $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPart $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p svx \ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) + $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) endif .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 105eca6d5ae2..65134fd50100 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,svxcore)) $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore)) -$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots)) +$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots)) $(eval $(call gb_Library_add_package_headers,svxcore,\ svx_inc \ diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index d5ffc3cb1aa4..9be0b4b5dce9 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -556,5 +556,4 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 6aa1a752dde0..227d57425e63 100755 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -654,7 +654,7 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - Text [ en-US ] = "~Numbering/Bullets..." ; \ + Text [ en-US ] = "~Bullets and Numbering..." ; \ }; @@ -1209,7 +1209,7 @@ };\ };\ };\ - Text [ en-US ] = "Case/Characters";\ + Text [ en-US ] = "~Change Case";\ }; #define ITEM_OPEN_HYPERLINK \ diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index b7e08fa637f7..6418e47d285a 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -116,11 +116,11 @@ class SVX_DLLPUBLIC Style { public: /** Constructs an invisible frame style. */ - inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mnType( editeng::SOLID ) {} + inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnType( editeng::SOLID ) { Clear(); } /** Constructs a frame style with passed line widths. */ inline explicit Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) : meRefMode( REFMODE_CENTERED ), mnType( nType ) - { Set( nP, nD, nS ); } + { Clear(); Set( nP, nD, nS ); } /** Constructs a frame style with passed color and line widths. */ inline explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) : diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index d2e3bfcef326..bb7b9abbdef6 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -200,7 +200,6 @@ // - GalleryExplorer - // ------------------- -class List; class Gallery; class VCDrawModel; class FmFormModel; @@ -231,8 +230,8 @@ public: static bool FillThemeList( std::vector<String>& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL - static sal_Bool FillObjList( const String& rThemeName, List& rObjList ); - static sal_Bool FillObjList( sal_uIntPtr nThemeId, List& rObjList ); + static sal_Bool FillObjList( const String& rThemeName, std::vector<String> &rObjList ); + static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 1a2917b89734..cbdba4004550 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -116,7 +116,7 @@ public: virtual void columnChanged() = 0; }; -#define GRID_COLUMN_NOT_FOUND ((sal_uInt16)-1) +#define GRID_COLUMN_NOT_FOUND SAL_MAX_UINT16 //================================================================== // InitWindowFacet, describing which aspect of a column's Window to (re-)initialize diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 510e0b5cdb45..f1f0e2b2cc71 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -58,10 +58,6 @@ class OutputDevice; #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif -#if defined(OS2) -#define DEGREE_CHAR ((sal_Unicode)248) /* 0xF8 = IBM PC (Erw. ASCII) */ -#endif - #ifndef DEGREE_CHAR #error unbekannte Plattrorm #endif diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index b2e0f0889e82..e6d1fe74dad8 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -74,14 +74,14 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; class SVX_DLLPUBLIC SdrPageView : public SfxListener { protected: - SdrView& mrView; - SdrPage* mpPage; + SdrView& mrView; + SdrPage* mpPage; Point aPgOrg; // Nullpunkt der Page Rectangle aMarkBound; // wird Rectangle aMarkSnap; // von - sal_Bool mbHasMarked; - sal_Bool mbVisible; + sal_Bool mbHasMarked; + sal_Bool mbVisible; SetOfByte aLayerVisi; // Menge der sichtbaren Layer SetOfByte aLayerLock; // Menge der nicht editierbaren Layer @@ -98,11 +98,11 @@ protected: // #103834# Use one reserved slot (bReserveBool1) for the background color Color maBackgroundColor; - SdrPageWindowVector maPageWindows; + SdrPageWindowVector maPageWindows; // #i72752# member to remember with which SdrPageWindow the BeginDrawLayer // was done - SdrPageWindow* mpPreparedPageWindow; + SdrPageWindow* mpPreparedPageWindow; // interface to SdrPageWindow protected: diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 259fe62b720a..e345093bc5f4 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -400,6 +400,8 @@ public: // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); + // used when the region passed to BeginDrawLayers needs to be changed + void UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: @@ -412,6 +414,8 @@ protected: // used to paint the form layer after the PreRender device is flushed (painted) to the window. void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; + Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect); + public: sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht diff --git a/svx/inc/svx/svxerr.hxx b/svx/inc/svx/svxerr.hxx index e1a77503cf41..e59697a05e6c 100644 --- a/svx/inc/svx/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx @@ -94,9 +94,9 @@ class SVX_DLLPUBLIC SvxErrorHandler : private SfxErrorHandler { - public: +public: SvxErrorHandler(); - static void Get(); + static void ensure(); }; #endif diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index ebaed4674aee..0f5e57b96d35 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -316,7 +316,7 @@ public: virtual sal_Bool CreateBitmapsForUI(); virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); - static XColorTable* GetStdColorTable(); + static XColorTable& GetStdColorTable(); }; // ------------------- diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index aede0a96f5ec..fc4a443ff4f8 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -830,7 +830,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } // Investigate actions and if necessary replace colors - for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) + for( size_t nAct = 0, nActCount = rMtf.GetActionSize(); nAct < nActCount; nAct++ ) { MetaAction* pAction = rMtf.GetAction( nAct ); @@ -1084,7 +1084,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C GDIMetaFile aMtf; const MapMode& rPrefMap = rMtf.GetPrefMapMode(); const Size& rPrefSize = rMtf.GetPrefSize(); - const sal_uIntPtr nActionCount = rMtf.GetActionCount(); + const size_t nActionCount = rMtf.GetActionSize(); aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); @@ -1096,7 +1096,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C // retrieve one action at the time; first // set the whole area to the replacement color. aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) ); - for ( sal_uIntPtr i = 0; i < nActionCount; i++ ) + for ( size_t i = 0; i < nActionCount; i++ ) { MetaAction* pAct = rMtf.GetAction( i ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index be38cda0c48b..ecdb09c4b8a7 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -2012,7 +2012,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() static ::rtl::OUString GetCrashConfigDir() { -#if defined(WNT) || defined(OS2) +#if defined(WNT) OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); #elif defined( MACOSX ) OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~")); @@ -2021,13 +2021,13 @@ void BrokenRecoveryDialog::impl_askForSavePath() #endif Bootstrap::expandMacros( ustrValue ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); #endif return ustrValue; } -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define CHKFILE "crashdat.chk" #define STKFILE "crashdat.stk" #define PRVFILE "crashdat.prv" diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 14eb6dd78272..4ced517895c9 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -200,13 +200,13 @@ inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const // class FontPrevWin_Impl ----------------------------------------------- -/*-----------------19.7.2001 08:44------------------ +/* * void FontPrevWin_Impl::_CheckScript() * evalutates the scripttypes of the actual string. * Afterwards the positions of script change are notified in aScriptChg, * the scripttypes in aScriptType. * The aTextWidth array will be filled with zero. - * --------------------------------------------------*/ + */ void FontPrevWin_Impl::_CheckScript() { @@ -271,7 +271,7 @@ void FontPrevWin_Impl::_CheckScript() } } -/*-----------------19.7.2001 08:48------------------ +/* * Size FontPrevWin_Impl::CalcTextSize(..) * fills the aTextWidth array with the text width of every part * of the actual string without a script change inside. @@ -279,7 +279,7 @@ void FontPrevWin_Impl::_CheckScript() * for Asian parts the aCJKFont. * The returned size contains the whole string. * The member nAscent is calculated to the maximal ascent of all used fonts. - * --------------------------------------------------*/ + */ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter, SvxFont &rFont ) @@ -352,12 +352,12 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter return aTxtSize; } -/*-----------------19.7.2001 08:54------------------ +/* * void FontPrevWin_Impl::DrawPrev(..) * calls SvxFont::DrawPrev(..) for every part of the string without a script * change inside, for Asian parts the aCJKFont will be used, otherwise the * given rFont. - * --------------------------------------------------*/ + */ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, Point &rPt, SvxFont &rFont ) diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 85a52db251b7..133076716d8a 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -30,7 +30,6 @@ #include "precompiled_svx.hxx" // include --------------------------------------------------------------- -#include <tools/pstm.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> @@ -38,8 +37,6 @@ #define _SVX_SRCHDLG_CXX // so that private methods from SrchDlgare known - - #include "srchctrl.hxx" #include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 85b2695493ac..e8b79497ae70 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -158,15 +158,18 @@ void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); - List* pLst = pSrchItem ? pSrchItem->GetList() : 0; - if ( pLst ) - for ( sal_uInt16 i = 0; i < pLst->Count(); ++i ) + if (pSrchItem) + { + std::vector<String> aLst = pSrchItem->GetList(); + + for ( sal_uInt16 i = 0; i < aLst.size(); ++i ) { - String* pTmp = new String( *(String*)( pLst->GetObject(i) ) ); + String* pTmp = new String(aLst[i]); rStrLst.Insert( pTmp, rStrLst.Count() ); rCBox.InsertEntry( *pTmp ); } + } } // ----------------------------------------------------------------------- @@ -174,10 +177,10 @@ void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst ) { DBG_ASSERT( rStrLst.Count(), "check in advance"); - List aLst; + std::vector<String> aLst; for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i ) - aLst.Insert( rStrLst[ i ], LIST_APPEND ); + aLst.push_back( *rStrLst[ i ]); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); } @@ -324,7 +327,7 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) aSimilarityBox ( this, SVX_RES( CB_SIMILARITY) ), \ aSimilarityBtn ( this, SVX_RES( PB_SIMILARITY) ), \ aLayoutBtn ( this, SVX_RES( CB_LAYOUTS ) ), \ - aNotesBtn ( this, SVX_RES( CB_NOTES ) ), \ + aNotesBtn ( this, SVX_RES( CB_COMMENTS ) ), \ aJapMatchFullHalfWidthCB( this, SVX_RES( CB_JAP_MATCH_FULL_HALF_WIDTH ) ),\ aJapOptionsCB ( this, SVX_RES( CB_JAP_SOUNDS_LIKE ) ), \ aJapOptionsBtn ( this, SVX_RES( PB_JAP_OPTIONS ) ), \ diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index 6632b11fd7c8..c2c00a513948 100755 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc @@ -80,7 +80,7 @@ #define RB_CALC_COLUMNS 58 #define CB_ALL_SHEETS 59 -#define CB_NOTES 60 +#define CB_COMMENTS 60 #define IMG_MOREBTN_DOWN 100 #define IMG_MOREBTN_UP 101 diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index f82d4f06cb88..06e088b60b6b 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -301,13 +301,13 @@ ModelessDialog RID_SVXDLG_SEARCH TabStop = TRUE ; Hide = TRUE ; }; - CheckBox CB_NOTES + CheckBox CB_COMMENTS { - HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_COMMENTS"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Notes"; + Text [ en-US ] = "Comments"; }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index 823c0d259642..e353c2623c1c 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -136,12 +136,12 @@ void Camera3D::SetBankAngle(double fAngle) } } - // von aDiff nach oben zeigenden View-Up-Vektor berechnen + // Calculate from aDiff to uppwards pointing View-Up-Vector aPrj = aPrj.getPerpendicular(aDiff); aPrj = aPrj.getPerpendicular(aDiff); aDiff.normalize(); - // auf Z-Achse rotieren, dort um BankAngle drehen und zurueck + // Rotate on Z axis, to rotate the BankAngle and back basegfx::B3DHomMatrix aTf; const double fV(sqrt(aDiff.getY() * aDiff.getY() + aDiff.getZ() * aDiff.getZ())); @@ -204,12 +204,6 @@ void Camera3D::SetBankAngle(double fAngle) SetVUV(aTf * aPrj); } -/************************************************************************* -|* -|* Brennweite setzen -|* -\************************************************************************/ - void Camera3D::SetFocalLength(double fLen) { if ( fLen < 5 ) @@ -218,11 +212,7 @@ void Camera3D::SetFocalLength(double fLen) fFocalLength = fLen; } -/************************************************************************* -|* -|* Um die Kameraposition drehen, LookAt wird dabei veraendert -|* -\************************************************************************/ +// To rotate the camera position, this changes LookAt void Camera3D::Rotate(double fHAngle, double fVAngle) { @@ -270,12 +260,7 @@ void Camera3D::Rotate(double fHAngle, double fVAngle) SetLookAt(aPosition + aDiff); } - -/************************************************************************* -|* -|* Um den Blickpunkt drehen, Position wird dabei veraendert -|* -\************************************************************************/ +// To rotate the view point, this changes the position void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle) { @@ -323,11 +308,7 @@ void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle) SetPosition(aLookAt + aDiff); } -/************************************************************************* -|* -|* FG: ??? Setzt wohl die Projektionsebene in eine bestimmte Tiefe -|* -\************************************************************************/ +// ??? this probably sets the projection plane in a certain depth void Camera3D::SetFocalLengthWithCorrect(double fLen) { diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index ee35d1e221b1..46feb2ded38f 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -38,7 +38,7 @@ #include <svx/sdr/contact/viewcontactofe3dcube.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() { @@ -47,29 +47,20 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() TYPEINIT1(E3dCubeObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor: | -|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__ -|* (abhaengig von bPosIsCenter) / -|* -\************************************************************************/ - E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize) : E3dCompoundObject(rDefault) { - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); - // uebergebene drueberbuegeln - aCubePos = aPos; + aCubePos = aPos; // position centre or left, bottom, back (dependant on bPosIsCenter) aCubeSize = r3DSize; } E3dCubeObj::E3dCubeObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -82,22 +73,12 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) bPosIsCenter = rDefault.GetDefaultCubePosIsCenter(); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dCubeObj::GetObjIdentifier() const { return E3D_CUBEOBJ_ID; } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus 6 Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of 6 polygons SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { @@ -109,11 +90,7 @@ E3dCubeObj* E3dCubeObj::Clone() const return CloneHelper< E3dCubeObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set local parameters with geometry re-creating void E3dCubeObj::SetCubePos(const basegfx::B3DPoint& rNew) { @@ -151,11 +128,7 @@ void E3dCubeObj::SetSideFlags(sal_uInt16 nNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dCubeObj::TakeObjNameSingul(XubString& rName) const { @@ -171,11 +144,7 @@ void E3dCubeObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dCubeObj::TakeObjNamePlural(XubString& rName) const { diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index adf41573e67d..7ab3bf792481 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -35,13 +35,8 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> -/************************************************************************* -|* -|* Klasse zum verwalten der 3D-Default Attribute -|* -\************************************************************************/ +// Class to manage the 3D default attributes -// Konstruktor E3dDefaultAttributes::E3dDefaultAttributes() { Reset(); @@ -49,21 +44,21 @@ E3dDefaultAttributes::E3dDefaultAttributes() void E3dDefaultAttributes::Reset() { - // Compound-Objekt + // Compound object bDefaultCreateNormals = sal_True; bDefaultCreateTexture = sal_True; - // Cube-Objekt + // Cube object aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); nDefaultCubeSideFlags = CUBE_FULL; bDefaultCubePosIsCenter = sal_False; - // Sphere-Objekt + // Sphere object aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); aDefaultSphereSize = basegfx::B3DPoint(1000.0, 1000.0, 1000.0); - // Lathe-Objekt + // Lathe object nDefaultLatheEndAngle = 3600; bDefaultLatheSmoothed = sal_True; bDefaultLatheSmoothFrontBack = sal_False; @@ -71,7 +66,7 @@ void E3dDefaultAttributes::Reset() bDefaultLatheCloseFront = sal_True; bDefaultLatheCloseBack = sal_True; - // Extrude-Objekt + // Extrude object bDefaultExtrudeSmoothed = sal_True; bDefaultExtrudeSmoothFrontBack = sal_False; bDefaultExtrudeCharacterMode = sal_False; diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index bb03588e1d53..283d24c42a42 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -48,12 +48,6 @@ TYPEINIT1(E3dDragMethod, SdrDragMethod); -/************************************************************************* -|* -|* Konstruktor aller 3D-DragMethoden -|* -\************************************************************************/ - E3dDragMethod::E3dDragMethod ( SdrDragView &_rView, const SdrMarkList& rMark, @@ -64,8 +58,7 @@ E3dDragMethod::E3dDragMethod ( mbMoveFull(bFull), mbMovedAtAll(sal_False) { - // Fuer alle in der selektion befindlichen 3D-Objekte - // eine Unit anlegen + // Create a unit for all the 3D objects present in the selection const long nCnt(rMark.GetMarkCount()); static bool bDoInvalidate(false); long nObjs(0); @@ -114,8 +107,8 @@ E3dDragMethod::E3dDragMethod ( aNewUnit.maInvDisplayTransform.invert(); } - // SnapRects der beteiligten Objekte invalidieren, um eine - // Neuberechnung beim Setzen der Marker zu erzwingen + // Invalidate SnapRects of the objects involved, to force a + // recalculation for setting the marker if(bDoInvalidate) { pE3dObj->SetRectsDirty(); @@ -129,10 +122,10 @@ E3dDragMethod::E3dDragMethod ( aNewUnit.maWireframePoly.transform(aNewUnit.maTransform); } - // FullBound ermitteln + // Determine FullBound maFullBound.Union(pE3dObj->GetSnapRect()); - // Unit einfuegen + // Insert Unit maGrp.push_back(aNewUnit); } } @@ -146,11 +139,7 @@ void E3dDragMethod::TakeSdrDragComment(XubString& /*rStr*/) const { } -/************************************************************************* -|* -|* Erstelle das Drahtgittermodel fuer alle Aktionen -|* -\************************************************************************/ +// Create the wireframe model for all actions bool E3dDragMethod::BeginSdrDrag() { @@ -179,23 +168,17 @@ bool E3dDragMethod::BeginSdrDrag() return sal_True; } -/************************************************************************* -|* -|* Schluss -|* -\************************************************************************/ - bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) { const sal_uInt32 nCnt(maGrp.size()); if(!mbMoveFull) { - // WireFrame ausblenden + // Hide wireframe Hide(); } - // Alle Transformationen anwenden und UnDo's anlegen + // Apply all transformations and create undo's if(mbMovedAtAll) { const bool bUndo = getSdrDragView().IsUndoEnabled(); @@ -222,12 +205,6 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) return sal_True; } -/************************************************************************* -|* -|* Abbruch -|* -\************************************************************************/ - void E3dDragMethod::CancelSdrDrag() { if(mbMoveFull) @@ -238,7 +215,7 @@ void E3dDragMethod::CancelSdrDrag() for(sal_uInt32 nOb(0); nOb < nCnt; nOb++) { - // Transformation restaurieren + // Restore transformation E3dDragMethodUnit& rCandidate = maGrp[nOb]; E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj); rCandidate.mp3DObj->SetTransform(rCandidate.maInitTransform); @@ -247,27 +224,19 @@ void E3dDragMethod::CancelSdrDrag() } else { - // WireFrame ausblenden + // Hide WireFrame Hide(); } } -/************************************************************************* -|* -|* Gemeinsames MoveSdrDrag() -|* -\************************************************************************/ +// Common MoveSdrDrag() void E3dDragMethod::MoveSdrDrag(const Point& /*rPnt*/) { mbMovedAtAll = true; } -/************************************************************************* -|* -|* Zeichne das Drahtgittermodel -|* -\************************************************************************/ +// Draw the wire frame model // for migration from XOR to overlay void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) @@ -325,7 +294,7 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, sal_Bool bFull) : E3dDragMethod(_rView, rMark, eConstr, bFull) { - // Zentrum aller selektierten Objekte in Augkoordinaten holen + // Get center of all selected objects in eye coordinates const sal_uInt32 nCnt(maGrp.size()); if(nCnt) @@ -347,7 +316,7 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, maGlobalCenter += aObjCenter; } - // Teilen durch Anzahl + // Divide by the number if(nCnt > 1) { maGlobalCenter /= (double)nCnt; @@ -367,19 +336,16 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, aInverseViewToEye.invert(); aRotCenter3D = aInverseViewToEye * aRotCenter3D; - // X,Y des RotCenter und Tiefe der gemeinsamen Objektmitte aus - // Rotationspunkt im Raum benutzen + // Use X,Y of the RotCenter and depth of the common object centre + // as rotation point in the space maGlobalCenter.setX(aRotCenter3D.getX()); maGlobalCenter.setY(aRotCenter3D.getY()); } } } -/************************************************************************* -|* -|* Das Objekt wird bewegt, bestimme die Winkel -|* -\************************************************************************/ + +//The object is moved, determine the angle void E3dDragRotate::MoveSdrDrag(const Point& rPnt) { @@ -388,7 +354,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) if(DragStat().CheckMinMoved(rPnt)) { - // Modifier holen + // Get modifier sal_uInt16 nModifier = 0; if(getSdrDragView().ISA(E3dView)) { @@ -396,12 +362,12 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) nModifier = rLastMouse.GetModifier(); } - // Alle Objekte rotieren + // Rotate all objects const sal_uInt32 nCnt(maGrp.size()); for(sal_uInt32 nOb(0); nOb < nCnt; nOb++) { - // Rotationswinkel bestimmen + // Determine rotation angle double fWAngle, fHAngle; E3dDragMethodUnit& rCandidate = maGrp[nOb]; @@ -431,11 +397,11 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) fHAngle = (double)(((long) fHAngle + nSnap/2) / nSnap * nSnap); } - // nach radiant + // to radians fWAngle *= F_PI180; fHAngle *= F_PI180; - // Transformation bestimmen + // Determine transformation basegfx::B3DHomMatrix aRotMat; if(E3DDRAG_CONSTR_Y & meConstraint) { @@ -456,8 +422,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) aRotMat.rotate(fHAngle, 0.0, 0.0); } - // Transformation in Eye-Koordinaten, dort rotieren - // und zurueck + // Transformation in eye coordinates, there rotate then and back const sdr::contact::ViewContactOfE3dScene& rVCScene = static_cast< sdr::contact::ViewContactOfE3dScene& >(rCandidate.mp3DObj->GetScene()->GetViewContact()); const drawinglayer::geometry::ViewInformation3D aViewInfo3D(rVCScene.getViewInformation3D()); basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); @@ -471,7 +436,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) aTransMat *= aInverseOrientation; aTransMat *= rCandidate.maInvDisplayTransform; - // ...und anwenden + // ...and apply rCandidate.maTransform *= aTransMat; if(mbMoveFull) @@ -500,14 +465,9 @@ Pointer E3dDragRotate::GetSdrDragPointer() const return Pointer(POINTER_ROTATE); } -/************************************************************************* -|* -|* E3dDragMove -|* Diese DragMethod wird nur bei Translationen innerhalb von 3D-Scenen -|* benoetigt. Wird eine 3D-Scene selbst verschoben, so wird diese DragMethod -|* nicht verwendet. -|* -\************************************************************************/ +// E3dDragMove. This drag method is only required for translations inside +// 3D scenes. If a 3D-scene itself moved, then this drag method will drag +// not be used. TYPEINIT1(E3dDragMove, E3dDragMethod); @@ -546,11 +506,11 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView, maScaleFixPos = maFullBound.TopLeft(); break; default: - // Bewegen des Objektes, HDL_MOVE + // Moving the object, HDL_MOVE break; } - // Override wenn IsResizeAtCenter() + // Override when IsResizeAtCenter() if(getSdrDragView().IsResizeAtCenter()) { meWhatDragHdl = HDL_USER; @@ -558,11 +518,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView, } } -/************************************************************************* -|* -|* Das Objekt wird bewegt, bestimme die Translation -|* -\************************************************************************/ +// The object is moved, determine the translations void E3dDragMove::MoveSdrDrag(const Point& rPnt) { @@ -574,12 +530,12 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) if(HDL_MOVE == meWhatDragHdl) { // Translation - // Bewegungsvektor bestimmen + // Determine the motion vector basegfx::B3DPoint aGlobalMoveHead((double)(rPnt.X() - maLastPos.X()), (double)(rPnt.Y() - maLastPos.Y()), 32768.0); basegfx::B3DPoint aGlobalMoveTail(0.0, 0.0, 32768.0); const sal_uInt32 nCnt(maGrp.size()); - // Modifier holen + // Get modifier sal_uInt16 nModifier(0); if(getSdrDragView().ISA(E3dView)) @@ -623,7 +579,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) aMoveTail3D.setZ(fZwi); } - // Bewegungsvektor von Aug-Koordinaten nach Parent-Koordinaten + // Motion vector from eye coordinates to parent coordinates basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); basegfx::B3DHomMatrix aCompleteTrans(rCandidate.maInvDisplayTransform * aInverseOrientation); @@ -654,8 +610,8 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) } else { - // Skalierung - // Skalierungsvektor bestimmen + // Scaling + // Determine scaling vector Point aStartPos = DragStat().GetStart(); const sal_uInt32 nCnt(maGrp.size()); @@ -693,7 +649,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) { case HDL_LEFT: case HDL_RIGHT: - // constrain to auf X -> Y equal + // to constrain on X -> Y equal aScNext.setY(aScFixPos.getY()); break; case HDL_UPPER: @@ -755,7 +711,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) aNewTrans *= aInverseOrientation; aNewTrans *= rCandidate.maInvDisplayTransform; - // ...und anwenden + // ...and apply rCandidate.maTransform = aNewTrans; if(mbMoveFull) diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index 51ce68346940..bacb8b06781b 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -39,20 +39,12 @@ TYPEINIT1(E3dUndoAction, SfxUndoAction); -/************************************************************************\ -|* -|* Destruktor der Basisklasse -|* -\************************************************************************/ E3dUndoAction::~E3dUndoAction () { } -/************************************************************************\ -|* -|* Repeat gibt es nicht -|* -\************************************************************************/ +// Repeat does not exist + sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const { return sal_False; @@ -68,50 +60,30 @@ TYPEINIT1(E3dRotateUndoAction, E3dUndoAction); ************************************************************************/ -/************************************************************************\ -|* -|* Undodestruktor fuer 3D-Rotation -|* -\************************************************************************/ +// Undo destructor for 3D-Rotation + E3dRotateUndoAction::~E3dRotateUndoAction () { } -/************************************************************************\ -|* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen -|* -\************************************************************************/ +// Undo for 3D-Rotation on the Rotation matrix + void E3dRotateUndoAction::Undo () { E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj); pMy3DObj->SetTransform(aMyOldRotation); } -/************************************************************************\ -|* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen -|* -\************************************************************************/ +// Redo for 3D-Rotation on the Rotation matrix + void E3dRotateUndoAction::Redo () { E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj); pMy3DObj->SetTransform(aMyNewRotation); } -/************************************************************************* -|* -|* E3dAttributesUndoAction -|* -\************************************************************************/ - TYPEINIT1(E3dAttributesUndoAction, SdrUndoAction); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, E3dView* p3dView, E3dObject* pInObject, @@ -127,54 +99,34 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, { } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ E3dAttributesUndoAction::~E3dAttributesUndoAction() { } -/************************************************************************* -|* -|* Undo() -|* Implementiert ueber Set3DAttributes(), um die Attribute nur an einer -|* Stelle pflegen zu muessen! -|* -\************************************************************************/ +// Undo() implemented through Set3DAttributes() to only maintain the attributes +// in one place + void E3dAttributesUndoAction::Undo() { E3DModifySceneSnapRectUpdater aUpdater(pObject); pObject->SetMergedItemSetAndBroadcast(aOldSet); } -/************************************************************************* -|* -|* Redo() -|* -\************************************************************************/ void E3dAttributesUndoAction::Redo() { E3DModifySceneSnapRectUpdater aUpdater(pObject); pObject->SetMergedItemSetAndBroadcast(aNewSet); } -/************************************************************************* -|* -|* Mehrfaches Undo nicht moeglich -|* -\************************************************************************/ +// Multiple Undo is not possible + sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const { return sal_False; } -/************************************************************************* -|* -|* Mehrfaches Undo nicht moeglich -|* -\************************************************************************/ +// Multiple Undo is not possible + void E3dAttributesUndoAction::Repeat() { } diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 6098b1506da1..aa8ba478ea6f 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -49,7 +49,7 @@ #include <basegfx/polygon/b3dpolypolygontools.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() { @@ -67,12 +67,8 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() TYPEINIT1(E3dExtrudeObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor, erzeugt zwei Deckelflaechen-PolyPolygone und (PointCount-1) -|* Seitenflaechen-Rechtecke aus dem uebergebenen PolyPolygon -|* -\************************************************************************/ +// Constructor creates a two cover surface PolyPolygon and (point-count 1) side +// surfaces rectangles from the passed PolyPolygon E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth) : E3dCompoundObject(rDefault), @@ -83,7 +79,7 @@ E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DP aMirrorY.scale(1.0, -1.0); maExtrudePolygon.transform(aMirrorY); - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); // set extrude depth @@ -93,7 +89,7 @@ E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DP E3dExtrudeObj::E3dExtrudeObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -106,17 +102,11 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) GetProperties().SetObjectItemDirect(Svx3DCloseFrontItem(rDefault.GetDefaultExtrudeCloseFront())); GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultExtrudeCloseBack())); - // Bei extrudes defaultmaessig StdTexture in X und Y + // For extrudes use StdTexture in X and Y by default GetProperties().SetObjectItemDirect(Svx3DTextureProjectionXItem(1)); GetProperties().SetObjectItemDirect(Svx3DTextureProjectionYItem(1)); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const { return E3D_EXTRUDEOBJ_ID; @@ -127,11 +117,8 @@ E3dExtrudeObj* E3dExtrudeObj::Clone() const return CloneHelper< E3dExtrudeObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ + +// Set local parameters with geometry re-creating void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew) { @@ -142,11 +129,7 @@ void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dExtrudeObj::TakeObjNameSingul(XubString& rName) const { @@ -162,23 +145,13 @@ void E3dExtrudeObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralExtrude3d); } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dExtrudeObj::IsBreakObjPossible() { return sal_True; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index b146ec1588cb..20d9c96739ab 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -53,7 +53,7 @@ #include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> -#include <svx/viewpt3d.hxx> // ProjectionType +#include <svx/viewpt3d.hxx> // Projection Type #include <svx/svxids.hrc> #include <svx/dialogs.hrc> @@ -113,7 +113,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ), aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), - // Geometrie + // Geometry aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ), aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ), aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ), @@ -138,7 +138,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ), - // Darstellung + // Representation aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ), aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ), @@ -153,7 +153,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aFLCamera ( this, SVX_RES( FL_CAMERA ) ), aFLLight ( this, SVX_RES( FL_LIGHT ) ), - // Beleuchtung + // Lighting aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ), aBtnLight2 ( this, SVX_RES( BTN_LIGHT_2 ) ), aBtnLight3 ( this, SVX_RES( BTN_LIGHT_3 ) ), @@ -174,7 +174,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ), - // #99694# Keyboard shortcuts activate the next control, so the + // Keyboard shortcuts activate the next control, so the // order needed to be changed here aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox @@ -219,7 +219,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), - // Unterer Bereich + // Lower Range aBtnConvertTo3D ( this, SVX_RES( BTN_CHANGE_TO_3D ) ), aBtnLatheObject ( this, SVX_RES( BTN_LATHE_OBJ ) ), aBtnPerspective ( this, SVX_RES( BTN_PERSPECTIVE ) ), @@ -253,7 +253,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, mpImpl->pPool = NULL; FreeResource(); - // Metrik einstellen + // Set Metric eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit(); aMtrDepth.SetUnit( eFUnit ); @@ -279,7 +279,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnConvertTo3D.SetClickHdl( aLink ); aBtnLatheObject.SetClickHdl( aLink ); - // Geometrie + // Geometry aBtnNormalsObj.SetClickHdl( aLink ); aBtnNormalsFlat.SetClickHdl( aLink ); aBtnNormalsSphere.SetClickHdl( aLink ); @@ -287,10 +287,10 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnNormalsInvert.SetClickHdl( aLink ); aBtnDoubleSided.SetClickHdl( aLink ); - // Darstellung + // Representation aBtnShadow3d.SetClickHdl( aLink ); - // Beleuchtung + // Lighting aBtnLight1.SetClickHdl( aLink ); aBtnLight2.SetClickHdl( aLink ); aBtnLight3.SetClickHdl( aLink ); @@ -305,7 +305,6 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnTexColor.SetClickHdl( aLink ); aBtnTexReplace.SetClickHdl( aLink ); aBtnTexModulate.SetClickHdl( aLink ); - //aBtnTexBlend.SetClickHdl( aLink ); aBtnTexParallelX.SetClickHdl( aLink ); aBtnTexCircleX.SetClickHdl( aLink ); aBtnTexObjectX.SetClickHdl( aLink ); @@ -345,7 +344,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aNumVertical.SetModifyHdl( aLink ); aMtrSlant.SetModifyHdl( aLink ); - // Preview-Callback + // Preview callback aLink = LINK( this, Svx3DWin, ChangeLightCallbackHdl ); aCtlLightPreview.SetUserInteractiveChangeCallback(aLink); aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); @@ -356,7 +355,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, Construct(); - // Initiierung der Initialisierung der ColorLBs + // Initiation of the initialization of the ColorLBs SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { @@ -478,14 +477,14 @@ void Svx3DWin::Construct() // ----------------------------------------------------------------------- void Svx3DWin::Reset() { - // Diverse Initialisierungen, default ist AllAttributes + // Various initializations, default is AllAttributes aLbShademode.SelectEntryPos( 0 ); aMtrMatSpecularIntensity.SetValue( 50 ); aBtnLight1.Check(); ClickUpdateHdl( NULL ); - // Nichts selektieren, um Fehler beim erstselektieren zu vermeiden + // Select nothing, to avoid errors when selecting the first aCtlLightPreview.GetSvx3DLightControl().SelectLight(0); } @@ -528,22 +527,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // construct field values const SfxPoolItem* pItem; - // evtl. PoolUnit ermitteln + // Possible determine PoolUnit if( !mpImpl->pPool ) { mpImpl->pPool = rAttrs.GetPool(); - DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" ); + DBG_ASSERT( mpImpl->pPool, "Where is the Pool? "); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH ); } eFUnit = GetModuleFieldUnit( rAttrs ); -// Segmentanzahl aenderbar ? und andere Stati + // Segment Number Can be changed? and other states SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem ); if( SFX_ITEM_SET == eState ) { sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue(); - //sal_Bool bLathe = (sal_Bool) ( nState & 1 ); sal_Bool bExtrude = (sal_Bool) ( nState & 2 ); sal_Bool bSphere = (sal_Bool) ( nState & 4 ); sal_Bool bCube = (sal_Bool) ( nState & 8 ); @@ -552,7 +550,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !bChart ) { - // Bei Cube-Objekten werden keine Segmente eingestellt + // For cube objects are no segments set aFtHorizontal.Enable( !bCube ); aNumHorizontal.Enable( !bCube ); aFtVertical.Enable( !bCube ); @@ -577,7 +575,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrDepth.SetEmptyFieldValue(); } - // Nur bei Lathe-Objekten gibt es einen Endwinkel + // There is a final angle only for Lathe objects. aFtEndAngle.Enable( !bExtrude && !bCube && !bSphere ); aMtrEndAngle.Enable( !bExtrude && !bCube && !bSphere ); if( bExtrude || bCube || bSphere ) @@ -585,7 +583,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - // Geometrie + // Geometry aFtHorizontal.Enable( sal_False ); aNumHorizontal.Enable( sal_False ); aNumHorizontal.SetEmptyFieldValue(); @@ -600,7 +598,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrDepth.Enable( sal_False ); aMtrDepth.SetEmptyFieldValue(); - // Darstellung + // Representation aBtnShadow3d.Enable( sal_False ); aFtSlant.Enable( sal_False ); aMtrSlant.Enable( sal_False ); @@ -614,12 +612,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrFocalLength.SetEmptyFieldValue(); aFLCamera.Enable( sal_False ); - // Unterer Bereich + //Lower Range aBtnConvertTo3D.Enable( sal_False ); aBtnLatheObject.Enable( sal_False ); } } -// Bitmapfuellung ? -> Status + // Bitmap fill ? -> Status sal_Bool bBitmap(sal_False); eState = rAttrs.GetItemState(XATTR_FILLSTYLE); if(eState != SFX_ITEM_DONTCARE) @@ -648,8 +646,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aFLTexture.Enable( bBitmap ); -// Geometrie - // Anzahl Segmente (horizontal) + // Geometry + // Number of segments (horizontal) if( aNumHorizontal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_HORZ_SEGS); @@ -659,8 +657,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if(nValue != (sal_uInt32 )aNumHorizontal.GetValue()) { aNumHorizontal.SetValue( nValue ); - // evtl. am Ende... - // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue ); bUpdate = sal_True; } else if( aNumHorizontal.IsEmptyFieldValue() ) @@ -676,7 +672,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Anzahl Segmente (vertikal) + //Number of segments (vertical) if( aNumVertical.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS); @@ -686,8 +682,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( nValue != (sal_uInt32) aNumVertical.GetValue() ) { aNumVertical.SetValue( nValue ); - // evtl. am Ende... - //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue ); bUpdate = sal_True; } else if( aNumVertical.IsEmptyFieldValue() ) @@ -703,7 +697,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Tiefe + // Depth if( aMtrDepth.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH); @@ -732,7 +726,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Doppelwandig/-seitig + // Double walled / Double sided eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED); if( eState != SFX_ITEM_DONTCARE ) { @@ -754,7 +748,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Kantenrundung + // Edge rounding if( aMtrPercentDiagonal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL); @@ -779,7 +773,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Tiefenskalierung + // Depth scaling if( aMtrBackscale.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE); @@ -804,7 +798,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Endwinkel + // End angle if( aMtrEndAngle.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); @@ -827,7 +821,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Normalentyp + // Normal type eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND); if( eState != SFX_ITEM_DONTCARE ) { @@ -856,7 +850,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Normalen invertieren + // Normal inverted eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT); if( eState != SFX_ITEM_DONTCARE ) { @@ -878,7 +872,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // 2-seitige Beleuchtung + // 2-sided lighting eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); if( eState != SFX_ITEM_DONTCARE ) { @@ -900,7 +894,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } -// Darstellung + // Representation // Shademode eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE); if( eState != SFX_ITEM_DONTCARE ) @@ -921,7 +915,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // 3D-Shatten + // 3D-Shadow eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D); if( eState != SFX_ITEM_DONTCARE ) { @@ -945,7 +939,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Neigung (Schatten) + // Inclination (Shadow) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT); if( eState != SFX_ITEM_DONTCARE ) { @@ -965,7 +959,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Distanz + // Distance eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE); if( eState != SFX_ITEM_DONTCARE ) { @@ -989,7 +983,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Brennweite + // Focal length eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH); if( eState != SFX_ITEM_DONTCARE ) { @@ -1013,10 +1007,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } -// Beleuchtung +// Lighting Color aColor; basegfx::B3DVector aVector; - // Licht 1 (Farbe) + // Light 1 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_1); if( eState != SFX_ITEM_DONTCARE ) { @@ -1036,7 +1030,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 1 (an/aus) + // Light 1 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1); if( eState != SFX_ITEM_DONTCARE ) { @@ -1058,14 +1052,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 1 (Richtung) + // Light 1 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 2 (Farbe) + //Light 2 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_2); if( eState != SFX_ITEM_DONTCARE ) { @@ -1085,7 +1079,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 2 (an/aus) + // Light 2 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2); if( eState != SFX_ITEM_DONTCARE ) { @@ -1107,14 +1101,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 2 (Richtung) + //Light 2 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 3 (Farbe) + //Light 3 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_3); if( eState != SFX_ITEM_DONTCARE ) { @@ -1134,7 +1128,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 3 (an/aus) + // Ligh 3 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3); if( eState != SFX_ITEM_DONTCARE ) { @@ -1156,14 +1150,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 3 (Richtung) + // Light 3 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 4 (Farbe) + // Light 4 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_4); if( eState != SFX_ITEM_DONTCARE ) { @@ -1183,7 +1177,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 4 (an/aus) + // Light 4 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4); if( eState != SFX_ITEM_DONTCARE ) { @@ -1205,14 +1199,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 4 (Richtung) + // Light 4 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 5 (Farbe) + // Light 5 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_5); if( eState != SFX_ITEM_DONTCARE ) { @@ -1232,7 +1226,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 5 (an/aus) + // Light 5 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5); if( eState != SFX_ITEM_DONTCARE ) { @@ -1254,14 +1248,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 5 (Richtung) + // Light 5 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 6 (Farbe) + // Light 6 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_6); if( eState != SFX_ITEM_DONTCARE ) { @@ -1281,7 +1275,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 6 (an/aus) + // Light 6 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6); if( eState != SFX_ITEM_DONTCARE ) { @@ -1303,14 +1297,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 6 (Richtung) + // Light 6 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 7 (Farbe) + // Light 7 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_7); if( eState != SFX_ITEM_DONTCARE ) { @@ -1330,7 +1324,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 7 (an/aus) + // Light 7 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7); if( eState != SFX_ITEM_DONTCARE ) { @@ -1352,14 +1346,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 7 (Richtung) + // Light 7 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 8 (Farbe) + // Light 8 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_8); if( eState != SFX_ITEM_DONTCARE ) { @@ -1379,7 +1373,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 8 (an/aus) + // Light 8 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8); if( eState != SFX_ITEM_DONTCARE ) { @@ -1401,14 +1395,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 8 (Richtung) + // Light 8 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Umgebungslicht + // Ambient light eState = rAttrs.GetItemState(SDRATTR_3DSCENE_AMBIENTCOLOR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1458,7 +1452,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Modus + // Mode eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE); if( eState != SFX_ITEM_DONTCARE ) { @@ -1469,7 +1463,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { aBtnTexReplace.Check( nValue == 1 ); aBtnTexModulate.Check( nValue == 2 ); - //aBtnTexBlend.Check( nValue == 2 ); bUpdate = sal_True; } } @@ -1480,12 +1473,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { aBtnTexReplace.Check( sal_False ); aBtnTexModulate.Check( sal_False ); - //aBtnTexBlend.Check( sal_False ); bUpdate = sal_True; } } - // Projektion X + // Projection X eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X); if( eState != SFX_ITEM_DONTCARE ) { @@ -1514,7 +1506,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Projektion Y + // Projection Y eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y); if( eState != SFX_ITEM_DONTCARE ) { @@ -1567,10 +1559,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } - // Material Favoriten + // Material Favorites aLbMatFavorites.SelectEntryPos( 0 ); - // Objektfarbe + // Object color eState = rAttrs.GetItemState(XATTR_FILLCOLOR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1591,7 +1583,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Slebstleuchtfarbe + // Self-luminous color eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_EMISSION); if( eState != SFX_ITEM_DONTCARE ) { @@ -1612,7 +1604,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Glanzpunkt + // Specular eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1633,7 +1625,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Glanzpunkt Intensitaet + // Specular Intensity eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); if( eState != SFX_ITEM_DONTCARE ) { @@ -1654,8 +1646,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } -// Sonstige - // Perspektive +// Other + // Perspective eState = rAttrs.GetItemState(SDRATTR_3DSCENE_PERSPECTIVE); if( eState != SFX_ITEM_DONTCARE ) { @@ -1680,16 +1672,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !bUpdate && !bOnly3DChanged ) { - // Eventuell sind aber die 2D-Attribute unterschiedlich. Vergleiche - // diese und entscheide - + // however the 2D attributes may be different. Compare these and decide bUpdate = sal_True; } if( bUpdate || bOnly3DChanged ) { - // Preview updaten + // Update preview SfxItemSet aSet(rAttrs); // set LineStyle hard to XLINE_NONE when it's not set so that @@ -1757,8 +1747,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } } -// Sonstige, muss vorne stehen da auf allen Seiten - // Perspektive +//Others must stand as the front on all sides + // Perspective if( aBtnPerspective.GetState() != STATE_DONTKNOW ) { sal_uInt16 nValue; @@ -1771,19 +1761,19 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_PERSPECTIVE); -// Geometrie - // evtl. PoolUnit ermitteln (Falls dies in Update() nicht passiert ist) +// Geometry + // Possible determine PoolUnit (in this case this haas not happend in Update() ) if( !mpImpl->pPool ) { - OSL_FAIL( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" ); + OSL_FAIL( "No Pool in GetAttr()! May be incompatible to drviewsi.cxx ?" ); mpImpl->pPool = rAttrs.GetPool(); - DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" ); + DBG_ASSERT( mpImpl->pPool, "Where is the Pool?" ); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH ); eFUnit = GetModuleFieldUnit( rAttrs ); } - // Anzahl Segmente (horizontal) + // Number of segments (horizontal) if( !aNumHorizontal.IsEmptyFieldValue() ) { sal_uInt32 nValue = static_cast<sal_uInt32>(aNumHorizontal.GetValue()); @@ -1792,7 +1782,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_HORZ_SEGS); - // Anzahl Segmente (vertikal) + // Number of segments (vertical) if( !aNumVertical.IsEmptyFieldValue() ) { sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue()); @@ -1801,7 +1791,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_VERT_SEGS); - // Tiefe + // Depth if( !aMtrDepth.IsEmptyFieldValue() ) { sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit ); @@ -1810,7 +1800,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_DEPTH); - // Doppelseitig + // Double-sided TriState eState = aBtnDoubleSided.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1820,7 +1810,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_DOUBLE_SIDED); - // Kantenrundung + // Edge rounding if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue(); @@ -1829,7 +1819,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_PERCENT_DIAGONAL); - // Tiefenskalierung + // Depth scale if( !aMtrBackscale.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue(); @@ -1838,7 +1828,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_BACKSCALE); - // Endwinkel + // End angle if( !aMtrEndAngle.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue(); @@ -1847,7 +1837,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE); - // Normalentyp + // Normal type sal_uInt16 nValue = 99; if( aBtnNormalsObj.IsChecked() ) nValue = 0; @@ -1861,7 +1851,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_KIND); - // Normalen invertieren + // Normal inverted eState = aBtnNormalsInvert.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1871,7 +1861,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_INVERT); - // 2-seitige Beleuchtung + // 2-sided lighting eState = aBtnTwoSidedLighting.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1881,8 +1871,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); -// Darstellung - // Shademode +// Representation + // Shade mode if( aLbShademode.GetSelectEntryCount() ) { nValue = aLbShademode.GetSelectEntryPos(); @@ -1891,7 +1881,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADE_MODE); - // 3D-Shatten + // 3D-Shadow eState = aBtnShadow3d.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1905,7 +1895,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_SHADOW); } - // Neigung (Schatten) + // Slant (Shadow) if( !aMtrSlant.IsEmptyFieldValue() ) { sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue(); @@ -1914,7 +1904,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADOW_SLANT); - // Distanz + // Distance if( !aMtrDistance.IsEmptyFieldValue() ) { sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); @@ -1923,7 +1913,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_DISTANCE); - // Brennweite + // Focal length if( !aMtrFocalLength.IsEmptyFieldValue() ) { sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); @@ -1932,13 +1922,13 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_FOCAL_LENGTH); -// Beleuchtung +// Lighting Image aImg; basegfx::B3DVector aVector; Color aColor; const SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes()); - // Licht 1 Farbe + // Light 1 color if( aLbLight1.GetSelectEntryCount() ) { aColor = aLbLight1.GetSelectEntryColor(); @@ -1946,14 +1936,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_1); - // Licht 1 (an/aus) + // Light 1 (on/off) eState = aBtnLight1.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight1 ); rAttrs.Put(Svx3DLightOnOff1Item(bValue)); - // Licht 1 (Richtung) + // Light 1 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)); @@ -1963,7 +1953,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_1); - // Licht 2 Farbe + // Light 2 color if( aLbLight2.GetSelectEntryCount() ) { aColor = aLbLight2.GetSelectEntryColor(); @@ -1971,14 +1961,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_2); - // Licht 2 (an/aus) + // Light 2 (on/off) eState = aBtnLight2.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight2 ); rAttrs.Put(Svx3DLightOnOff2Item(bValue)); - // Licht 2 (Richtung) + // Light 2 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)); @@ -1987,7 +1977,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_2); - // Licht 3 Farbe + // Light 3 color if( aLbLight3.GetSelectEntryCount() ) { aColor = aLbLight3.GetSelectEntryColor(); @@ -1995,14 +1985,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_3); - // Licht 3 (an/aus) + // Light 3 (on/off) eState = aBtnLight3.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight3 ); rAttrs.Put(Svx3DLightOnOff3Item(bValue)); - // Licht 3 (Richtung) + // Light 3 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)); @@ -2011,7 +2001,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_3); - // Licht 4 Farbe + // Light 4 color if( aLbLight4.GetSelectEntryCount() ) { aColor = aLbLight4.GetSelectEntryColor(); @@ -2019,14 +2009,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_4); - // Licht 4 (an/aus) + // Light 4 (on/off) eState = aBtnLight4.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight4 ); rAttrs.Put(Svx3DLightOnOff4Item(bValue)); - // Licht 4 (Richtung) + // Light 4 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)); @@ -2035,7 +2025,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_4); - // Licht 5 Farbe + // Light 5 color if( aLbLight5.GetSelectEntryCount() ) { aColor = aLbLight5.GetSelectEntryColor(); @@ -2043,14 +2033,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_5); - // Licht 5 (an/aus) + // Light 5 (on/off) eState = aBtnLight5.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight5 ); rAttrs.Put(Svx3DLightOnOff5Item(bValue)); - // Licht 5 (Richtung) + // Light 5 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)); @@ -2059,7 +2049,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_5); - // Licht 6 Farbe + // Light 6 color if( aLbLight6.GetSelectEntryCount() ) { aColor = aLbLight6.GetSelectEntryColor(); @@ -2067,14 +2057,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_6); - // Licht 6 (an/aus) + // Light 6 (on/off) eState = aBtnLight6.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight6 ); rAttrs.Put(Svx3DLightOnOff6Item(bValue)); - // Licht 6 (Richtung) + // Light 6 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)); @@ -2083,7 +2073,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_6); - // Licht 7 Farbe + // Light 7 color if( aLbLight7.GetSelectEntryCount() ) { aColor = aLbLight7.GetSelectEntryColor(); @@ -2091,14 +2081,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_7); - // Licht 7 (an/aus) + // Light 7 (on/off) eState = aBtnLight7.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight7 ); rAttrs.Put(Svx3DLightOnOff7Item(bValue)); - // Licht 7 (Richtung) + // Light 7 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)); @@ -2107,7 +2097,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_7); - // Licht 8 Farbe + // Light 8 color if( aLbLight8.GetSelectEntryCount() ) { aColor = aLbLight8.GetSelectEntryColor(); @@ -2115,14 +2105,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_8); - // Licht 8 (an/aus) + // Light 8 (on/off) eState = aBtnLight8.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight8 ); rAttrs.Put(Svx3DLightOnOff8Item(bValue)); - // Licht 8 (Richtung) + // Light 8 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)); @@ -2131,7 +2121,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_8); - // Umgebungslicht + // Ambient light if( aLbAmbientlight.GetSelectEntryCount() ) { aColor = aLbAmbientlight.GetSelectEntryColor(); @@ -2154,21 +2144,19 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_KIND); - // Modus + // Mode nValue = 99; if( aBtnTexReplace.IsChecked() ) nValue = 1; else if( aBtnTexModulate.IsChecked() ) nValue = 2; - //else if( aBtnTexBlend.IsChecked() ) - // nValue = 2; if( nValue == 1 || nValue == 2 ) rAttrs.Put(Svx3DTextureModeItem(nValue)); else rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_MODE); - // Projektion X + // X projection nValue = 99; if( aBtnTexObjectX.IsChecked() ) nValue = 0; @@ -2182,7 +2170,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_PROJ_X); - // Projektion Y + // Y projection nValue = 99; if( aBtnTexObjectY.IsChecked() ) nValue = 0; @@ -2209,7 +2197,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Material - // Objektfarbe + // Object color if( aLbMatColor.GetSelectEntryCount() ) { aColor = aLbMatColor.GetSelectEntryColor(); @@ -2220,7 +2208,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem( XATTR_FILLCOLOR ); } - // Slebstleuchtfarbe + // luminous color if( aLbMatEmission.GetSelectEntryCount() ) { aColor = aLbMatEmission.GetSelectEntryColor(); @@ -2229,7 +2217,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_EMISSION); - // Glanzpunkt + // Specular if( aLbMatSpecular.GetSelectEntryCount() ) { aColor = aLbMatSpecular.GetSelectEntryColor(); @@ -2238,7 +2226,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR); - // Glanzpunkt Intensitaet + // Specular intensity if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) { sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue(); @@ -2254,7 +2242,7 @@ void Svx3DWin::Resize() if ( !IsFloatingMode() || !GetFloatingWindow()->IsRollUp() ) { - Size aWinSize( GetOutputSizePixel() ); // vorher rSize im Resizing() + Size aWinSize( GetOutputSizePixel() ); // why rSize in Resizing()? if( aWinSize.Height() >= GetMinOutputSizePixel().Height() && aWinSize.Width() >= GetMinOutputSizePixel().Width() ) @@ -2287,11 +2275,11 @@ void Svx3DWin::Resize() aFLTexture.Hide(); aFLMaterial.Hide(); - // Verschieben / Resizen + // Moving / resizing aBtnUpdate.SetPosPixel( aBtnUpdate.GetPosPixel() + aXPt ); aBtnAssign.SetPosPixel( aBtnAssign.GetPosPixel() + aXPt ); - // Preview-Controls + // Preview controls aObjSize = aCtlPreview.GetOutputSizePixel(); aObjSize.Width() += aDiffSize.Width(); aObjSize.Height() += aDiffSize.Height(); @@ -2310,7 +2298,7 @@ void Svx3DWin::Resize() aFLTexture.SetOutputSizePixel( aObjSize ); aFLMaterial.SetOutputSizePixel( aObjSize ); - // Y-Position der unteren Buttons + // Y-position of the lower buttons aBtnConvertTo3D.SetPosPixel( aBtnConvertTo3D.GetPosPixel() + aYPt ); aBtnLatheObject.SetPosPixel( aBtnLatheObject.GetPosPixel() + aYPt ); aBtnPerspective.SetPosPixel( aBtnPerspective.GetPosPixel() + aYPt ); @@ -2359,7 +2347,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG ) } else { - // Controls koennen u.U. disabled sein + // Controls can be disabled during certain circumstances } return( 0L ); @@ -2386,7 +2374,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( pBtn ) { - // Da das permanente Updaten der Preview zu teuer waere + // Since the permanent updating of the preview would be too expensive sal_Bool bUpdatePreview = aBtnLight.IsChecked(); aBtnGeo.Check( &aBtnGeo == pBtn ); @@ -2406,7 +2394,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( aBtnMaterial.IsChecked() ) eViewType = VIEWTYPE_MATERIAL; - // Geometrie + // Geometry if( eViewType == VIEWTYPE_GEO ) { aFtHorizontal.Show(); @@ -2458,7 +2446,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnDoubleSided.Hide(); } - // Darstellung + // Representation if( eViewType == VIEWTYPE_REPRESENTATION ) { aFtShademode.Show(); @@ -2490,7 +2478,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aFLRepresentation.Hide(); } - // Beleuchtung + // Lighting if( eViewType == VIEWTYPE_LIGHT ) { aBtnLight1.Show(); @@ -2501,17 +2489,12 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnLight6.Show(); aBtnLight7.Show(); aBtnLight8.Show(); - //aLbLight1.Show(); aBtnLightColor.Show(); aFTLightsource.Show(); aLbAmbientlight.Show(); aBtnAmbientColor.Show(); aFTAmbientlight.Show(); aFLLight.Show(); - //aFtLightX.Show(); - //aFtLightY.Show(); - //aFtLightZ.Show(); - //aGrpLightInfo.Show(); ColorLB* pLb = GetLbByButton(); if( pLb ) @@ -2561,7 +2544,6 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aFtTexMode.Show(); aBtnTexReplace.Show(); aBtnTexModulate.Show(); - //aBtnTexBlend.Show(); aFtTexProjectionX.Show(); aBtnTexParallelX.Show(); aBtnTexCircleX.Show(); @@ -2665,7 +2647,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { nSId = SID_CONVERT_TO_3D_LATHE_FAST; } - // Geometrie + // Geometry else if( pBtn == &aBtnNormalsObj || pBtn == &aBtnNormalsFlat || pBtn == &aBtnNormalsSphere ) @@ -2684,7 +2666,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) pBtn == &aBtnLight7 || pBtn == &aBtnLight8 ) { - // Beleuchtung + // Lighting ColorLB* pLb = GetLbByButton( pBtn ); pLb->Show(); @@ -2753,12 +2735,10 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexReplace || - pBtn == &aBtnTexModulate )// || - //pBtn == &aBtnTexBlend ) + pBtn == &aBtnTexModulate ) { aBtnTexReplace.Check( pBtn == &aBtnTexReplace ); aBtnTexModulate.Check( pBtn == &aBtnTexModulate ); - //aBtnTexBlend.Check( pBtn == &aBtnTexBlend ); bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexParallelX || @@ -2786,7 +2766,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aMtrSlant.Enable( pBtn->IsChecked() ); bUpdatePreview = sal_True; } - // Sonstige (keine Gruppen) + // Other (no groups) else if( pBtn != NULL ) { pBtn->Check( !pBtn->IsChecked() ); @@ -2876,7 +2856,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 3: // Chrom + case 3: // Chrome { aColObj = Color(36,117,153); aColEmis = Color(18,30,51); @@ -2885,7 +2865,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 4: // Plastik + case 4: // Plastic { aColObj = Color(255,48,57); aColEmis = Color(35,0,0); @@ -2894,7 +2874,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 5: // Holz + case 5: // Wood { aColObj = Color(153,71,1); aColEmis = Color(21,22,0); @@ -2917,7 +2897,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) aLbMatFavorites.SelectEntryPos( 0 ); bUpdatePreview = sal_True; } - // Beleuchtung + // Lighting else if( p == &aLbAmbientlight ) { bUpdatePreview = sal_True; @@ -3010,12 +2990,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------- IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG ) { - //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId(); - - //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 ); - //Update( *pSet ); - - // und zuweisen + // and assign ClickAssignHdl( NULL ); return( 0L ); @@ -3053,7 +3028,7 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) ClickHdl( pBtn ); else { - // Zustand: Keine Lampe selektiert + // Status: No lamp selected if( aBtnLight1.IsChecked() ) { aBtnLight1.Check( sal_False ); @@ -3101,8 +3076,8 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -// Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist -// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde +// Method to ensure that the LB is also associated with a color +// returns true if color was added // ----------------------------------------------------------------------- sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { @@ -3137,7 +3112,7 @@ void Svx3DWin::UpdatePreview() if(bOnly3DChanged) { - // slot executen + // Execute slot SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { @@ -3145,21 +3120,21 @@ void Svx3DWin::UpdatePreview() pDispatcher->Execute( SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } - // Flag zuruecksetzen + // Reset Flag bOnly3DChanged = sal_False; } - // ItemSet besorgen + // Get Itemset SfxItemSet aSet( pModel->GetItemPool(), SDRATTR_START, SDRATTR_END); - // Attribute holen und im Preview setzen + // Get Attributes and set the preview GetAttr( aSet ); aCtlPreview.Set3DAttributes( aSet ); aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes( aSet ); } ////////////////////////////////////////////////////////////////////////////// -// document is to be reloaded, destroy remembered ItemSet (#83951#) +// document is to be reloaded, destroy remembered ItemSet void Svx3DWin::DocumentReload() { if(mpRemember2DAttributes) @@ -3183,7 +3158,7 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc ) aLbMatEmission.CopyEntries( aLbLight1 ); aLbMatSpecular.CopyEntries( aLbLight1 ); - // Erstmal... + // First... Color aColWhite( COL_WHITE ); Color aColBlack( COL_BLACK ); aLbLight1.SelectEntry( aColWhite ); @@ -3292,11 +3267,8 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) return( pLb ); }; -/************************************************************************* -|* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Effekte -|* -\************************************************************************/ +// Derivation from SfxChildWindow as "containers" for effects + Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, @@ -3311,11 +3283,6 @@ Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, pWin->Initialize( pInfo ); } -/************************************************************************* -|* -|* ControllerItem fuer 3DStatus -|* -\************************************************************************/ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, Svx3DWin* pWin, SfxBindings* _pBindings) : @@ -3330,11 +3297,7 @@ void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, { } -/************************************************************************* -|* -|* ControllerItem fuer Status Slot SID_CONVERT_TO_3D -|* -\************************************************************************/ +// ControllerItem for Status Slot SID_CONVERT_TO_3D SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings) : SfxControllerItem(_nId, *_pBindings), diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index e03ab866fe08..3c90a26f838c 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -173,7 +173,7 @@ DockingWindow RID_SVXFLOAT_3D }; QuickHelpText [ en-US ] = "Assign" ; }; - // Unterer Teil + // Lower part ImageButton BTN_CHANGE_TO_3D { HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; @@ -333,7 +333,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE; Text [ en-US ] = "Segments" ; }; - // Geometrie + // Geometry FixedText FT_HORIZONTAL { Pos = MAP_APPFONT ( FT_INDENT , SEGMENTS_START_Y+13 ) ; @@ -461,7 +461,7 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText [ en-US ] = "Double-Sided" ; }; - // Darstellung + // Representation FixedText FT_SHADEMODE { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; @@ -588,7 +588,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE; Text [ en-US ] = "Shading" ; }; - // Beleuchtung + // Lighting FixedText FT_LIGHTSOURCE { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; @@ -819,7 +819,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE ; Text [ en-US ] = "Illumination" ; }; - // Texturen + // Textures FixedText FT_TEX_KIND { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 323aeff0b58b..3af96e0a2cec 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -47,7 +47,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() { @@ -65,12 +65,7 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() TYPEINIT1(E3dLatheObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor aus 3D-Polygon, Scale gibt den Umrechnungsfaktor fuer -|* die Koordinaten an -|* -\************************************************************************/ +// Constructor from 3D polygon, scale is the conversion factor for the coordinates E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon rPoly2D) : E3dCompoundObject(rDefault), @@ -81,11 +76,11 @@ E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyP aMirrorY.scale(1.0, -1.0); maPolyPoly2D.transform(aMirrorY); - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); - // Ueberfluessige Punkte entfernen, insbesondere doppelte - // Start- und Endpunkte verhindern + // Superfluous items removed, in particular to prevent duplicate + // start and end points maPolyPoly2D.removeDoublePoints(); if(maPolyPoly2D.count()) @@ -102,16 +97,10 @@ E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyP } } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - E3dLatheObj::E3dLatheObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -125,12 +114,6 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultLatheCloseBack())); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dLatheObj::GetObjIdentifier() const { return E3D_LATHEOBJ_ID; @@ -141,23 +124,13 @@ E3dLatheObj* E3dLatheObj::Clone() const return CloneHelper< E3dLatheObj >(); } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen -|* -\************************************************************************/ +// Convert the object to group object consisting of n polygons SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Neue Segmentierung (Beschreibung siehe Header-File) -|* -\************************************************************************/ - void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) { if ((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && @@ -170,11 +143,7 @@ void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) } } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set Local parameters set to re-create geometry void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew) { @@ -200,11 +169,7 @@ void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dLatheObj::TakeObjNameSingul(XubString& rName) const { @@ -220,23 +185,13 @@ void E3dLatheObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dLatheObj::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralLathe3d); } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dLatheObj::IsBreakObjPossible() { return sal_True; @@ -251,10 +206,10 @@ SdrAttrObj* E3dLatheObj::GetBreakObj() if(pPathObj) { - // Attribute setzen + // Set Attribute SfxItemSet aSet(GetObjectItemSet()); - // Linien aktivieren, um Objekt garantiert sichtbar zu machen + // Enable lines to guarantee that the object becomes visible aSet.Put(XLineStyleItem(XLINE_SOLID)); pPathObj->SetMergedItemSet(aSet); diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 8e2aa78acb39..a31523b47ebd 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -96,11 +96,8 @@ using namespace com::sun::star; -/************************************************************************* -|* -|* Liste fuer 3D-Objekte -|* -\************************************************************************/ + +// List for 3D-Objects TYPEINIT1(E3dObjList, SdrObjList); @@ -120,27 +117,26 @@ E3dObjList::~E3dObjList() void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { - // Owner holen - DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject"); + // Get owner + DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "Insert 3D object in parent != 3DObject"); - // Ist es ueberhaupt ein 3D-Objekt? + // Is it even a 3D object? if(pObj && pObj->ISA(E3dObject)) { - // Normales 3D Objekt, einfuegen mittels + // Normal 3D object, insert means // call parent SdrObjList::NbcInsertObject(pObj, nPos, pReason); } else { - // Kein 3D Objekt, fuege in Seite statt in Szene ein... + // No 3D object, inserted a page in place in a scene ... GetOwnerObj()->GetPage()->InsertObject(pObj, nPos); } } void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { - OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3D object in non-3D Parent"); // call parent SdrObjList::InsertObject(pObj, nPos, pReason); @@ -154,8 +150,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsert SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum) { - DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "Remove 3D object from Parent != 3DObject"); // call parent SdrObject* pRetval = SdrObjList::NbcRemoveObject(nObjNum); @@ -171,8 +166,7 @@ SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum) SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) { - OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3D object is removed from non-3D Parent"); // call parent SdrObject* pRetval = SdrObjList::RemoveObject(nObjNum); @@ -186,12 +180,6 @@ SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) return pRetval; } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - ////////////////////////////////////////////////////////////////////////////// sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() @@ -199,7 +187,7 @@ sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() return new sdr::properties::E3dProperties(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dObject, SdrAttrObj); @@ -217,22 +205,10 @@ E3dObject::E3dObject() bClosedObj = true; } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dObject::~E3dObject() { } -/************************************************************************* -|* -|* Selektions-Flag setzen -|* -\************************************************************************/ - void E3dObject::SetSelected(bool bNew) { if((bool)mbIsSelected != bNew) @@ -251,11 +227,7 @@ void E3dObject::SetSelected(bool bNew) } } -/************************************************************************* -|* -|* Aufbrechen, default-Implementierungen -|* -\************************************************************************/ +// Break, default implementations sal_Bool E3dObject::IsBreakObjPossible() { @@ -267,11 +239,7 @@ SdrAttrObj* E3dObject::GetBreakObj() return 0L; } -/************************************************************************* -|* -|* SetRectsDirty muss ueber die lokale SdrSubList gehen -|* -\************************************************************************/ +// SetRectsDirty must be done through the local SdrSubList void E3dObject::SetRectsDirty(sal_Bool bNotMyself) { @@ -289,33 +257,17 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself) } } -/************************************************************************* -|* -|* Inventor zurueckgeben -|* -\************************************************************************/ - sal_uInt32 E3dObject::GetObjInventor() const { return E3dInventor; } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dObject::GetObjIdentifier() const { return E3D_OBJECT_ID; } -/************************************************************************* -|* -|* Faehigkeiten des Objektes feststellen -|* -\************************************************************************/ +// Determine the capabilities of the object void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { @@ -338,25 +290,17 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const XFillStyle eFillStyle = ((XFillStyleItem&)(GetMergedItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); - // Umwandeln von 3D-Koerpern in Gruppe von Polygonen: - // - // Erst mal nicht moeglich, da die Erzeugung einer Gruppe von - // 2D-Polygonen notwendig waere, die tiefensortiert werden muessten, - // also bei Durchdringugnen auch gegeneinander geschnitten werden - // muessten. Auch die Texturkoorinaten waeren ein ungeloestes - // Problem. + // Convert 3D objects in a group of polygons: + // At first not only possible, because the creation of a group of + // 2D polygons would be required which need to be sorted by depth, + // ie at intersections be cut relative to each other. Also the texture + // coorinates were an unsolved problem. rInfo.bCanConvToPoly = sal_False; rInfo.bCanConvToContour = sal_False; rInfo.bCanConvToPathLineToArea = sal_False; rInfo.bCanConvToPolyLineToArea = sal_False; } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::NbcSetLayer(SdrLayerID nLayer) { SdrAttrObj::NbcSetLayer(nLayer); @@ -372,11 +316,7 @@ void E3dObject::NbcSetLayer(SdrLayerID nLayer) } } -/************************************************************************* -|* -|* ObjList auch an SubList setzen -|* -\************************************************************************/ +// Set ObjList also on SubList void E3dObject::SetObjList(SdrObjList* pNewObjList) { @@ -384,39 +324,23 @@ void E3dObject::SetObjList(SdrObjList* pNewObjList) maSubList.SetUpList(pNewObjList); } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::SetPage(SdrPage* pNewPage) { SdrAttrObj::SetPage(pNewPage); maSubList.SetPage(pNewPage); } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::SetModel(SdrModel* pNewModel) { SdrAttrObj::SetModel(pNewModel); maSubList.SetModel(pNewModel); } -/************************************************************************* -|* -|* resize object, used from old 2d interfaces, e.g. in Move/Scale dialog -|* (F4) -|* -\************************************************************************/ +// resize object, used from old 2d interfaces, e.g. in Move/Scale dialog (F4) + void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - // Bewegung in X,Y im Augkoordinatensystem + // Movement in X, Y in the eye coordinate system E3dScene* pScene = GetScene(); if(pScene) @@ -436,7 +360,7 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti aInverseViewToEye.invert(); aScaleCenter3D = aInverseViewToEye * aScaleCenter3D; - // scale-faktoren holen + // Get scale factors double fScaleX(xFact); double fScaleY(yFact); @@ -454,7 +378,7 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti mFullTransform.invert(); mTrans *= mFullTransform; - // anwenden + // Apply basegfx::B3DHomMatrix mObjTrans(GetTransform()); mObjTrans *= mTrans; @@ -463,22 +387,19 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } } -/************************************************************************* -|* -|* Objekt verschieben in 2D, wird bei Cursortasten benoetigt -|* -\************************************************************************/ + +// Move object in 2D is needed when using cursor keys + void E3dObject::NbcMove(const Size& rSize) { - // Bewegung in X,Y im Augkoordinatensystem + // Movement in X, Y in the eye coordinate system E3dScene* pScene = GetScene(); if(pScene) { - // Abmessungen der Szene in 3D und 2D als Vergleich + //Dimensions of the scene in 3D and 2D for comparison Rectangle aRect = pScene->GetSnapRect(); - // Transformation Weltkoordinaten bis eine VOR Objektkoordinaten holen basegfx::B3DHomMatrix mInvDispTransform; if(GetParentObj()) { @@ -499,7 +420,7 @@ void E3dObject::NbcMove(const Size& rSize) 0.0); basegfx::B3DPoint aPos(0.0, 0.0, 0.0); - // movement vektor to local coordinates of objects' parent + // movement vector to local coordinates of objects' parent basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); basegfx::B3DHomMatrix aCompleteTrans(mInvDispTransform * aInverseOrientation); @@ -516,23 +437,13 @@ void E3dObject::NbcMove(const Size& rSize) } } -/************************************************************************* -|* -|* liefere die Sublist, aber nur dann, wenn darin Objekte enthalten sind ! -|* -\************************************************************************/ +// Return the sublist, but only if it contains objects! SdrObjList* E3dObject::GetSubList() const { return &(const_cast< E3dObjList& >(maSubList)); } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dObject::RecalcSnapRect() { maSnapRect = Rectangle(); @@ -548,13 +459,8 @@ void E3dObject::RecalcSnapRect() } } -/************************************************************************* -|* -|* Einfuegen eines 3D-Objekts an den Parent weitermelden, damit dieser -|* ggf. eine Sonderbehandlung fuer spezielle Objekte durchfuehren kann -|* (z.B. Light/Label in E3dScene) -|* -\************************************************************************/ +// Inform the parent about insertion of a 3D object, so that the parent is able +// treat the particualar objects in a special way (eg Light / Label in E3dScene) void E3dObject::NewObjectInserted(const E3dObject* p3DObj) { @@ -562,13 +468,8 @@ void E3dObject::NewObjectInserted(const E3dObject* p3DObj) GetParentObj()->NewObjectInserted(p3DObj); } -/************************************************************************* -|* -|* Parent ueber Aenderung der Struktur (z.B. durch Transformation) -|* informieren; dabei wird das Objekt, in welchem die Aenderung -|* aufgetreten ist, uebergeben -|* -\************************************************************************/ +// Inform parent of changes in the structure (eg by transformation), in this +// process the object in which the change has occurred is returned. void E3dObject::StructureChanged() { @@ -579,15 +480,9 @@ void E3dObject::StructureChanged() } } -/************************************************************************* -|* -|* 3D-Objekt einfuegen -|* -\************************************************************************/ - void E3dObject::Insert3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj, "Insert3DObj mit NULL-Zeiger!"); + DBG_ASSERT(p3DObj, "Insert3DObj with NULL-pointer!"); SdrPage* pPg = pPage; maSubList.InsertObject(p3DObj); pPage = pPg; @@ -598,7 +493,7 @@ void E3dObject::Insert3DObj(E3dObject* p3DObj) void E3dObject::Remove3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj, "Remove3DObj mit NULL-Zeiger!"); + DBG_ASSERT(p3DObj, "Remove3DObj with NULL-pointer!"); if(p3DObj->GetParentObj() == this) { @@ -611,12 +506,6 @@ void E3dObject::Remove3DObj(E3dObject* p3DObj) } } -/************************************************************************* -|* -|* Parent holen -|* -\************************************************************************/ - E3dObject* E3dObject::GetParentObj() const { E3dObject* pRetval = NULL; @@ -628,11 +517,7 @@ E3dObject* E3dObject::GetParentObj() const return pRetval; } -/************************************************************************* -|* -|* Uebergeordnetes Szenenobjekt bestimmen -|* -\************************************************************************/ +// Determine the top-level scene object E3dScene* E3dObject::GetScene() const { @@ -641,11 +526,7 @@ E3dScene* E3dObject::GetScene() const return NULL; } -/************************************************************************* -|* -|* umschliessendes Volumen inklusive aller Kindobjekte berechnen -|* -\************************************************************************/ +// Calculate enclosed volume, including all child objects basegfx::B3DRange E3dObject::RecalcBoundVolume() const { @@ -690,11 +571,7 @@ basegfx::B3DRange E3dObject::RecalcBoundVolume() const return aRetval; } -/************************************************************************* -|* -|* umschliessendes Volumen zurueckgeben und ggf. neu berechnen -|* -\************************************************************************/ +// Get enclosed volume and possibly recalculate it const basegfx::B3DRange& E3dObject::GetBoundVolume() const { @@ -711,11 +588,7 @@ void E3dObject::InvalidateBoundVolume() maLocalBoundVol.reset(); } -/************************************************************************* -|* -|* Aederung des BoundVolumes an alle Kindobjekte weitergeben -|* -\************************************************************************/ +// Pass on the changes of the BoundVolumes to all child objects void E3dObject::SetBoundVolInvalid() { @@ -732,11 +605,7 @@ void E3dObject::SetBoundVolInvalid() } } -/************************************************************************* -|* -|* Aederung der Transformation an alle Kindobjekte weitergeben -|* -\************************************************************************/ +// Pass on the changes in transformation to all child objects void E3dObject::SetTransformChanged() { @@ -754,12 +623,8 @@ void E3dObject::SetTransformChanged() } } -/************************************************************************* -|* -|* hierarchische Transformation ueber alle Parents bestimmen, in -|* maFullTransform ablegen und diese zurueckgeben -|* -\************************************************************************/ +// Define the hierarchical transformation over all Parents, store in +// maFullTransform and return them const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const { @@ -779,23 +644,11 @@ const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const return maFullTransform; } -/************************************************************************* -|* -|* Transformationsmatrix abfragen -|* -\************************************************************************/ - const basegfx::B3DHomMatrix& E3dObject::GetTransform() const { return maTransformation; } -/************************************************************************* -|* -|* Transformationsmatrix setzen -|* -\************************************************************************/ - void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { if(maTransformation != rMatrix) @@ -806,17 +659,12 @@ void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) } } -/************************************************************************* -|* -|* Transformationsmatrix setzen mit Repaint-Broadcast -|* -\************************************************************************/ +// Set transformation matrix with repaint broadcast void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix) { if(rMatrix != maTransformation) { - // #110094#-14 SendRepaintBroadcast(); NbcSetTransform(rMatrix); SetChanged(); BroadcastObjectChange(); @@ -824,24 +672,13 @@ void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix) } } -/************************************************************************* -|* -|* Linien fuer die Wireframe-Darstellung des Objekts dem uebergebenen -|* basegfx::B3DPolygon hinzufuegen -|* -\************************************************************************/ - basegfx::B3DPolyPolygon E3dObject::CreateWireframe() const { const basegfx::B3DRange aBoundVolume(GetBoundVolume()); return basegfx::tools::createCubePolyPolygonFromB3DRange(aBoundVolume); } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dObject::TakeObjNameSingul(XubString& rName) const { @@ -857,11 +694,7 @@ void E3dObject::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dObject::TakeObjNamePlural(XubString& rName) const { @@ -873,12 +706,6 @@ E3dObject* E3dObject::Clone() const return CloneHelper< E3dObject >(); } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - E3dObject& E3dObject::operator=(const E3dObject& rObj) { if( this == &rObj ) @@ -891,38 +718,24 @@ E3dObject& E3dObject::operator=(const E3dObject& rObj) maSubList.CopyObjects(*r3DObj.GetSubList()); } - // BoundVol kann uebernommen werden, da die Childs auch kopiert werden + // BoundVol can be copied since also the children are copied maLocalBoundVol = r3DObj.maLocalBoundVol; maTransformation = r3DObj.maTransformation; - // Da sich der Parent geaendert haben kann, Gesamttransformation beim - // naechsten Mal auf jeden Fall neu bestimmen + // Because the parent may have changed, definitely redefine the total + // transformation next time SetTransformChanged(); - // Selektionsstatus kopieren + // Copy selection status mbIsSelected = r3DObj.mbIsSelected; return *this; } -/************************************************************************* -|* -|* erstelle neues GeoData-Objekt -|* -\************************************************************************/ - SdrObjGeoData *E3dObject::NewGeoData() const { - // Theoretisch duerfen auch nur Szenen ihre GeoDatas erstellen und verwalten !! - // AW: Dies stimmt nicht mehr, diese Stelle ist mit der neuen Engine OK! return new E3DObjGeoData; } -/************************************************************************* -|* -|* uebergebe aktuelle werte an das GeoData-Objekt -|* -\************************************************************************/ - void E3dObject::SaveGeoData(SdrObjGeoData& rGeo) const { SdrAttrObj::SaveGeoData (rGeo); @@ -931,12 +744,6 @@ void E3dObject::SaveGeoData(SdrObjGeoData& rGeo) const ((E3DObjGeoData &) rGeo).maTransformation = maTransformation; } -/************************************************************************* -|* -|* uebernehme werte aus dem GeoData-Objekt -|* -\************************************************************************/ - void E3dObject::RestGeoData(const SdrObjGeoData& rGeo) { maLocalBoundVol = ((E3DObjGeoData &) rGeo).maLocalBoundVol; @@ -945,34 +752,29 @@ void E3dObject::RestGeoData(const SdrObjGeoData& rGeo) SdrAttrObj::RestGeoData (rGeo); } -/************************************************************************* -|* -|* Rotation eines 3d-Koerpers -|* -\************************************************************************/ -// 2D-rotation eines 3D-Koerpers, normalerweise macht das die Szene selbst -// Ist aber eine korrekte Implementierung, denn alles was passiert ist eine -// Rotation um die Achse die senkrecht auf dem Bildschirm steht und zwar -// unabhaengig davon, wie die Szene bisher gedreht worden ist. +// 2D-rotation of a 3D-body, normally this is done by the scene itself. +// This is however a correct implementation, because everything that has +// happened is a rotation around the axis perpendicular to the screen and that +// is regardless of how the scene has been rotated up until now. void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen - // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil - // dafuer gibt es den - SetGlueReallyAbsolute(sal_True); + // So currently the glue points are defined relative to the scene aOutRect. + // Before turning the glue points are defined relative to the page. They + // take no part in the rotation of the scene. To ensure this, there is the + // SetGlueReallyAbsolute(sal_True); - // SendRepaintBroadcast(); double fWinkelInRad = nWink/100 * F_PI180; basegfx::B3DHomMatrix aRotateZ; aRotateZ.rotate(0.0, 0.0, fWinkelInRad); NbcSetTransform(aRotateZ * GetTransform()); - SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects - NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ - // zum Urpsung des Blattes - SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetRectsDirty(); // This forces a recalculation of all BoundRects + NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still + // have coordinates relative to the + // original page) + SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect) } /*************************************************************************/ @@ -984,23 +786,17 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti return new sdr::properties::E3dCompoundProperties(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dCompoundObject, E3dObject); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dCompoundObject::E3dCompoundObject() : E3dObject(), aMaterialAmbientColor(), bCreateNormals(false), bCreateTexture(false) { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -1011,35 +807,23 @@ E3dCompoundObject::E3dCompoundObject(E3dDefaultAttributes& rDefault) bCreateNormals(false), bCreateTexture(false) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); } void E3dCompoundObject::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { - // Defaults setzen + // Set defaults aMaterialAmbientColor = rDefault.GetDefaultAmbientColor(); bCreateNormals = rDefault.GetDefaultCreateNormals(); bCreateTexture = rDefault.GetDefaultCreateTexture(); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dCompoundObject::~E3dCompoundObject () { } -/************************************************************************* -|* -|* Drag-Polygon zurueckgeben -|* -\************************************************************************/ - basegfx::B2DPolyPolygon E3dCompoundObject::TakeXorPoly() const { basegfx::B2DPolyPolygon aRetval; @@ -1059,24 +843,12 @@ basegfx::B2DPolyPolygon E3dCompoundObject::TakeXorPoly() const return aRetval; } -/************************************************************************* -|* -|* Anzahl der Handles zurueckgeben -|* -\************************************************************************/ - sal_uInt32 E3dCompoundObject::GetHdlCount() const { - // 8 Eckpunkte + 1 E3dVolumeMarker (= Wireframe-Darstellung) + // 8 corners + 1 E3dVolumeMarker (= Wireframe representation) return 9L; } -/************************************************************************* -|* -|* Handle-Liste fuellen -|* -\************************************************************************/ - void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const { const uno::Sequence< beans::PropertyValue > aEmptyParameters; @@ -1130,23 +902,11 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const } } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dCompoundObject::GetObjIdentifier() const { return E3D_COMPOUNDOBJ_ID; } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dCompoundObject::RecalcSnapRect() { const uno::Sequence< beans::PropertyValue > aEmptyParameters; @@ -1196,12 +956,6 @@ E3dCompoundObject* E3dCompoundObject::Clone() const return CloneHelper< E3dCompoundObject >(); } -/************************************************************************* -|* -|* Parameter Geometrieerzeugung setzen -|* -\************************************************************************/ - void E3dCompoundObject::SetCreateNormals(sal_Bool bNew) { if(bCreateNormals != bNew) @@ -1220,11 +974,7 @@ void E3dCompoundObject::SetCreateTexture(sal_Bool bNew) } } -/************************************************************************* -|* -|* Material des Objektes -|* -\************************************************************************/ +// Material of the object void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor) { @@ -1234,11 +984,7 @@ void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor) } } -/************************************************************************* -|* -|* convert given basegfx::B3DPolyPolygon to screen coor -|* -\************************************************************************/ +// convert given basegfx::B3DPolyPolygon to screen coor basegfx::B2DPolyPolygon E3dCompoundObject::TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate) { diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 8e29358c14f9..83797deb1f40 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -39,12 +39,6 @@ #include "svx/objfac3d.hxx" #include <svx/svdobj.hxx> -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - static sal_Bool bInit = sal_False; E3dObjFactory::E3dObjFactory() @@ -56,21 +50,11 @@ E3dObjFactory::E3dObjFactory() } } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dObjFactory::~E3dObjFactory() { } -/************************************************************************* -|* -|* Chart-interne Objekte erzeugen -|* -\************************************************************************/ +// Generate chart internal objects IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { @@ -88,10 +72,11 @@ IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) pObjFactory->pNewObj = new E3dCubeObj(); break; case E3D_SPHEREOBJ_ID: - // FG: ruft den dummy constructor, da dieser Aufruf nur beim Laden von Dokumenten erfolgt. - // die wirkliche Anzahkl Segmente wird aber erst nach dem Laden der Member festgelegt. - // dies hat zur Folge das die erste Kugel gleich wieder zerstoert wird, obwohl sie nie - // gebraucht worden ist. + // Gets the dummy constructor, as this is only called when + // loading documents. The actual number of segments is however + // determined only after loading the members. This will result + // in that the first sphere will be immediately destroyed, + // although it was never used. pObjFactory->pNewObj = new E3dSphereObj(123); break; case E3D_EXTRUDEOBJ_ID: diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 00f3c4432c85..008ab42bf165 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -39,19 +39,13 @@ TYPEINIT1(E3dPolygonObj, E3dCompoundObject); ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfE3dPolygon(*this); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -59,22 +53,16 @@ E3dPolygonObj::E3dPolygonObj( : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { - // Geometrie setzen + // Set geometry SetPolyPolygon3D(rPolyPoly3D); - // Default-Normals erzeugen + // Create default normals CreateDefaultNormals(); - // Default-Texturkoordinaten erzeugen + // Create default texture coordinates CreateDefaultTexture(); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -83,20 +71,14 @@ E3dPolygonObj::E3dPolygonObj( : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { - // Geometrie und Normalen setzen + // Set geometry and the normal SetPolyPolygon3D(rPolyPoly3D); SetPolyNormals3D(rPolyNormals3D); - // Default-Texturkoordinaten erzeugen + // Create default texture coordinates CreateDefaultTexture(); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -111,105 +93,85 @@ E3dPolygonObj::E3dPolygonObj( SetPolyTexture2D(rPolyTexture2D); } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj() : E3dCompoundObject(), bLineOnly(false) // added missing initialisation { - // Keine Geometrie erzeugen + // Create no geometry } -/************************************************************************* -|* -|* Default-Normalen erzeugen -|* -\************************************************************************/ - void E3dPolygonObj::CreateDefaultNormals() { basegfx::B3DPolyPolygon aPolyNormals; - // Komplettes PolyPolygon mit den Ebenennormalen anlegen + // Create a complete PolyPolygon with the plane normal for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) { - // Quellpolygon finden + // Find source polygon const basegfx::B3DPolygon aPolygon(aPolyPoly3D.getB3DPolygon(a)); - // Neues Polygon fuer Normalen anlegen + // Creating a new polygon for the normal basegfx::B3DPolygon aNormals; - // Normale holen (und umdrehen) + // Get normal (and invert) basegfx::B3DVector aNormal(-basegfx::tools::getNormal(aPolygon)); - // Neues Polygon fuellen + // Fill new polygon for(sal_uInt32 b(0L); b < aPolygon.count(); b++) { aNormals.append(aNormal); } - // Neues Polygon in PolyPolygon einfuegen + // Insert new polygon into the PolyPolygon aPolyNormals.append(aNormals); } - // Default-Normalen setzen + // Set default normal SetPolyNormals3D(aPolyNormals); } -/************************************************************************* -|* -|* Default-Texturkoordinaten erzeugen -|* -\************************************************************************/ - void E3dPolygonObj::CreateDefaultTexture() { basegfx::B2DPolyPolygon aPolyTexture; - - // Komplettes PolyPolygon mit den Texturkoordinaten anlegen - // Die Texturkoordinaten erstrecken sich ueber X,Y und Z - // ueber die gesamten Extremwerte im Bereich 0.0 .. 1.0 + // Create a complete PolyPolygon with the texture coordinates + // The texture coordinates extend over X,Y and Z + // on the whole extreme values in the range 0.0 .. 1.0 for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) { - // Quellpolygon finden + // Find source polygon const basegfx::B3DPolygon& aPolygon(aPolyPoly3D.getB3DPolygon(a)); - // Gesamtgroesse des Objektes feststellen + // Determine the total size of the object basegfx::B3DRange aVolume(basegfx::tools::getRange(aPolygon)); - // Normale holen + // Get normal basegfx::B3DVector aNormal(basegfx::tools::getNormal(aPolygon)); aNormal.setX(fabs(aNormal.getX())); aNormal.setY(fabs(aNormal.getY())); aNormal.setZ(fabs(aNormal.getZ())); - // Entscheiden, welche Koordinaten als Source fuer das - // Mapping benutzt werden sollen + // Decide which coordinates should be used as a source for the mapping sal_uInt16 nSourceMode = 0; - // Groessten Freiheitsgrad ermitteln + // Determine the greatest degree of freedom if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ())) { if(aNormal.getY() > aNormal.getZ()) { - // Y ist am groessten, benutze X,Z als mapping + // Y is the largest, use X,Z as mapping nSourceMode = 1; } else { - // Z ist am groessten, benutze X,Y als mapping + // Z is the largest, use X,Y as mapping nSourceMode = 2; } } - // Neues Polygon fuer Texturkoordinaten anlegen + // Create new polygon for texture coordinates basegfx::B2DPolygon aTexture; - // Neues Polygon fuellen + // Fill new polygon for(sal_uInt32 b(0L); b < aPolygon.count(); b++) { basegfx::B2DPoint aTex; @@ -217,21 +179,21 @@ void E3dPolygonObj::CreateDefaultTexture() switch(nSourceMode) { - case 0: // Quelle ist Y,Z + case 0: //Source is Y,Z if(aVolume.getHeight()) aTex.setX((aCandidate.getY() - aVolume.getMinY()) / aVolume.getHeight()); if(aVolume.getDepth()) aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth()); break; - case 1: // Quelle ist X,Z + case 1: // Source is X,Z if(aVolume.getWidth()) aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth()); if(aVolume.getDepth()) aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth()); break; - case 2: // Quelle ist X,Y + case 2: // Source is X,Y if(aVolume.getWidth()) aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth()); if(aVolume.getHeight()) @@ -242,49 +204,31 @@ void E3dPolygonObj::CreateDefaultTexture() aTexture.append(aTex); } - // Neues Polygon in PolyPolygon einfuegen + // Insert new polygon into the PolyPolygon aPolyTexture.append(aTexture); } - // Default-Texturkoordinaten setzen + // Set default Texture coordinates SetPolyTexture2D(aPolyTexture); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dPolygonObj::~E3dPolygonObj() { } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dPolygonObj::GetObjIdentifier() const { return E3D_POLYGONOBJ_ID; } -/************************************************************************* -|* -|* Polygon setzen -|* -\************************************************************************/ - void E3dPolygonObj::SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D) { if ( aPolyPoly3D != rNewPolyPoly3D ) { - // Neues PolyPolygon; kopieren + // New PolyPolygon; copying aPolyPoly3D = rNewPolyPoly3D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } @@ -293,10 +237,10 @@ void E3dPolygonObj::SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyNorm { if ( aPolyNormals3D != rNewPolyNormals3D ) { - // Neue Normalen; kopieren + // New PolyPolygon; copying aPolyNormals3D = rNewPolyNormals3D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } @@ -305,19 +249,15 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText { if ( aPolyTexture2D != rNewPolyTexture2D ) { - // Neue Texturkoordinaten; kopieren + // New PolyPolygon; copying aPolyTexture2D = rNewPolyTexture2D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus 6 Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of 6 polygons SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { @@ -329,12 +269,6 @@ E3dPolygonObj* E3dPolygonObj::Clone() const return CloneHelper< E3dPolygonObj >(); } -/************************************************************************* -|* -|* LineOnly setzen -|* -\************************************************************************/ - void E3dPolygonObj::SetLineOnly(sal_Bool bNew) { if(bNew != bLineOnly) diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index ab6f2686ae32..bd2b081c7112 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -61,12 +61,6 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault) { } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dPolyScene::GetObjIdentifier() const { return E3D_POLYSCENE_ID; diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 159daf97badc..1708fad29b4f 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -62,14 +62,13 @@ #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() ////////////////////////////////////////////////////////////////////////////// -// #110988# class ImpRemap3DDepth { sal_uInt32 mnOrdNum; double mfMinimalDepth; - // bitfield + // bit field unsigned mbIsScene : 1; public: @@ -125,7 +124,6 @@ bool ImpRemap3DDepth::operator<(const ImpRemap3DDepth& rComp) const typedef ::std::vector< ImpRemap3DDepth > ImpRemap3DDepthVector; ////////////////////////////////////////////////////////////////////////////// -// #110988# class Imp3DDepthRemapper { @@ -194,30 +192,24 @@ sdr::properties::BaseProperties* E3dScene::CreateObjectSpecificProperties() } ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfE3dScene(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dScene, E3dObject); -/************************************************************************* -|* -|* E3dScene-Konstruktor -|* -\************************************************************************/ - E3dScene::E3dScene() : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), mp3DDepthRemapper(0L), bDrawOnlySelected(false) { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -228,27 +220,20 @@ E3dScene::E3dScene(E3dDefaultAttributes& rDefault) mp3DDepthRemapper(0L), bDrawOnlySelected(false) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); } void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) { - // Fuer OS/2 die FP-Exceptions abschalten -#if defined(OS2) -#define SC_FPEXCEPTIONS_ON() _control87( MCW_EM, 0 ) -#define SC_FPEXCEPTIONS_OFF() _control87( MCW_EM, MCW_EM ) - SC_FPEXCEPTIONS_OFF(); -#endif - - // Fuer WIN95/NT die FP-Exceptions abschalten + // For WIN95/NT turn off the FP-Exceptions #if defined(WNT) #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) SC_FPEXCEPTIONS_OFF(); #endif - // Defaults setzen + // Set defaults aCamera.SetViewWindow(-2, -2, 4, 4); aCameraSet.SetDeviceRectangle(-2, 2, -2, 2); aCamera.SetDeviceWindow(Rectangle(0, 0, 10, 10)); @@ -269,15 +254,8 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) aCamera.SetFocalLength(fNew); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dScene::~E3dScene() { - // #110988# ImpCleanup3DDepthMapper(); } @@ -294,7 +272,6 @@ basegfx::B2DPolyPolygon E3dScene::TakeXorPoly() const return aRetval; } -// #110988# void E3dScene::ImpCleanup3DDepthMapper() { if(mp3DDepthRemapper) @@ -304,7 +281,6 @@ void E3dScene::ImpCleanup3DDepthMapper() } } -// #110988# sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const { if(!mp3DDepthRemapper) @@ -325,12 +301,6 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const return nNewOrdNum; } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dScene::GetObjIdentifier() const { return E3D_SCENE_ID; @@ -352,12 +322,6 @@ void E3dScene::SetBoundRectDirty() } } -/************************************************************************* -|* -|* SetSnapRect -|* -\************************************************************************/ - void E3dScene::NbcSetSnapRect(const Rectangle& rRect) { SetRectsDirty(); @@ -365,16 +329,9 @@ void E3dScene::NbcSetSnapRect(const Rectangle& rRect) aCamera.SetDeviceWindow(rRect); aCameraSet.SetViewportRectangle((Rectangle&)rRect); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Objekt verschieben -|* -\************************************************************************/ - void E3dScene::NbcMove(const Size& rSize) { Rectangle aNewSnapRect = GetSnapRect(); @@ -382,12 +339,6 @@ void E3dScene::NbcMove(const Size& rSize) NbcSetSnapRect(aNewSnapRect); } -/************************************************************************* -|* -|* Objekt Resizen -|* -\************************************************************************/ - void E3dScene::NbcResize(const Point& rRef, const Fraction& rXFact, const Fraction& rYFact) { @@ -396,51 +347,40 @@ void E3dScene::NbcResize(const Point& rRef, const Fraction& rXFact, NbcSetSnapRect(aNewSnapRect); } -/************************************************************************* -|* -|* Neue Kamera setzen, und dabei die Szene und ggf. das BoundVolume -|* als geaendert markieren -|* -\************************************************************************/ +// Set new camera, and thus mark the scene and if possible the bound volume +// as changed void E3dScene::SetCamera(const Camera3D& rNewCamera) { - // Alte Kamera setzen + // Set old camera aCamera = rNewCamera; ((sdr::properties::E3dSceneProperties&)GetProperties()).SetSceneItemsFromCamera(); SetRectsDirty(); - // Neue Kamera aus alter fuellen + // Fill new camera from old Camera3D& rCam = (Camera3D&)GetCamera(); - // Ratio abschalten + // Turn off ratio if(rCam.GetAspectMapping() == AS_NO_MAPPING) GetCameraSet().SetRatio(0.0); - // Abbildungsgeometrie setzen + // Set Imaging geometry basegfx::B3DPoint aVRP(rCam.GetViewPoint()); basegfx::B3DVector aVPN(aVRP - rCam.GetVRP()); basegfx::B3DVector aVUV(rCam.GetVUV()); - // #91047# use SetViewportValues() to set VRP, VPN and VUV as vectors, too. + // use SetViewportValues() to set VRP, VPN and VUV as vectors, too. // Else these values would not be exported/imported correctly. GetCameraSet().SetViewportValues(aVRP, aVPN, aVUV); - // Perspektive setzen + // Set perspective GetCameraSet().SetPerspective(rCam.GetProjection() == PR_PERSPECTIVE); GetCameraSet().SetViewportRectangle((Rectangle&)rCam.GetDeviceWindow()); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* 3D-Objekt einfuegen -|* -\************************************************************************/ - void E3dScene::NewObjectInserted(const E3dObject* p3DObj) { E3dObject::NewObjectInserted(p3DObj); @@ -448,30 +388,20 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj) if ( p3DObj == this ) return; - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Parent ueber Aenderung eines Childs informieren -|* -\************************************************************************/ +// Inform parent of changes of a child void E3dScene::StructureChanged() { E3dObject::StructureChanged(); SetRectsDirty(); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Uebergeordnetes Szenenobjekt bestimmen -|* -\************************************************************************/ +// Determine the overall scene object E3dScene* E3dScene::GetScene() const { @@ -534,12 +464,6 @@ E3dScene* E3dScene::Clone() const return CloneHelper< E3dScene >(); } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - E3dScene& E3dScene::operator=(const E3dScene& rObj) { if( this == &rObj ) @@ -549,16 +473,13 @@ E3dScene& E3dScene::operator=(const E3dScene& rObj) const E3dScene& r3DObj = (const E3dScene&) rObj; aCamera = r3DObj.aCamera; - // neu ab 377: aCameraSet = r3DObj.aCameraSet; ((sdr::properties::E3dSceneProperties&)GetProperties()).SetSceneItemsFromCamera(); - // SetSnapRect(r3DObj.GetSnapRect()); InvalidateBoundVolume(); RebuildLists(); SetRectsDirty(); - // #110988# ImpCleanup3DDepthMapper(); // #i101941# @@ -576,20 +497,16 @@ E3dScene& E3dScene::operator=(const E3dScene& rObj) return *this; } -/************************************************************************* -|* -|* Licht- und Labelobjektlisten neu aufbauen (nach Laden, Zuweisung) -|* -\************************************************************************/ +// Rebuild Light- and label- object lists rebuild (after loading, allocation) void E3dScene::RebuildLists() { - // zuerst loeschen + // first delete SdrLayerID nCurrLayerID = GetLayer(); SdrObjListIter a3DIterator(maSubList, IM_FLAT); - // dann alle Objekte in der Szene pruefen + // then examine all the objects in the scene while ( a3DIterator.IsMore() ) { E3dObject* p3DObj = (E3dObject*) a3DIterator.Next(); @@ -598,23 +515,11 @@ void E3dScene::RebuildLists() } } -/************************************************************************* -|* -|* erstelle neues GeoData-Objekt -|* -\************************************************************************/ - SdrObjGeoData *E3dScene::NewGeoData() const { return new E3DSceneGeoData; } -/************************************************************************* -|* -|* uebergebe aktuelle werte an das GeoData-Objekt -|* -\************************************************************************/ - void E3dScene::SaveGeoData(SdrObjGeoData& rGeo) const { E3dObject::SaveGeoData (rGeo); @@ -622,12 +527,6 @@ void E3dScene::SaveGeoData(SdrObjGeoData& rGeo) const ((E3DSceneGeoData &) rGeo).aCamera = aCamera; } -/************************************************************************* -|* -|* uebernehme werte aus dem GeoData-Objekt -|* -\************************************************************************/ - void E3dScene::RestGeoData(const SdrObjGeoData& rGeo) { // #i94832# removed E3DModifySceneSnapRectUpdater here. @@ -636,11 +535,7 @@ void E3dScene::RestGeoData(const SdrObjGeoData& rGeo) SetCamera (((E3DSceneGeoData &) rGeo).aCamera); } -/************************************************************************* -|* -|* Am StyleSheet wurde etwas geaendert, also Scene aendern -|* -\************************************************************************/ +// Something was changed in the style sheet, so change scene void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint) { @@ -648,10 +543,6 @@ void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint) E3dObject::Notify(rBC, rHint); } -/************************************************************************* -|* -\************************************************************************/ - void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double cs) { Point UpperLeft, LowerRight, Center, NewCenter; @@ -666,13 +557,14 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double Rectangle RectQuelle(aOutRect), RectZiel(aOutRect); - // Nur der Mittelpunkt wird bewegt. Die Ecken werden von NbcMove bewegt. - // Fuer das Drehen wird von mir ein kartesisches Koordinatensystem verwendet in dem der Drehpunkt - // der Nullpunkt ist und die Y- Achse nach oben ansteigt, die X-Achse nach rechts. - // Dies muss bei den Y-Werten beachtet werden. (Auf dem Blatt zeigt die Y-Achse nach unten + // Only the center is moved. The corners are moved by NbcMove. For the + // rotation a cartesian coordinate system is used in which the pivot + // point is the origin, and the y-axis increases upward, the X-axis to + // the right. This must be especially noted for the Y-values. + // (When considering a flat piece of paper the Y-axis pointing downwards Center.X() = (UpperLeft.X() + dxOutRectHalf) - rRef.X(); Center.Y() = -((UpperLeft.Y() + dyOutRectHalf) - rRef.Y()); - // Ein paar Spezialfaelle zuerst abhandeln (n*90 Grad n ganzzahlig) + // A few special cases has to be dealt with first (n * 90 degrees n integer) if (sn==1.0 && cs==0.0) { // 90deg NewCenter.X() = -Center.Y(); NewCenter.Y() = -Center.X(); @@ -683,11 +575,12 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double NewCenter.X() = Center.Y(); NewCenter.Y() = -Center.X(); } - else // Hier wird um einen beliebigen Winkel in mathematisch positiver Richtung gedreht! - { // xneu = x * cos(alpha) - y * sin(alpha) - // yneu = x * sin(alpha) + y * cos(alpha) - // Unten Rechts wird nicht gedreht: die Seiten von RectQuelle muessen parallel - // zu den Koordinatenachsen bleiben. + else // Here it is rotated to any angle in the mathematically + // positive direction! + { // xnew = x * cos(alpha) - y * sin(alpha) + // ynew = x * sin(alpha) + y * cos(alpha) + // Bottom Right is not rotated: the pages of RectQuelle must + // remain parallel to the coordinate axes. NewCenter.X() = (long) (Center.X() * cs - Center.Y() * sn); NewCenter.Y() = (long) (Center.X() * sn + Center.Y() * cs); } @@ -695,16 +588,10 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double Size Differenz; Point DiffPoint = (NewCenter - Center); Differenz.Width() = DiffPoint.X(); - Differenz.Height() = -DiffPoint.Y(); // Man beachte dass die Y-Achse nach unten positiv gezaehlt wird. - NbcMove (Differenz); // fuehrt die eigentliche Koordinatentransformation durch. + Differenz.Height() = -DiffPoint.Y(); // Note that the Y-axis is counted ad positive downward. + NbcMove (Differenz); // Actually executes the coordinate transformation. } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ - void E3dScene::TakeObjNameSingul(XubString& rName) const { rName=ImpGetResStr(STR_ObjNameSingulScene3d); @@ -719,24 +606,14 @@ void E3dScene::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ - void E3dScene::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralScene3d); } -/************************************************************************* -|* -|* Die NbcRotate-Routine ueberlaedt die des SdrObject. Die Idee ist die Scene -|* drehen zu koennen und relativ zur Lage der Scene dann auch die Objekte -|* in der Scene -|* -\************************************************************************/ +// The NbcRotate routine overloads the one of the SdrObject. The idea is +// to be able to rotate the scene relative to the position of the scene +// and then the objects in the scene void E3dScene::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { @@ -758,72 +635,60 @@ void E3dScene::SetTransform(const basegfx::B3DHomMatrix& rMatrix) void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen - // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil - // dafuer gibt es den - SetGlueReallyAbsolute(sal_True); + // So currently the glue points are defined relative to the scene aOutRect. + // Before turning the glue points are defined relative to the page. They + // take no part in the rotation of the scene. To ensure this, there is the + // SetGlueReallyAbsolute(sal_True); - // So dass war die Szene, ab jetzt kommen die Objekte in der Szene - // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen - // muessen ja nicht zusammenhaengend sein - // es ermoeglicht den Zugriff auf Kindobjekte - // Ich gehe also die gesamte Liste durch und rotiere um die Z-Achse die durch den - // Mittelpunkt von aOutRect geht (Satz von Steiner), also RotateZ + // So that was the scene, now the objects used in the scene + // 3D objects, if there is only one it can still have multiple surfaces but + // the surfaces do not hve to be connected. This allows you to access child + // objects. So going through the entire list and rotate around the Z axis + // through the enter of aOutRect's (Steiner's theorem), so RotateZ - RotateScene (rRef, nWink, sn, cs); // Rotiert die Szene + RotateScene (rRef, nWink, sn, cs); // Rotates the scene double fWinkelInRad = nWink/100 * F_PI180; basegfx::B3DHomMatrix aRotation; aRotation.rotate(0.0, 0.0, fWinkelInRad); NbcSetTransform(aRotation * GetTransform()); - SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects - NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ - // zum Urpsung des Blattes - SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetRectsDirty(); // This forces a recalculation of all BoundRects + NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still + // have coordinates relative to the + // original page) + SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect) SetRectsDirty(); } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dScene::RecalcSnapRect() { E3dScene* pScene = GetScene(); if(pScene == this) { - // Szene wird als 2D-Objekt benutzt, nimm SnapRect aus der - // 2D Bildschrimdarstellung + // The Scene is used as a 2D-Objekt, take the SnapRect from the + // 2D Display settings Camera3D& rCam = (Camera3D&)pScene->GetCamera(); maSnapRect = rCam.GetDeviceWindow(); } else { - // Szene ist selbst Mitglied einer anderen Szene, hole das - // SnapRect als zusammengesetztes Objekt + // The Scene itself is a member of another scene, get the SnapRect + // as a composite object E3dObject::RecalcSnapRect(); } } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dScene::IsBreakObjPossible() { - // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind + // Break scene, if all members are able to break SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS); while ( a3DIterator.IsMore() ) { E3dObject* pObj = (E3dObject*) a3DIterator.Next(); - DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!"); + DBG_ASSERT(pObj->ISA(E3dObject), "only 3D objects are allowed in scenes!"); if(!pObj->IsBreakObjPossible()) return sal_False; } diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index b847fa96c2ab..3b6ce894a9be 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -45,7 +45,7 @@ #include <basegfx/polygon/b3dpolygon.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() { @@ -63,19 +63,15 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() TYPEINIT1(E3dSphereObj, E3dCompoundObject); -/************************************************************************* -|* -|* Kugel aus Polygonfacetten nach Laengen und Breitengrad aufbauen -|* -\************************************************************************/ + +// Build Sphere from polygon facets in latitude and longitude E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize) : E3dCompoundObject(rDefault) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); - // Uebergebene drueberbuegeln aCenter = rCenter; aSize = r3DSize; } @@ -83,63 +79,47 @@ E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoi E3dSphereObj::E3dSphereObj() : E3dCompoundObject() { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } -/************************************************************************* -|* -|* Kugel erzeugen ohne die Polygone darin zu erzeugen -|* -\************************************************************************/ - -// FG: Dieser Aufruf erfolgt von der 3D-Object Factory (objfac3d.cxx) und zwar ausschliesslich beim -// laden von Dokumenten. Hier braucht man keinen CreateSphere-Aufruf, denn die wirkliche -// Anzahl Segmente ist ja noch nicht bekannt. Dies war bis zum 10.2.97 ein (kleines) -// Speicherleck. -E3dSphereObj::E3dSphereObj(int /*dummy*/) // den Parameter braucht es um unterscheiden zu koennen, welcher -{ // der beiden Konstruktoren gemeint ist. Der obige halt per Default - // Defaults setzen + +// Create Sphere without creating the Polygons within + +// This call is from the 3D Object Factory (objfac3d.cxx) and only when loading +// of documents. Here you do not need CreateSphere call, since the real number +// of segments is not even known yet. This was until 10.02.1997 a (small) +// memory leak. + +E3dSphereObj::E3dSphereObj(int /*dummy*/) +// the parameters it needs to be able to distinguish which +// constructors of the two is meant. The above is the default. +{ + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { - // Defaults setzen + // Set defaults aCenter = rDefault.GetDefaultSphereCenter(); aSize = rDefault.GetDefaultSphereSize(); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dSphereObj::GetObjIdentifier() const { return E3D_SPHEREOBJ_ID; } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of n polygons SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - void E3dSphereObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) { if((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && (nHSegs != 0 || nVSegs != 0)) @@ -156,11 +136,7 @@ E3dSphereObj* E3dSphereObj::Clone() const return CloneHelper< E3dSphereObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set local parameters with geometry re-creating void E3dSphereObj::SetCenter(const basegfx::B3DPoint& rNew) { @@ -180,11 +156,7 @@ void E3dSphereObj::SetSize(const basegfx::B3DVector& rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dSphereObj::TakeObjNameSingul(XubString& rName) const { @@ -200,11 +172,7 @@ void E3dSphereObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dSphereObj::TakeObjNamePlural(XubString& rName) const { diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src index fd5e662305f3..9d23adc147af 100644 --- a/svx/source/engine3d/string3d.src +++ b/svx/source/engine3d/string3d.src @@ -28,7 +28,7 @@ #include <svx/dialogs.hrc> // pragma ------------------------------------------------------------------- - // Strings fuer die Draw-Dialoge -------------------------------------------- + // Strings for the Draw Dialog -------------------------------------------- String RID_SVX_3D_CREATE_LATHE { Text [ en-US ] = "Create 3D rotation object" ; diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 9ac90d408085..08b2dc3ce4c0 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -82,7 +82,7 @@ TYPEINIT1(E3dView, SdrView); -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// // Migrate Marking class Impl3DMirrorConstructOverlay @@ -233,28 +233,18 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr } } -/************************************************************************* -|* -|* Konstruktor 1 -|* -\************************************************************************/ - E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) : SdrView(pModel, pOut) { InitView (); } -/************************************************************************* -|* -|* DrawMarkedObj ueberladen, da eventuell nur einzelne 3D-Objekte -|* gezeichnet werden sollen -|* -\************************************************************************/ +// DrawMarkedObj overloaded, since possibly only a single 3D object is to be +// drawn void E3dView::DrawMarkedObj(OutputDevice& rOut) const { - // Existieren 3D-Objekte, deren Szenen nicht selektiert sind? + // Does 3D objects exist which scenes are not selected? sal_Bool bSpecialHandling = sal_False; E3dScene *pScene = NULL; @@ -264,12 +254,12 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // related scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene && !IsObjMarked(pScene)) bSpecialHandling = sal_True; } - // Alle SelectionFlags zuruecksetzen + // Reset all selection flags if(pObj && pObj->ISA(E3dObject)) { pScene = ((E3dObject*)pObj)->GetScene(); @@ -280,15 +270,15 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const if(bSpecialHandling) { - // SelectionFlag bei allen zu 3D Objekten gehoerigen - // Szenen und deren Objekten auf nicht selektiert setzen + // Set selection flag to "not selected" for scenes related to all 3D + // objects long nObjs; for(nObjs = 0;nObjs < nCnt;nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // relatated scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) pScene->SetSelected(sal_False); @@ -300,7 +290,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dObject)) { - // Objekt markieren + // Select object E3dObject* p3DObj = (E3dObject*)pObj; p3DObj->SetSelected(sal_True); pScene = p3DObj->GetScene(); @@ -313,17 +303,17 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const SortMarkedObjects(); pScene->SetDrawOnlySelected(sal_True); - pScene->SingleObjectPainter(rOut); // #110094#-17 + pScene->SingleObjectPainter(rOut); pScene->SetDrawOnlySelected(sal_False); } - // SelectionFlag zuruecksetzen + // Reset selection flag for(nObjs = 0;nObjs < nCnt;nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // releated scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) pScene->SetSelected(sal_False); @@ -337,16 +327,12 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const } } -/************************************************************************* -|* -|* Model holen ueberladen, da bei einzelnen 3D Objekten noch eine Szene -|* untergeschoben werden muss -|* -\************************************************************************/ +// Get overloaded model, since in some 3D objects an additional scene +// must be pushed in SdrModel* E3dView::GetMarkedObjModel() const { - // Existieren 3D-Objekte, deren Szenen nicht selektiert sind? + // Does 3D objects exist which scenes are not selected? bool bSpecialHandling(false); const sal_uInt32 nCount(GetMarkedObjectCount()); sal_uInt32 nObjs(0); @@ -459,22 +445,17 @@ SdrModel* E3dView::GetMarkedObjModel() const // restore old selection rCurrentMarkList = aOldML; - // model zurueckgeben return pNewModel; } -/************************************************************************* -|* -|* Bei Paste muss - falls in eine Scene eingefuegt wird - die -|* Objekte der Szene eingefuegt werden, die Szene selbst aber nicht -|* -\************************************************************************/ +// When pasting objects have to integrated if a scene is inserted, but +// not the scene itself sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { sal_Bool bRetval = sal_False; - // Liste holen + // Get list Point aPos(rPos); SdrObjList* pDstList = pLst; ImpGetPasteObjList(aPos, pDstList); @@ -482,14 +463,14 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs if(!pDstList) return sal_False; - // Owner der Liste holen + // Get owner of the list SdrObject* pOwner = pDstList->GetOwnerObj(); if(pOwner && pOwner->ISA(E3dScene)) { E3dScene* pDstScene = (E3dScene*)pOwner; BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXCHANGE_PASTE)); - // Alle Objekte aus E3dScenes kopieren und direkt einfuegen + // Copy all objects from E3dScenes and insert them directly for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++) { const SdrPage* pSrcPg=rMod.GetPage(nPg); @@ -499,7 +480,7 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs Rectangle aR = pSrcPg->GetAllObjBoundRect(); Point aDist(aPos - aR.Center()); - // Unterobjekte von Szenen einfuegen + // Insert sub-objects for scenes for(sal_uInt32 nOb(0); nOb < nObAnz; nOb++) { const SdrObject* pSrcOb = pSrcPg->GetObj(nOb); @@ -518,11 +499,10 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs bRetval = SdrView::Paste(rMod, rPos, pLst, nOptions); } - // und Rueckgabewert liefern return bRetval; } -// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) +// Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) { sal_Bool bRetval(sal_False); @@ -540,7 +520,6 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* if(pCompoundObj) { - // #116235# E3dCompoundObject* pNewCompoundObj = dynamic_cast< E3dCompoundObject* >(pCompoundObj->Clone()); if(pNewCompoundObj) @@ -622,7 +601,7 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene->Insert3DObj(pNewCompoundObj); bRetval = sal_True; - // Undo anlegen + // Create undo if( GetModel()->IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewCompoundObj)); } @@ -633,12 +612,6 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* return bRetval; } -/************************************************************************* -|* -|* 3D-Konvertierung moeglich? -|* -\************************************************************************/ - sal_Bool E3dView::IsConvertTo3DObjPossible() const { sal_Bool bAny3D(sal_False); @@ -687,11 +660,6 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, } } -/************************************************************************* -|* -|* 3D-Konvertierung zu Extrude ausfuehren -|* -\************************************************************************/ #include <editeng/eeitem.hxx> void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) @@ -702,10 +670,10 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) const SvxColorItem& rTextColorItem = (const SvxColorItem&)rSet.Get(EE_CHAR_COLOR); if(rTextColorItem.GetValue() == RGB_Color(COL_BLACK)) { - // Bei schwarzen Textobjekten wird die Farbe auf grau gesetzt + //For black text objects, the color set to gray if(pObj->GetPage()) { - // #84864# if black is only default attribute from + // if black is only default attribute from // pattern set it hard so that it is used in undo. pObj->SetMergedItem(SvxColorItem(RGB_Color(COL_BLACK), EE_CHAR_COLOR)); @@ -743,7 +711,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { - // Einzelnes PathObject, dieses umwanden + // Single PathObject, transform this SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); if(pPath) @@ -754,35 +722,34 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal else aDefault.SetDefaultLatheCharacterMode(sal_True); - // ItemSet des Ursprungsobjektes holen + // Get Itemset of the original object SfxItemSet aSet(pObj->GetMergedItemSet()); XFillStyle eFillStyle = ITEMVALUE(aSet, XATTR_FILLSTYLE, XFillStyleItem); - // Linienstil ausschalten + // line style turned off aSet.Put(XLineStyleItem(XLINE_NONE)); - // Feststellen, ob ein FILL_Attribut gesetzt ist. + //Determining if FILL_Attribut is set. if(!pPath->IsClosed() || eFillStyle == XFILL_NONE) { - // Das SdrPathObj ist nicht gefuellt, lasse die - // vordere und hintere Flaeche weg. Ausserdem ist - // eine beidseitige Darstellung notwendig. + // This SdrPathObj is not filled, leave the front and rear face out. + // Moreover, a two-sided representation necessary. aDefault.SetDefaultExtrudeCloseFront(sal_False); aDefault.SetDefaultExtrudeCloseBack(sal_False); aSet.Put(Svx3DDoubleSidedItem(sal_True)); - // Fuellattribut setzen + // Set fill attribute aSet.Put(XFillStyleItem(XFILL_SOLID)); - // Fuellfarbe muss auf Linienfarbe, da das Objekt vorher - // nur eine Linie war + // Fill color must be the color line, because the object was + // previously just a line Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue(); aSet.Put(XFillColorItem(String(), aColorLine)); } - // Neues Extrude-Objekt erzeugen + // Create a new extrude object E3dObject* p3DObj = NULL; if(bExtrude) { @@ -795,7 +762,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal p3DObj = new E3dLatheObj(aDefault, aPolyPoly2D); } - // Attribute setzen + // Set attribute if(p3DObj) { p3DObj->NbcSetLayer(pObj->GetLayer()); @@ -804,7 +771,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), sal_True); - // Neues 3D-Objekt einfuegen + // Insert a new extrude object pScene->Insert3DObj(p3DObj); } } @@ -863,45 +830,39 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExt else ImpCreateSingle3DObjectFlat(pScene, pNewObj2, bExtrude, fDepth, rLatheMat); - // delete zwi object + // delete object in between if(pNewObj2 != pObj && pNewObj2 != pNewObj1 && pNewObj2) SdrObject::Free( pNewObj2 ); } - // delete zwi object + // delete object in between if(pNewObj1 != pObj && pNewObj1) SdrObject::Free( pNewObj1 ); } } } -/************************************************************************* -|* -|* 3D-Konvertierung zu Extrude steuern -|* -\************************************************************************/ - void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) { if(AreObjectsMarked()) { - // Undo anlegen + // Create undo if(bExtrude) BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXTRUDE)); else BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_LATHE)); - // Neue Szene fuer zu erzeugende 3D-Objekte anlegen + // Create a new scene for the created 3D object E3dScene* pScene = new E3dPolyScene(Get3DDefaultAttributes()); - // Rechteck bestimmen und evtl. korrigieren + // Determine rectangle and possibly correct it Rectangle aRect = GetAllMarkedRect(); if(aRect.GetWidth() <= 1) aRect.SetSize(Size(500, aRect.GetHeight())); if(aRect.GetHeight() <= 1) aRect.SetSize(Size(aRect.GetWidth(), 500)); - // Tiefe relativ zur Groesse der Selektion bestimmen + // Determine the depth relative to the size of the selection double fDepth = 0.0; double fRot3D = 0.0; basegfx::B2DHomMatrix aLatheMat; @@ -914,11 +875,11 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b } if(!bExtrude) { - // Transformation fuer Polygone Rotationskoerper erstellen + // Create transformation for the polygons rotating body if(aPnt1 != aPnt2) { - // Rotation um Kontrollpunkt1 mit eigestelltem Winkel - // fuer 3D Koordinaten + // Rotation around control point #1 with set angle + // for 3D coordinates basegfx::B2DPoint aDiff(aPnt1 - aPnt2); fRot3D = atan2(aDiff.getY(), aDiff.getX()) - F_PI2; @@ -934,7 +895,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b if(aPnt2.getX() != 0.0) { - // Translation auf Y=0 - Achse + // Translation to Y=0 - axis aLatheMat.translate(-aPnt2.getX(), 0.0); } else @@ -942,12 +903,11 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b aLatheMat.translate((double)-aRect.Left(), 0.0); } - // Inverse Matrix bilden, um die Zielausdehnung zu bestimmen + // Form the inverse matrix to determine the target expansion basegfx::B2DHomMatrix aInvLatheMat(aLatheMat); aInvLatheMat.invert(); - // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse - // erweitern + // SnapRect extension enables mirroring in the axis of rotation for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); @@ -986,8 +946,8 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b } } - // Ueber die Selektion gehen und in 3D wandeln, komplett mit - // Umwandeln in SdrPathObject, auch Schriften + // Walk throguh the selection and convert it into 3D, complete with + // Convertion to SdrPathObject, also fonts for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); @@ -998,24 +958,24 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b if(pScene->GetSubList() && pScene->GetSubList()->GetObjCount() != 0) { - // Alle angelegten Objekte Tiefenarrangieren + // Arrange all created objects by depth if(bExtrude) DoDepthArrange(pScene, fDepth); - // 3D-Objekte auf die Mitte des Gesamtrechtecks zentrieren + // Center 3D objects in the middle of the overall rectangle basegfx::B3DPoint aCenter(pScene->GetBoundVolume().getCenter()); basegfx::B3DHomMatrix aMatrix; aMatrix.translate(-aCenter.getX(), -aCenter.getY(), -aCenter.getZ()); - pScene->SetTransform(aMatrix * pScene->GetTransform()); // #112587# + pScene->SetTransform(aMatrix * pScene->GetTransform()); - // Szene initialisieren + // Initialize scene pScene->NbcSetSnapRect(aRect); basegfx::B3DRange aBoundVol = pScene->GetBoundVolume(); InitScene(pScene, (double)aRect.GetWidth(), (double)aRect.GetHeight(), aBoundVol.getDepth()); - // Szene anstelle des ersten selektierten Objektes einfuegen - // und alle alten Objekte weghauen + // Insert scene instead of the first selected object and throw away + // all the old objects SdrObject* pRepObj = GetMarkedObjectByIndex(0); SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0); MarkObj(pRepObj, pPV, sal_True); @@ -1023,7 +983,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b DeleteMarked(); MarkObj(pScene, pPV); - // Rotationskoerper um Rotationsachse drehen + // Rotate Rotation body around the axis of rotation basegfx::B3DHomMatrix aRotate; if(!bExtrude && fRot3D != 0.0) @@ -1031,7 +991,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b aRotate.rotate(0.0, 0.0, fRot3D); } - // Default-Rotation setzen + // Set default rotation { double XRotateDefault = 20; aRotate.rotate(DEG2RAD(XRotateDefault), 0.0, 0.0); @@ -1042,25 +1002,20 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b pScene->SetTransform(aRotate * pScene->GetTransform()); } - // SnapRects der Objekte ungueltig + // Invalid SnapRects of objects pScene->SetSnapRect(aRect); } else { - // Es wurden keine 3D Objekte erzeugt, schmeiss alles weg + // No 3D object was created, throw away everything delete pScene; } - // Undo abschliessen EndUndo(); } } -/************************************************************************* -|* -|* Alle enthaltenen Extrude-Objekte Tiefenarrangieren -|* -\************************************************************************/ +//Arrange all created extrude objects by depth struct E3dDepthNeighbour { @@ -1237,11 +1192,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) } } -/************************************************************************* -|* -|* Drag beginnen, vorher ggf. Drag-Methode fuer 3D-Objekte erzeugen -|* -\************************************************************************/ +// Start drag, create for 3D objects before possibly drag method sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, @@ -1249,7 +1200,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, { if(Is3DRotationCreationActive() && GetMarkedObjectCount()) { - // bestimme alle selektierten Polygone und gebe die gespiegelte Hilfsfigur aus + // Determine all selected polygons and return rhe mirrored helper overlay mpMirrorOverlay->SetMirrorAxis(aRef1, aRef2); } else @@ -1320,7 +1271,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, default: break; } - // die nicht erlaubten Rotationen ausmaskieren + // do not mask the allowed rotations eConstraint = E3dDragConstraint(eConstraint& eDragConstraint); pForcedMeth = new E3dDragRotate(*this, GetMarkedObjectList(), eConstraint, IsSolidDragging()); } @@ -1335,7 +1286,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, } break; - // spaeter mal + // later on case SDRDRAG_MIRROR: case SDRDRAG_CROOK: case SDRDRAG_DISTORT: @@ -1352,23 +1303,11 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, return SdrView::BegDragObj(rPnt, pOut, pHdl, nMinMov, pForcedMeth); } -/************************************************************************* -|* -|* Pruefen, obj 3D-Szene markiert ist -|* -\************************************************************************/ - sal_Bool E3dView::HasMarkedScene() { return (GetMarkedScene() != NULL); } -/************************************************************************* -|* -|* Pruefen, obj 3D-Szene markiert ist -|* -\************************************************************************/ - E3dScene* E3dView::GetMarkedScene() { sal_uIntPtr nCnt = GetMarkedObjectCount(); @@ -1380,15 +1319,11 @@ E3dScene* E3dView::GetMarkedScene() return NULL; } -/************************************************************************* -|* -|* aktuelles 3D-Zeichenobjekt setzen, dafuer Szene erzeugen -|* -\************************************************************************/ +// Set current 3D drawing object, create the scene for this E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj != NULL, "Nana, wer steckt denn hier 'nen NULL-Zeiger rein?"); + DBG_ASSERT(p3DObj != NULL, "Who puts in a NULL-pointer here"); E3dScene* pScene = NULL; // get transformed BoundVolume of the object @@ -1409,12 +1344,6 @@ E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj) return pScene; } -/************************************************************************* -|* -|* neu erzeugte Szene initialisieren -|* -\************************************************************************/ - void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) { Camera3D aCam(pScene->GetCamera()); @@ -1432,32 +1361,19 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) pScene->SetCamera(aCam); } -/************************************************************************* -|* -|* startsequenz fuer die erstellung eines 3D-Rotationskoerpers -|* -\************************************************************************/ - void E3dView::Start3DCreation() { if (GetMarkedObjectCount()) { - // irgendwelche Markierungen ermitteln und ausschalten - //HMHBOOL bVis = IsMarkHdlShown(); - - //HMHif (bVis) HideMarkHdl(); - - // bestimme die koordinaten fuer JOEs Mirrorachse - // entgegen der normalen Achse wird diese an die linke Seite des Objektes - // positioniert + //positioned long nOutMin = 0; long nOutMax = 0; long nMinLen = 0; long nObjDst = 0; long nOutHgt = 0; - OutputDevice* pOut = GetFirstOutputDevice(); //GetWin(0); + OutputDevice* pOut = GetFirstOutputDevice(); - // erstmal Darstellungsgrenzen bestimmen + // first determine representation boundaries if (pOut != NULL) { nMinLen = pOut->PixelToLogic(Size(0,50)).Height(); @@ -1484,7 +1400,7 @@ void E3dView::Start3DCreation() if (nTemp > nMinLen) nMinLen = nTemp; } - // und dann die Markierungen oben und unten an das Objekt heften + // and then attach the marks at the top and bottom of the object basegfx::B2DRange aR; for(sal_uInt32 nMark(0L); nMark < GetMarkedObjectCount(); nMark++) { @@ -1517,32 +1433,25 @@ void E3dView::Start3DCreation() } } - aRef1.X() = basegfx::fround(aR.getMinX()); // Initial Achse um 2/100mm nach links + aRef1.X() = basegfx::fround(aR.getMinX()); // Initial move axis 2/100mm to the left aRef1.Y() = nY1; aRef2.X() = aRef1.X(); aRef2.Y() = nY2; - // Markierungen einschalten + // Turn on marks SetMarkHandles(); //HMHif (bVis) ShowMarkHdl(); if (AreObjectsMarked()) MarkListHasChanged(); - // SpiegelPolygone SOFORT zeigen + // Show mirror polygon IMMEDIATELY const SdrHdlList &aHdlList = GetHdlList(); mpMirrorOverlay = new Impl3DMirrorConstructOverlay(*this); mpMirrorOverlay->SetMirrorAxis(aHdlList.GetHdl(HDL_REF1)->GetPos(), aHdlList.GetHdl(HDL_REF2)->GetPos()); - //CreateMirrorPolygons (); - //ShowMirrorPolygons (aHdlList.GetHdl (HDL_REF1)->GetPos (), - // aHdlList.GetHdl (HDL_REF2)->GetPos ()); } } -/************************************************************************* -|* -|* was passiert bei einer Mausbewegung, wenn das Objekt erstellt wird ? -|* -\************************************************************************/ +// what happens with a mouse movement when the object is created? void E3dView::MovAction(const Point& rPnt) { @@ -1554,15 +1463,15 @@ void E3dView::MovAction(const Point& rPnt) { SdrHdlKind eHdlKind = pHdl->GetKind(); - // reagiere nur bei einer spiegelachse + // reacts only due to a mirror axis if ((eHdlKind == HDL_REF1) || (eHdlKind == HDL_REF2) || (eHdlKind == HDL_MIRX)) { const SdrHdlList &aHdlList = GetHdlList (); - // loesche das gespiegelte Polygon, spiegele das Original und zeichne es neu - //ShowMirrored (); + // delete the mirroed polygon, mirrors the original and draws + // it anew SdrView::MovAction (rPnt); mpMirrorOverlay->SetMirrorAxis( aHdlList.GetHdl (HDL_REF1)->GetPos(), @@ -1580,15 +1489,11 @@ void E3dView::MovAction(const Point& rPnt) } } -/************************************************************************* -|* -|* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen -|* [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein -|* Rotationskoerper erzeugt, ohne den Benutzer die Lage der -|* Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls -|* ein Objekt selektiert ist. (keine Initialisierung noetig) -|* -\************************************************************************/ +// The End. Create object and any child objects through ImpCreate3DLathe. +// With the parameter value sal_True (SDefault: sal_False) is simply a +// rotation body created, without letting the user set the position of the +// axis. It is sufficient with this call, if an object is selected. +// (No initialization necessary) void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) { @@ -1611,8 +1516,9 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) } else { - // Hilfsfigur ausschalten - // bestimme aus den Handlepositionen und den Versatz der Punkte + // Turn off helper overlay + // Determine from the handle positions and the displacement of + // the points const SdrHdlList &aHdlList = GetHdlList(); Point aMirrorRef1 = aHdlList.GetHdl(HDL_REF1)->GetPos(); Point aMirrorRef2 = aHdlList.GetHdl(HDL_REF2)->GetPos(); @@ -1625,22 +1531,10 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) } } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dView::~E3dView () { } -/************************************************************************* -|* -|* beende das erzeugen und loesche die polygone -|* -\************************************************************************/ - void E3dView::ResetCreationActive () { if(mpMirrorOverlay) @@ -1650,12 +1544,6 @@ void E3dView::ResetCreationActive () } } -/************************************************************************* -|* -|* Klasse initialisieren -|* -\************************************************************************/ - void E3dView::InitView () { eDragConstraint = E3DDRAG_CONSTR_XYZ; @@ -1676,12 +1564,6 @@ void E3dView::InitView () mpMirrorOverlay = 0L; } -/************************************************************************* -|* -|* Koennen die selektierten Objekte aufgebrochen werden? -|* -\************************************************************************/ - sal_Bool E3dView::IsBreak3DObjPossible() const { sal_uIntPtr nCount = GetMarkedObjectCount(); @@ -1715,17 +1597,11 @@ sal_Bool E3dView::IsBreak3DObjPossible() const return sal_True; } -/************************************************************************* -|* -|* Selektierte Lathe-Objekte aufbrechen -|* -\************************************************************************/ - void E3dView::Break3DObj() { if(IsBreak3DObjPossible()) { - // ALLE selektierten Objekte werden gewandelt + // ALL selected objects are changed sal_uInt32 nCount = GetMarkedObjectCount(); BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE))); @@ -1764,12 +1640,6 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj) } } -/************************************************************************* -|* -|* Szenen mischen -|* -\************************************************************************/ - void E3dView::MergeScenes () { sal_uIntPtr nCount = GetMarkedObjectCount(); @@ -1787,18 +1657,14 @@ void E3dView::MergeScenes () { if (pObj->ISA(E3dScene)) { - /********************************************************** - * Es ist eine 3D-Scene oder 3D-PolyScene - **********************************************************/ + // It is a 3D-Scene or 3D-PolyScene SdrObjList* pSubList = ((E3dObject*) pObj)->GetSubList(); SdrObjListIter aIter(*pSubList, IM_FLAT); while (aIter.IsMore()) { - /****************************************************** - * LatheObjekte suchen - ******************************************************/ + // Search for Lathe objects SdrObject* pSubObj = aIter.Next(); E3dObject *pNewObj = 0; @@ -1835,7 +1701,7 @@ void E3dView::MergeScenes () basegfx::B3DHomMatrix aMatrix; aMatrix.translate(aBoundRect.Left() - aCenter.getX(), aCenter.getY(), 0.0); - pNewObj->SetTransform(aMatrix * pNewObj->GetTransform()); // #112587# + pNewObj->SetTransform(aMatrix * pNewObj->GetTransform()); if (pNewObj) aBoundVol.expand(pNewObj->GetBoundVolume()); pScene->Insert3DObj (pNewObj); @@ -1872,27 +1738,22 @@ void E3dView::MergeScenes () aCamera.SetFocalLength(GetDefaultCamFocal()); pScene->SetCamera (aCamera); - // SnapRects der Objekte ungueltig + // Invalid SnapRects of Objects pScene->SetRectsDirty(); InsertObjectAtView(pScene, *(GetSdrPageViewOfMarkedByIndex(0))); - // SnapRects der Objekte ungueltig + // Invalid SnapRects of Objects pScene->SetRectsDirty(); } } -/************************************************************************* -|* -|* Possibilities, hauptsaechlich gruppieren/ungruppieren -|* -\************************************************************************/ void E3dView::CheckPossibilities() { // call parent SdrView::CheckPossibilities(); - // Weitere Flags bewerten + // Set other flags if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible) { sal_Int32 nMarkCnt = GetMarkedObjectCount(); @@ -1907,9 +1768,8 @@ void E3dView::CheckPossibilities() b3DObject = sal_True; } - // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert. - // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja, - // das Gruppieren verbieten. + // So far: there are two or more of any objects selected. See if + // compound objects are involved. If yes, ban grouping. if(bGroupPossible && bCoumpound) bGroupPossible = sal_False; diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index fac79c1d2cb2..688c4a698684 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -53,12 +53,6 @@ #include <svx/svdogrp.hxx> #include <svx/e3dsceneupdater.hxx> -/************************************************************************* -|* -|* Konvertierung in Polygone -|* -\************************************************************************/ - void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) { SdrObject* pNewObj = NULL; @@ -87,12 +81,6 @@ void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) } } -/************************************************************************* -|* -|* Get3DAttributes -|* -\************************************************************************/ - void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) { if(pObj->ISA(E3dLatheObj)) @@ -121,7 +109,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const { - // ItemSet mit entspr. Bereich anlegen + // Creating itemset with corresponding field SfxItemSet aSet( pMod->GetItemPool(), SDRATTR_START, SDRATTR_END, @@ -151,42 +139,35 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/ } } - // setze SID_ATTR_3D_INTERN auf den Status der selektierten Objekte + // Set SID_ATTR_3D_INTERN on the status of the selected objects aSet.Put(SfxUInt32Item(SID_ATTR_3D_INTERN, nSelectedItems)); - // DefaultValues pflegen + // maintain default values if(!nSelectedItems && !pInScene) { - // Defaults holen und hinzufuegen + // Get defaults and apply SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); GetAttributes(aDefaultSet); aSet.Put(aDefaultSet); - // ... aber keine Linien fuer 3D + // ... but no lines for 3D aSet.Put(XLineStyleItem (XLINE_NONE)); - // #84061# new defaults for distance and focal length + // new defaults for distance and focal length aSet.Put(Svx3DDistanceItem(100)); aSet.Put(Svx3DFocalLengthItem(10000)); } - // ItemSet zurueckgeben + // return ItemSet return(aSet); } -/************************************************************************* -|* -|* Set3DAttributes: -|* -\************************************************************************/ - void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll) { sal_uInt32 nSelectedItems(0L); if(pInScene) { - //pInScene->SetItemSetAndBroadcast(rAttr, bReplaceAll); pInScene->SetMergedItemSetAndBroadcast(rAttr, bReplaceAll); } else @@ -208,10 +189,10 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_ } } - // DefaultValues pflegen + // Maintain default values if(!nSelectedItems && !pInScene) { - // Defaults setzen + // Set defaults SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); aDefaultSet.Put(rAttr); SetAttributes(aDefaultSet); diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index b88126d45289..76dba241fe92 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -31,12 +31,6 @@ #include <svx/viewpt3d.hxx> #include <svx/volume3d.hxx> -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - Viewport3D::Viewport3D() : aVRP(0, 0, 5), aVPN(0, 0, 1), @@ -57,11 +51,7 @@ Viewport3D::Viewport3D() : aViewWin.W = 2; aViewWin.H = 2; } -/************************************************************************* -|* -|* ViewWindow (in View-Koordinaten) setzen -|* -\************************************************************************/ +// Set ViewWindow (in View coordinates) void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH) { @@ -76,12 +66,6 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH) fHRatio = aDeviceRect.GetHeight() / aViewWin.H; } -/************************************************************************* -|* -|* ViewWindow zurueckgeben -|* -\************************************************************************/ - void Viewport3D::GetViewWindow(double& rX, double& rY, double& rW, double& rH) const { @@ -91,11 +75,7 @@ void Viewport3D::GetViewWindow(double& rX, double& rY, rH = aViewWin.H; } -/************************************************************************* -|* -|* Beobachterposition (PRP) in Weltkoordinaten zurueckgeben -|* -\************************************************************************/ +// Returns observer position (PRP) in world coordinates const basegfx::B3DPoint& Viewport3D::GetViewPoint() { @@ -104,11 +84,7 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() return aViewPoint; } -/************************************************************************* -|* -|* Transformationsmatrix zurueckgeben -|* -\************************************************************************/ +// Returns transformations matrix const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform() { @@ -117,17 +93,7 @@ const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform() return aViewTf; } - - - - - - -/************************************************************************* -|* -|* View-Transformationsmatrix berechnen -|* -\************************************************************************/ +// Calculate View transformations matrix void Viewport3D::MakeTransform(void) { @@ -136,13 +102,13 @@ void Viewport3D::MakeTransform(void) double fV, fXupVp, fYupVp; aViewPoint = aVRP + aVPN * aPRP.getZ(); - // auf Einheitsmatrix zuruecksetzen + // Reset to Identity matrix aViewTf.identity(); - // in den Ursprung verschieben + // shift in the origin aViewTf.translate(-aVRP.getX(), -aVRP.getY(), -aVRP.getZ()); - // fV = Laenge der Projektion von aVPN auf die yz-Ebene: + // fV = Length of the projection of aVPN on the yz plane: fV = aVPN.getYZLength(); if ( fV != 0 ) @@ -168,8 +134,8 @@ void Viewport3D::MakeTransform(void) aViewTf *= aTemp; } - // X- und Y-Koordinaten des View Up Vektors in das (vorlaeufige) - // View-Koordinatensytem umrechnen + // Convert X- and Y- coordinates of the view up vector to the + // (preliminary) view coordinate system. fXupVp = aViewTf.get(0, 0) * aVUV.getX() + aViewTf.get(0, 1) * aVUV.getY() + aViewTf.get(0, 2) * aVUV.getZ(); fYupVp = aViewTf.get(1, 0) * aVUV.getX() + aViewTf.get(1, 1) * aVUV.getY() + aViewTf.get(1, 2) * aVUV.getZ(); fV = sqrt(fXupVp * fXupVp + fYupVp * fYupVp); @@ -190,12 +156,6 @@ void Viewport3D::MakeTransform(void) } } -/************************************************************************* -|* -|* DeviceWindow des Ausgabegeraetes setzen -|* -\************************************************************************/ - void Viewport3D::SetDeviceWindow(const Rectangle& rRect) { long nNewW = rRect.GetWidth(); @@ -207,11 +167,11 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) { double fRatio, fTmp; - // Mapping, ohne die reale Groesse der Objekte im Device-Window - // zu aendern + // Mapping, without changing the real size of the objects in the + // Device Window case AS_HOLD_SIZE: - // Wenn Device ungueltig (w, h = -1), zunaechst - // View mit AsHoldX anpassen + // When the Device is invalid (w, h = -1), adapt the View + // with AsHoldX if ( nOldW > 0 && nOldH > 0 ) { fRatio = (double) nNewW / nOldW; @@ -223,7 +183,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) break; } case AS_HOLD_X: - // View-Hoehe an -Breite anpassen + // Adapt view height to view width fRatio = (double) nNewH / nNewW; fTmp = aViewWin.H; aViewWin.H = aViewWin.W * fRatio; @@ -231,7 +191,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) break; case AS_HOLD_Y: - // View-Breite an -Hoehe anpassen + // Adapt view width to view height fRatio = (double) nNewW / nNewH; fTmp = aViewWin.W; aViewWin.W = aViewWin.H * fRatio; @@ -245,20 +205,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) aDeviceRect = rRect; } - - - - - - - - - -/************************************************************************* -|* -|* 3D-Punkt auf Viewplane projizieren -|* -\************************************************************************/ +// Project the 3D pointon the View plane basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const { @@ -275,8 +222,8 @@ basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const } else { - // Das ist die Version fuer beliebigen PRP, wird aber - // aus Performancegruenden nicht verwendet + // This is the version for any PRP, but not used due to + // performance reasons fPrDist /= aVec.getZ() - aPRP.getZ(); aVec.setX(aVec.getX() * fPrDist); aVec.setY(aVec.getY() * fPrDist); @@ -286,18 +233,13 @@ basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const return aVec; } -/************************************************************************* -|* -|* 3D-Punkt auf Geraetekoordinaten mappen -|* -\************************************************************************/ +// Mapp 3D point to device coordinates basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const { basegfx::B3DPoint aRetval; - // Y-Koordinate subtrahieren, da die Device-Y-Achse von oben - // nach unten verlaeuft + // Subtract Y-coordinate, since the device Y-Axis runs from top to bottom aRetval.setX((double)aDeviceRect.Left() + ((rVec.getX() - aViewWin.X) * fWRatio)); aRetval.setY((double)aDeviceRect.Bottom() - ((rVec.getY() - aViewWin.Y) * fHRatio)); aRetval.setZ(rVec.getZ()); @@ -305,11 +247,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const return aRetval; } -/************************************************************************* -|* -|* View Reference Point setzen -|* -\************************************************************************/ +// Set View Reference Point void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) { @@ -317,11 +255,7 @@ void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Plane Normal setzen -|* -\************************************************************************/ +// Set View Plane Normal void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) { @@ -330,11 +264,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Up Vector setzen -|* -\************************************************************************/ +// Set View Up Vector void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) { @@ -342,11 +272,7 @@ void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) bTfValid = sal_False; } -/************************************************************************* -|* -|* Center Of Projection setzen -|* -\************************************************************************/ +// Set Center Of Projection void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) { @@ -356,11 +282,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Plane Distance setzen -|* -\************************************************************************/ +// Set View Plane Distance void Viewport3D::SetVPD(double fNewVPD) { @@ -368,11 +290,7 @@ void Viewport3D::SetVPD(double fNewVPD) bTfValid = sal_False; } -/************************************************************************* -|* -|* Abstand der vorderen Clippingebene setzen -|* -\************************************************************************/ +// Set distance of the front Clipping plane void Viewport3D::SetNearClipDist(double fNewNCD) { @@ -380,11 +298,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD) bTfValid = sal_False; } -/************************************************************************* -|* -|* Abstand der hinteren Clippingebene setzen -|* -\************************************************************************/ +// Set distance of the rear Clipping plane void Viewport3D::SetFarClipDist(double fNewFCD) { diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 4bef3b83af9e..9b6dfd688eac 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -62,9 +62,6 @@ extern "C" int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) -_Optlink -#endif NameCompare(const void* pFirst, const void* pSecond) { return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 3d94a7c25fa1..a8c1a8835f1d 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1722,16 +1722,13 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth //------------------------------------------------------------------------------ void DbGridControl::RemoveColumn(sal_uInt16 nId) { - sal_uInt16 nIndex = GetModelColumnPos(nId); - if (nIndex == GRID_COLUMN_NOT_FOUND) - return; - - DbGridControl_Base::RemoveColumn(nId); - - delete m_aColumns[ nIndex ]; - DbGridColumns::iterator it = m_aColumns.begin(); - ::std::advance( it, nIndex ); - m_aColumns.erase( it ); + const sal_uInt16 nIndex = GetModelColumnPos(nId); + if(nIndex != GRID_COLUMN_NOT_FOUND) + { + DbGridControl_Base::RemoveColumn(nId); + delete m_aColumns[nIndex]; + m_aColumns.erase( m_aColumns.begin()+nIndex ); + } } //------------------------------------------------------------------------------ diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 14850c530789..50a6c888a6f6 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -95,11 +95,11 @@ namespace svxform class FormScriptListener :public FormScriptListener_Base { private: - ::osl::Mutex m_aMutex; - ::rtl::Reference< FormScriptingEnvironment > m_pScriptExecutor; + ::osl::Mutex m_aMutex; + FormScriptingEnvironment *m_pScriptExecutor; public: - FormScriptListener( const ::rtl::Reference< FormScriptingEnvironment >& _pScriptExecutor ); + FormScriptListener( FormScriptingEnvironment * pScriptExecutor ); // XScriptListener virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw (RuntimeException); @@ -128,7 +128,7 @@ namespace svxform /** determines whether the instance is already disposed */ - bool impl_isDisposed_nothrow() const { return !m_pScriptExecutor.is(); } + bool impl_isDisposed_nothrow() const { return !m_pScriptExecutor; } /** fires the given script event in a thread-safe manner @@ -195,8 +195,8 @@ namespace svxform //= FormScriptListener //==================================================================== //-------------------------------------------------------------------- - FormScriptListener::FormScriptListener( const ::rtl::Reference< FormScriptingEnvironment >& _pScriptExecutor ) - :m_pScriptExecutor( _pScriptExecutor ) + FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) + :m_pScriptExecutor( pScriptExecutor ) { } @@ -231,11 +231,10 @@ namespace svxform //-------------------------------------------------------------------- void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult ) { - OSL_PRECOND( m_pScriptExecutor.is(), "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" ); + OSL_PRECOND( m_pScriptExecutor, "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" ); - ::rtl::Reference< FormScriptingEnvironment > pExecutor( m_pScriptExecutor ); _rGuard.clear(); - pExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult ); + m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult ); } //-------------------------------------------------------------------- diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 8a2333d9b90f..5b5ad1abd6ae 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -67,7 +67,6 @@ #define EQUAL_BOOKMARKS(a, b) a == b #define IFACECAST(c) ((const Reference< XInterface >&)c) - // SUN C52 has some ambiguities without this cast .... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 952b76bf9b46..638072f1cd2b 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1716,7 +1716,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException ) ) { // check the old control if the content is ok -#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 Reference< XBoundControl > xLockingTest(m_xCurrentControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); OSL_ENSURE(!bControlIsLocked, "FormController::Gained: I'm modified and the current control is locked ? How this ?"); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index eb7b0074b71c..63fa854d291f 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1081,13 +1081,13 @@ namespace svxform // und die Properties des alten in das neue kopieren Reference< XPropertySet > xCurrent(pControls[i], UNO_QUERY); -#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL +#if (OSL_DEBUG_LEVEL > 1) // nur mal eben sehen, ob das Ding tatsaechlich ein hidden control ist sal_Int16 nClassId = ::comphelper::getINT16(xCurrent->getPropertyValue(FM_PROP_CLASSID)); OSL_ENSURE(nClassId == FormComponentType::HIDDENCONTROL, "NavigatorTree::implExecuteDataTransfer: invalid control in drop list !"); // wenn das SVX_FM_HIDDEN_CONTROLS-Format vorhanden ist, dann sollten wirklich nur hidden controls in der Sequenz // stecken -#endif // (OSL_DEBUG_LEVEL > 1) || DBG_UTIL +#endif // (OSL_DEBUG_LEVEL > 1) Reference< XPropertySetInfo > xPropInfo( xCurrent->getPropertySetInfo()); Sequence< Property> seqAllCurrentProps = xPropInfo->getProperties(); Property* pAllCurrentProps = seqAllCurrentProps.getArray(); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index aed662aae2d1..6b1a265dd9aa 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -122,11 +122,10 @@ void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, if( ( pStrLstItem = PTR_CAST( SfxStringListItem, pItem ) ) != NULL ) { - List* pList = pStrLstItem->GetList(); + const std::vector<String> &aList = pStrLstItem->GetList(); - if( pList ) - for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ ) - InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) ); + for ( sal_uIntPtr i = 0, nCount = aList.size(); i < nCount; i++ ) + InsertItem( (sal_uInt16) i + 1, aList[i]); } else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL ) InsertItem( 1, pStrItem->GetValue() ); @@ -1172,12 +1171,12 @@ String GalleryBrowser2::GetFilterName() const if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL ); - sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() ); + sal_uInt16 nFilter = rFilter.GetImportFormatNumberForShortName( aURL.GetExtension() ); if( GRFILTER_FORMAT_DONTKNOW != nFilter ) - aFilterName = pFilter->GetImportFormatName( nFilter ); + aFilterName = rFilter.GetImportFormatName( nFilter ); } } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 152eb6df2faf..667cc36574b8 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -95,9 +95,9 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) } else { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - GalleryProgress aProgress( pFilter ); - if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); + GalleryProgress aProgress( &rFilter ); + if( rFilter.ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) bRet = false; } @@ -694,13 +694,8 @@ sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& ) { sal_Int8 nRet = DND_ACTION_NONE; - if( mpTheme && !mpTheme->IsReadOnly() && !mpTheme ->IsImported() ) - { - if( !mpTheme->IsDragging() ) - nRet = DND_ACTION_COPY; - else - nRet = DND_ACTION_COPY; - } + if( mpTheme && !mpTheme->IsReadOnly() && !mpTheme ->IsImported() ) + nRet = DND_ACTION_COPY; return nRet; } diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 2f41aeae0eff..a813ffe8a15b 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -129,7 +129,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, std::vector<String> &rObjList ) { Gallery* pGal = ImplGetGallery(); @@ -140,22 +140,26 @@ sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList if( pTheme ) { - for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) - rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND ); + for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) + rObjList.push_back( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ); pGal->ReleaseTheme( pTheme, aListener ); } } - return( rObjList.Count() > 0 ); + return !rObjList.empty(); } // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False ); + + if (!pGal) + return false; + + return FillObjList( pGal->GetThemeName( nThemeId ), rObjList ); } // ------------------------------------------------------------------------ @@ -183,7 +187,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect pGal->ReleaseTheme( pTheme, aListener ); } } - return( rList.size() > 0 ); + return !rList.empty(); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index a20e1761aeab..be92ac7ebba9 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -126,13 +126,13 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, if( pIStm ) { - GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); - GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL; + GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); + GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL; sal_uInt16 nFormat; - if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) + if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) { - rFilterName = pGraphicFilter->GetImportFormatName( nFormat ); + rFilterName = rGraphicFilter.GetImportFormatName( nFormat ); nRet = SGA_IMPORT_FILE; } diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk index f3e119a8a7fd..82e482283f58 100755 --- a/svx/source/gengal/makefile.mk +++ b/svx/source/gengal/makefile.mk @@ -45,11 +45,11 @@ SCRIPTFILES = $(BIN)$/gengal OBJFILES= $(OBJ)$/gengal.obj -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" APP1TARGET= $(TARGET) -.ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ELSE # .IF "$(GUI)"=="WNT" APP1TARGET= $(TARGET).bin -.ENDIF # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ENDIF # .IF "$(GUI)"=="WNT" APP1OBJS= $(OBJFILES) diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index ef4dd489e100..180ba4764aa1 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -37,20 +37,23 @@ #include <svx/dialogs.hrc> -static SvxErrorHandler* pHandler=NULL; +#include <rtl/instance.hxx> SvxErrorHandler::SvxErrorHandler() : - SfxErrorHandler( RID_SVXERRCODE, ERRCODE_AREA_SVX, ERRCODE_AREA_SVX_END, &DIALOG_MGR() ) { - pHandler = this; } -void SvxErrorHandler::Get() +namespace +{ + class theSvxErrorHandler + : public rtl::Static<SvxErrorHandler, theSvxErrorHandler> {}; +} + +void SvxErrorHandler::ensure() { - if ( !pHandler ) - new SvxErrorHandler; + theSvxErrorHandler::get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 3fbde293e4e9..ca4667aec226 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -114,7 +114,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, pPage = rOL.GetPage(); GDIMetaFile* pTmpMtf=NULL; GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf; - sal_uIntPtr nActionAnz=pMtf->GetActionCount(); + size_t nActionAnz = pMtf->GetActionSize(); sal_Bool bError = sal_False; @@ -156,7 +156,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, if(pProgrInfo) pProgrInfo->SetActionCount(nActionAnz); - sal_uIntPtr nActionsToReport = 0; + size_t nActionsToReport = 0; for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() ) { @@ -223,11 +223,11 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // Objekte in vorgegebenes Rechteck hineinskalieren sal_uIntPtr nAnz=aTmpList.GetObjCount(); - // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt. - // Da in aTmpList allerdings weniger eintraege als GetActionCount() + // Beim berechnen der Fortschrittsanzeige wird GetActionSize()*3 benutzt. + // Da in aTmpList allerdings weniger eintraege als GetActionSize() // existieren koennen, muessen hier die zuviel vermuteten Actionen wieder // hinzugefuegt werden. - nActionsToReport = (pMtf->GetActionCount() - nAnz)*2; + nActionsToReport = (pMtf->GetActionSize() - nAnz)*2; // Alle noch nicht gemeldeten Rescales melden diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 57304b85f1fe..28a0344a8302 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -58,7 +58,7 @@ #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems -#include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten +#include <svx/svdoedge.hxx> // Die Verbinder nach Move nochmal anbroadcasten #include "svx/svdglob.hxx" // StringCache #include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> @@ -94,7 +94,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -// #104018# replace macros above with type-safe methods inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); } inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } @@ -104,6 +103,86 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; + +static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, sal_uInt16 nSDat ) +{ + switch( nSDat >> 8 ) + { + case 0x00 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x20 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x40 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x60 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + rSegInfo.Count = 0; + break; + case 0x80 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + rSegInfo.Count = 0; + break; + case 0xa1 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; + rSegInfo.Count = ( nSDat & 0xff ) / 3; + break; + case 0xa2 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; + rSegInfo.Count = ( nSDat & 0xff ) / 3; + break; + case 0xa3 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa4 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa5 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa6 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa7 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; + rSegInfo.Count = nSDat & 0xff; + break; + case 0xa8 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; + rSegInfo.Count = nSDat & 0xff; + break; + case 0xaa : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; + rSegInfo.Count = 0; + break; + case 0xab : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; + rSegInfo.Count = 0; + break; + default: + case 0xf8 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; + rSegInfo.Count = nSDat; + break; + } + return; +} + static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) { MSO_SPT eRetValue = mso_sptNil; @@ -134,27 +213,11 @@ static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape ) bRet = sal_True; } break; -/* - case mso_sptCallout1 : - case mso_sptAccentCallout1 : - case mso_sptAccentBorderCallout1 : - case mso_sptBorderCallout90 : - case mso_sptCallout90 : - case mso_sptAccentCallout90 : - case mso_sptCallout2 : - case mso_sptCallout3 : - case mso_sptAccentCallout2 : - case mso_sptAccentCallout3 : - case mso_sptBorderCallout3 : - case mso_sptAccentBorderCallout2 : - case mso_sptAccentBorderCallout3 : -*/ default: break; } return bRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// // #i37011# create a clone with all attributes changed to shadow attributes // and translation executed, too. SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) @@ -227,7 +290,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS // set items as needed SfxItemSet aTempSet(rOriginalSet); - // SJ: #40108# :-( if a SvxWritingModeItem (Top->Bottom) is set the text object + // if a SvxWritingModeItem (Top->Bottom) is set the text object // is creating a paraobject, but paraobjects can not be created without model. So // we are preventing the crash by setting the writing mode always left to right, // this is not bad since our shadow geometry does not contain text. @@ -455,7 +518,6 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - //com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); PropertyValue aPropVal; aPropVal.Name = sMirroredX; aPropVal.Value <<= bMirrorX; @@ -466,7 +528,6 @@ void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - //com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); PropertyValue aPropVal; aPropVal.Name = sMirroredY; aPropVal.Value <<= bMirrorY; @@ -620,6 +681,151 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle #define DEFAULT_MINIMUM_SIGNED_COMPARE ((sal_Int32)0x80000000) #define DEFAULT_MAXIMUM_SIGNED_COMPARE ((sal_Int32)0x7fffffff) +static sal_Int32 GetNumberOfProperties ( const SvxMSDffHandle* pData ) +{ + sal_Int32 nPropertiesNeeded=1; // position is always needed + sal_Int32 nFlags = pData->nFlags; + + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) + { + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + } + } + else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + } + + return nPropertiesNeeded; +} + +static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::star::beans::PropertyValues& rPropValues ) +{ + sal_Int32 nFlags = pData->nFlags, n=0; + + // POSITION + { + const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); + rPropValues[ n ].Name = sPosition; + rPropValues[ n++ ].Value <<= aPosition; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) + { + const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + sal_Bool bMirroredX = sal_True; + rPropValues[ n ].Name = sMirroredX; + rPropValues[ n++ ].Value <<= bMirroredX; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) + { + const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + sal_Bool bMirroredY = sal_True; + rPropValues[ n ].Name = sMirroredY; + rPropValues[ n++ ].Value <<= bMirroredY; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) + { + const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); + sal_Bool bSwitched = sal_True; + rPropValues[ n ].Name = sSwitched; + rPropValues[ n++ ].Value <<= bSwitched; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) + { + const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, + ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, + ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sPolar; + rPropValues[ n++ ].Value <<= aCenter; + if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRadiusRangeMinimum; + rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; + } + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRadiusRangeMaximum; + rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; + } + } + } + else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRangeXMinimum; + rPropValues[ n++ ].Value <<= aRangeXMinimum; + } + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRangeXMaximum; + rPropValues[ n++ ].Value <<= aRangeXMaximum; + } + if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRangeYMinimum; + rPropValues[ n++ ].Value <<= aRangeYMinimum; + } + if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRangeYMaximum; + rPropValues[ n++ ].Value <<= aRangeYMaximum; + } + } + return; +} + sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperties() { return new sdr::properties::CustomShapeProperties(*this); @@ -752,9 +958,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - ///////////////////// // Path/GluePoints // - ///////////////////// const rtl::OUString sGluePoints( RTL_CONSTASCII_USTRINGPARAM ( "GluePoints" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) @@ -772,9 +976,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////////// // Path/Segments // - /////////////////// const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) @@ -787,121 +989,14 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) { EnhancedCustomShapeSegment& rSegInfo = seqSegments[ i ]; sal_uInt16 nSDat = pDefCustomShape->pElements[ i ]; - switch( nSDat >> 8 ) - { - case 0x00 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x20 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x40 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x60 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; - rSegInfo.Count = 0; - } - break; - case 0x80 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; - rSegInfo.Count = 0; - } - break; - case 0xa1 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa2 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa3 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa4 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa5 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa6 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa7 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xa8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xaa : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; - rSegInfo.Count = 0; - } - break; - case 0xab : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; - rSegInfo.Count = 0; - } - break; - default: - case 0xf8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; - rSegInfo.Count = nSDat; - } - break; - } + lcl_ShapeSegmentFromBinary( rSegInfo, nSDat ); } aPropVal.Name = sSegments; aPropVal.Value <<= seqSegments; aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////////// // Path/StretchX // - /////////////////// const rtl::OUString sStretchX( RTL_CONSTASCII_USTRINGPARAM ( "StretchX" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) @@ -915,9 +1010,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - /////////////////// // Path/StretchY // - /////////////////// const rtl::OUString sStretchY( RTL_CONSTASCII_USTRINGPARAM ( "StretchY" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) @@ -931,9 +1024,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - ///////////////////// // Path/TextFrames // - ///////////////////// const rtl::OUString sTextFrames( RTL_CONSTASCII_USTRINGPARAM ( "TextFrames" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) @@ -955,9 +1046,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////// // Equations // - /////////////// const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) @@ -974,156 +1063,23 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( aPropVal ); } - ///////////// // Handles // - ///////////// const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles; - sal_Int32 i, n, nCount = pDefCustomShape->nHandles; + sal_Int32 i, nCount = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; seqHandles.realloc( nCount ); for ( i = 0; i < nCount; i++, pData++ ) { - sal_Int32 nPropertiesNeeded = 1; // position is always needed - sal_Int32 nFlags = pData->nFlags; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - - n = 0; + sal_Int32 nPropertiesNeeded; com::sun::star::beans::PropertyValues& rPropValues = seqHandles[ i ]; + nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); - - // POSITION - { - const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); - rPropValues[ n ].Name = sPosition; - rPropValues[ n++ ].Value <<= aPosition; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - sal_Bool bMirroredX = sal_True; - rPropValues[ n ].Name = sMirroredX; - rPropValues[ n++ ].Value <<= bMirroredX; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - sal_Bool bMirroredY = sal_True; - rPropValues[ n ].Name = sMirroredY; - rPropValues[ n++ ].Value <<= bMirroredY; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - { - const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); - sal_Bool bSwitched = sal_True; - rPropValues[ n ].Name = sSwitched; - rPropValues[ n++ ].Value <<= bSwitched; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sPolar; - rPropValues[ n++ ].Value <<= aCenter; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRadiusRangeMinimum; - rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRadiusRangeMaximum; - rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; - } - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeXMinimum; - rPropValues[ n++ ].Value <<= aRangeXMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeXMaximum; - rPropValues[ n++ ].Value <<= aRangeXMaximum; - } - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeYMinimum; - rPropValues[ n++ ].Value <<= aRangeYMinimum; - } - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeYMaximum; - rPropValues[ n++ ].Value <<= aRangeYMaximum; - } - } + lcl_ShapePropertiesFromDFF( pData, rPropValues ); } aPropVal.Name = sHandles; aPropVal.Value <<= seqHandles; @@ -1217,9 +1173,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { - /////////////////// // Path/Segments // - /////////////////// const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) @@ -1237,112 +1191,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) { EnhancedCustomShapeSegment& rSegInfo = seqSegments2[ i ]; sal_uInt16 nSDat = pDefCustomShape->pElements[ i ]; - switch( nSDat >> 8 ) - { - case 0x00 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x20 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x40 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x60 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; - rSegInfo.Count = 0; - } - break; - case 0x80 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; - rSegInfo.Count = 0; - } - break; - case 0xa1 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa2 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa3 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa4 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa5 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa6 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa7 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xa8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xaa : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; - rSegInfo.Count = 0; - } - break; - case 0xab : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; - rSegInfo.Count = 0; - } - break; - default: - case 0xf8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; - rSegInfo.Count = nSDat; - } - break; - } + lcl_ShapeSegmentFromBinary( rSegInfo, nSDat ); } if ( seqSegments1 == seqSegments2 ) bIsDefaultGeometry = sal_True; @@ -1465,147 +1314,16 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles1, seqHandles2; if ( *pAny >>= seqHandles1 ) { - sal_Int32 i, n, nCount = pDefCustomShape->nHandles; + sal_Int32 i, nCount = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; seqHandles2.realloc( nCount ); for ( i = 0; i < nCount; i++, pData++ ) { - sal_Int32 nPropertiesNeeded = 1; // position is always needed - sal_Int32 nFlags = pData->nFlags; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - - n = 0; + sal_Int32 nPropertiesNeeded; com::sun::star::beans::PropertyValues& rPropValues = seqHandles2[ i ]; + nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); - - // POSITION - { - const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); - rPropValues[ n ].Name = sPosition; - rPropValues[ n++ ].Value <<= aPosition; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - sal_Bool bMirroredX = sal_True; - rPropValues[ n ].Name = sMirroredX; - rPropValues[ n++ ].Value <<= bMirroredX; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - sal_Bool bMirroredY = sal_True; - rPropValues[ n ].Name = sMirroredY; - rPropValues[ n++ ].Value <<= bMirroredY; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - { - const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); - sal_Bool bSwitched = sal_True; - rPropValues[ n ].Name = sSwitched; - rPropValues[ n++ ].Value <<= bSwitched; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sPolar; - rPropValues[ n++ ].Value <<= aCenter; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRadiusRangeMinimum; - rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRadiusRangeMaximum; - rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; - } - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeXMinimum; - rPropValues[ n++ ].Value <<= aRangeXMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeXMaximum; - rPropValues[ n++ ].Value <<= aRangeXMaximum; - } - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeYMinimum; - rPropValues[ n++ ].Value <<= aRangeYMinimum; - } - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeYMaximum; - rPropValues[ n++ ].Value <<= aRangeYMaximum; - } - } + lcl_ShapePropertiesFromDFF( pData, rPropValues ); } if ( seqHandles1 == seqHandles2 ) bIsDefaultGeometry = sal_True; @@ -1685,8 +1403,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// void SdrObjCustomShape::RecalcSnapRect() { @@ -1776,7 +1492,6 @@ void SdrObjCustomShape::Move( const Size& rSiz ) Rectangle aBoundRect0; if ( pUserCall ) aBoundRect0 = GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -1908,7 +1623,6 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) { // storing horizontal and vertical flipping without modifying the rotate angle - sal_Bool bHorz = sal_False; sal_Bool bVert = sal_False; if ( rRef1.X() == rRef2.X() ) @@ -1922,9 +1636,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - ///////////////// // "MirroredX" // - ///////////////// if ( bHorz ) { const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); @@ -1944,9 +1656,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) aGeometryItem.SetPropertyValue( aPropVal ); } - ///////////////// // "MirroredY" // - ///////////////// if ( bVert ) { const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); @@ -2133,13 +1843,6 @@ const SdrGluePointList* SdrObjCustomShape::GetGluePointList() const } // #i38892# -//SdrGluePointList* SdrObjCustomShape::GetGluePointList() -//{ -// ImpCheckCustomGluePointsAreAdded(); -// return SdrTextObj::GetGluePointList(); -//} - -// #i38892# SdrGluePointList* SdrObjCustomShape::ForceGluePointList() { if(SdrTextObj::ForceGluePointList()) @@ -2154,8 +1857,6 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// sal_uInt32 SdrObjCustomShape::GetHdlCount() const { @@ -2516,8 +2217,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape @@ -2557,7 +2256,7 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) // get item settings const SfxItemSet& rSet = GetObjectItemSet(); - // #103516# Also exchange hor/ver adjust items + // Also exchange hor/ver adjust items SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); SdrTextVertAdjust eVert = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); @@ -2567,14 +2266,14 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) // prepare ItemSet to set exchanged width and height items SfxItemSet aNewSet(*rSet.GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, - // #103516# Expanded item ranges to also support hor and ver adjust. + // Expanded item ranges to also support hor and ver adjust. SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST, 0, 0); aNewSet.Put(rSet); - // #103516# Exchange horz and vert adjusts + // Exchange horz and vert adjusts switch(eVert) { case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break; @@ -2817,7 +2516,6 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) // taking care of handles that should not been changed std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles( this ) ); -// SendRepaintBroadcast(); aRect = aNewTextRect; SetRectsDirty(); @@ -2837,7 +2535,6 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) InvalidateRenderGeometry(); SetChanged(); -// SendRepaintBroadcast(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } @@ -2924,12 +2621,12 @@ void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Recta if( IsVerticalWriting() ) aPaperMin.Width() = 0; else - aPaperMin.Height() = 0; // #33102# + aPaperMin.Height() = 0; if( eHAdj != SDRTEXTHORZADJUST_BLOCK ) aPaperMin.Width()=0; - // #103516# For complete ver adjust support, set paper min height to 0, here. + // For complete ver adjust support, set paper min height to 0, here. if(SDRTEXTVERTADJUST_BLOCK != eVAdj ) aPaperMin.Height() = 0; @@ -3043,7 +2740,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe Point aTextPos(aAnkRect.TopLeft()); Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder? - // #106653# // For draw objects containing text correct hor/ver alignment if text is bigger // than the object itself. Without that correction, the text would always be // formatted to the left edge (or top edge when vertical) of the draw object. @@ -3052,7 +2748,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe { if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting()) { - // #110129# // Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTHORZADJUST_BLOCK == eHAdj) @@ -3063,7 +2758,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting()) { - // #110129# // Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTVERTADJUST_BLOCK == eVAdj) @@ -3353,7 +3047,6 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // get turn and shear -// double fRotate = (aGeo.nDrehWink / 100.0) * F_PI180; double fRotate = fObjectRotation * F_PI180; double fShearX = (aGeo.nShearWink / 100.0) * F_PI180; @@ -3508,6 +3201,4 @@ void SdrObjCustomShape::InvalidateRenderGeometry() mpLastShadowGeometry = 0L; } -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index f39ef1719d06..4a74cd80a5df 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -100,10 +100,10 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt if ( pInStrm ) { pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() - ? pGF->GetImportFormatNumber( rFilterName ) + const sal_uInt16 nFilter = rFilterName.Len() && rGF.GetImportFormatCount() + ? rGF.GetImportFormatNumber( rFilterName ) : GRFILTER_FORMAT_DONTKNOW; String aEmptyStr; @@ -115,7 +115,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt // there we should create a new service to provide this data if needed aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); aFilterData[ 0 ].Value = Any( sal_True ); - pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); + rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } return aGraphic; } @@ -1310,7 +1310,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream, + if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index b78d10084ebe..c763468151a4 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -497,10 +497,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef OS2 -#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16))) -#endif - void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { if (GetPage()==NULL) @@ -881,16 +877,11 @@ void SdrPageView::DeleteHelpLine(sal_uInt16 nNum) void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum) { - if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount(); + if (nNum > aHelpLines.GetCount()) + nNum = aHelpLines.GetCount(); aHelpLines.Insert(rHL,nNum); - if (GetView().IsHlplVisible()) { - if (GetView().IsHlplFront()) { - // Hier optimieren ... - ImpInvalidateHelpLineArea(nNum); - } else { - ImpInvalidateHelpLineArea(nNum); - } - } + if (GetView().IsHlplVisible()) + ImpInvalidateHelpLineArea(nNum); } // Betretene Gruppe und Liste setzen diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 3350a33d23c9..a04ab26d949d 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -964,47 +964,7 @@ SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& if(pKnownTarget) { - // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region - // rReg may be made more granular (fine) with using it. Normally, rReg - // does come from Window::Paint() anyways and thus is based on a single - // rectangle which was derived from exactly that repaint region - Region aOptimizedRepaintRegion(rReg); - - // #i76114# Intersecting the region with the Window's paint region is disabled - // for print preview in Calc, because the intersection can be empty (if the paint - // region is outside of the table area of the page), and then no clip region - // would be set. - if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) - { - Window* pWindow = (Window*)pOut; - - if(pWindow->IsInPaint()) - { - if(!pWindow->GetPaintRegion().IsEmpty()) - { - aOptimizedRepaintRegion.Intersect(pWindow->GetPaintRegion()); - -#ifdef DBG_UTIL - // #i74769# test-paint repaint region - static bool bDoPaintForVisualControl(false); - if(bDoPaintForVisualControl) - { - RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); - Rectangle aRegionRectangle; - - while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) - { - pWindow->SetLineColor(COL_LIGHTGREEN); - pWindow->SetFillColor(); - pWindow->DrawRect(aRegionRectangle); - } - - aOptimizedRepaintRegion.EndEnumRects(aRegionHandle); - } -#endif - } - } - } + Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); // prepare redraw pKnownTarget->PrepareRedraw(aOptimizedRepaintRegion); @@ -1029,6 +989,70 @@ void SdrPaintView::EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLa } } +void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +{ + SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); + OSL_ENSURE(pPaintWindow, "SdrPaintView::UpdateDrawLayersRegion: No SdrPaintWindow (!)"); + + if(mpPageView) + { + SdrPageWindow* pKnownTarget = mpPageView->FindPageWindow(*pPaintWindow); + + if(pKnownTarget) + { + Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); + pKnownTarget->GetPaintWindow().SetRedrawRegion(aOptimizedRepaintRegion); + mpPageView->setPreparedPageWindow(pKnownTarget); // already set actually + } + } +} + +Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +{ + // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region + // rReg may be made more granular (fine) with using it. Normally, rReg + // does come from Window::Paint() anyways and thus is based on a single + // rectangle which was derived from exactly that repaint region + Region aOptimizedRepaintRegion(rReg); + + // #i76114# Intersecting the region with the Window's paint region is disabled + // for print preview in Calc, because the intersection can be empty (if the paint + // region is outside of the table area of the page), and then no clip region + // would be set. + if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) + { + Window* pWindow = (Window*)pOut; + + if(pWindow->IsInPaint()) + { + if(!pWindow->GetPaintRegion().IsEmpty()) + { + aOptimizedRepaintRegion.Intersect(pWindow->GetPaintRegion()); + +#ifdef DBG_UTIL + // #i74769# test-paint repaint region + static bool bDoPaintForVisualControl(false); + if(bDoPaintForVisualControl) + { + RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); + Rectangle aRegionRectangle; + + while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) + { + pWindow->SetLineColor(COL_LIGHTGREEN); + pWindow->SetFillColor(); + pWindow->DrawRect(aRegionRectangle); + } + + aOptimizedRepaintRegion.EndEnumRects(aRegionHandle); + } +#endif + } + } + } + return aOptimizedRepaintRegion; +} + //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrPaintView::ImpTextEditDrawing(SdrPaintWindow& rPaintWindow) const diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index d2abe39e9505..d3820eb99181 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -603,7 +603,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarke } } - if( !aMtf.GetActionCount() ) + if( !aMtf.GetActionSize() ) { VirtualDevice aOut; Size aDummySize( 2, 2 ); @@ -708,7 +708,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* aMtf.SetPrefMapMode( aMap ); aMtf.SetPrefSize( aBoundRect.GetSize() ); - if( aMtf.GetActionCount() ) + if( aMtf.GetActionSize() ) aRet = aMtf; } } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index b5ed93d008b7..def01cd52812 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -302,13 +302,10 @@ void SvxUndoRedoControl::StateChanged( if ( pState && pState->ISA( SfxStringListItem ) ) { SfxStringListItem &rItem = *(SfxStringListItem *)pState; - const List* pLst = rItem.GetList(); - DBG_ASSERT( pLst, "no undo actions available" ); - if ( pLst ) - { - for( long nI = 0, nEnd = pLst->Count(); nI < nEnd; ++nI ) - aUndoRedoList.push_back( rtl::OUString( *(String *)pLst->GetObject( nI ))); - } + + const std::vector<String> &aLst = rItem.GetList(); + for( long nI = 0, nEnd = aLst.size(); nI < nEnd; ++nI ) + aUndoRedoList.push_back( rtl::OUString( aLst[nI] )); } } } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 55ae13c43696..cb8ba42fc04f 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1005,19 +1005,19 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes if( NULL == mpUnoPage ) return sal_False; - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - - if( NULL == pFilter || NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) + if( NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) return sal_False; + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + // get the arguments from the descriptor ExportSettings aSettings( mpDoc ); ParseSettings( aDescriptor, aSettings ); const sal_uInt16 nFilter = aSettings.maMediaType.getLength() - ? pFilter->GetExportFormatNumberForMediaType( aSettings.maMediaType ) - : pFilter->GetExportFormatNumberForShortName( aSettings.maFilterName ); - sal_Bool bVectorType = !pFilter->IsExportPixelFormat( nFilter ); + ? rFilter.GetExportFormatNumberForMediaType( aSettings.maMediaType ) + : rFilter.GetExportFormatNumberForShortName( aSettings.maFilterName ); + sal_Bool bVectorType = !rFilter.IsExportPixelFormat( nFilter ); // create the output stuff Graphic aGraphic; @@ -1046,7 +1046,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes // SvOutputStream, or adapt the graphic filter to not seek anymore. SvMemoryStream aStream( 1024, 1024 ); - nStatus = pFilter->ExportGraphic( aGraphic, String(), aStream, nFilter, &aSettings.maFilterData ); + nStatus = rFilter.ExportGraphic( aGraphic, String(), aStream, nFilter, &aSettings.maFilterData ); // copy temp stream to XOutputStream SvOutputStream aOutputStream( aSettings.mxOutputStream ); @@ -1058,7 +1058,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes INetURLObject aURLObject( aSettings.maURL.Complete ); DBG_ASSERT( aURLObject.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, *pFilter, nFilter, &aSettings.maFilterData ); + nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, rFilter, nFilter, &aSettings.maFilterData ); } } } @@ -1223,12 +1223,12 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam { const String aMimeTypeName( MimeTypeName ); - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - sal_uInt16 nCount = pFilter->GetExportFormatCount(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + sal_uInt16 nCount = rFilter.GetExportFormatCount(); sal_uInt16 nFilter; for( nFilter = 0; nFilter < nCount; nFilter++ ) { - if( aMimeTypeName.Equals( pFilter->GetExportFormatMediaType( nFilter ) ) ) + if( aMimeTypeName.Equals( rFilter.GetExportFormatMediaType( nFilter ) ) ) { return sal_True; } @@ -1239,8 +1239,8 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - sal_uInt16 nCount = pFilter->GetExportFormatCount(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + sal_uInt16 nCount = rFilter.GetExportFormatCount(); sal_uInt16 nFilter; sal_uInt16 nFound = 0; @@ -1249,7 +1249,7 @@ Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) thr for( nFilter = 0; nFilter < nCount; nFilter++ ) { - OUString aMimeType( pFilter->GetExportFormatMediaType( nFilter ) ); + OUString aMimeType( rFilter.GetExportFormatMediaType( nFilter ) ); if( aMimeType.getLength() ) { *pStr++ = aMimeType; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 649cc8d772b5..83b0295c663b 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -190,7 +190,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL RecoveryUI::st_createInstan static OUString GetCrashConfigDir() { -#if defined(WNT) || defined(OS2) +#if defined(WNT) OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); #elif defined(MACOSX) OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~")); @@ -199,7 +199,7 @@ static OUString GetCrashConfigDir() #endif Bootstrap::expandMacros( ustrValue ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); #endif return ustrValue; @@ -207,7 +207,7 @@ static OUString GetCrashConfigDir() //=============================================== -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define LCKFILE "crashdat.lck" #else #define LCKFILE ".crash_report_unsent" diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index b43ce57eb3b3..2f72f92db5a0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1730,8 +1730,8 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) { - GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); - aFilterName = pGrfFilter->GetImportFormatName( pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); + GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); + aFilterName = rGrfFilter.GetImportFormatName( rGrfFilter.GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); } } else diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index dfd45caf40fd..a7c08e759a99 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -364,7 +364,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx // usage. Removed it, former fallback is used now if ( pProperty->nWID == OWN_ATTR_OLEMODEL || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 const sal_Bool bSuccess(pObj->AddOwnLightClient()); OSL_ENSURE( bSuccess, "An object without client is provided!" ); #else diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index bb4565d57250..677ac702d8a3 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3084,13 +3084,12 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons if( mpImpl->mpMaster ) { for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = getPropertyState( pNames[nIdx] ); - + pState[nIdx] = mpImpl->mpMaster->getPropertyState( pNames[nIdx] ); } else { for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = getPropertyState( pNames[nIdx] ); + pState[nIdx] = _getPropertyState( pNames[nIdx] ); } return aRet; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 5bb7da42eb0e..23cb968233b9 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -74,7 +74,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) static ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" ); const MetaCommentAction* pComment = NULL; - if ( ( rMtf.GetActionCount() >= 2 ) + if ( ( rMtf.GetActionSize() >= 2 ) && ( rMtf.FirstAction()->GetType() == META_EPS_ACTION ) && ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION ) && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == aComment ) ) @@ -139,7 +139,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -147,7 +147,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi else aFormat = String( RTL_CONSTASCII_USTRINGPARAM( "png" ) ); - bRet = ( pFilter->ExportGraphic( aGraphic, String(), *pStm, pFilter->GetExportFormatNumberForShortName( aFormat ) ) == 0 ); + bRet = ( rFilter.ExportGraphic( aGraphic, String(), *pStm, rFilter.GetExportFormatNumberForShortName( aFormat ) ) == 0 ); } else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { @@ -331,7 +331,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() mpOStm->Seek( 0 ); sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -374,7 +374,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (nStreamLen_) { pDest->Seek(0L); - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; @@ -570,7 +570,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream ); delete pStream; } @@ -616,7 +616,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -624,8 +624,8 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt else aFormat = String( RTL_CONSTASCII_USTRINGPARAM( "png" ) ); - bRet = ( pFilter->ExportGraphic( aGraphic, String(), *pStream, - pFilter->GetExportFormatNumberForShortName( aFormat ) ) == 0 ); + bRet = ( rFilter.ExportGraphic( aGraphic, String(), *pStream, + rFilter.GetExportFormatNumberForShortName( aFormat ) ) == 0 ); } else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index f5535e63957f..e88e5e4e6737 100755 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -328,7 +328,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, INetURLObject aURL( rFileName ); Graphic aGraphic; String aExt; - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); @@ -398,19 +398,19 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if( bWriteTransGrf ) aFilter = FORMAT_GIF; - nFilter = pFilter->GetExportFormatNumberForShortName( aFilter ); + nFilter = rFilter.GetExportFormatNumberForShortName( aFilter ); if( GRFILTER_FORMAT_NOTFOUND == nFilter ) { - nFilter = pFilter->GetExportFormatNumberForShortName( FORMAT_JPG ); + nFilter = rFilter.GetExportFormatNumberForShortName( FORMAT_JPG ); if( GRFILTER_FORMAT_NOTFOUND == nFilter ) - nFilter = pFilter->GetExportFormatNumberForShortName( FORMAT_BMP ); + nFilter = rFilter.GetExportFormatNumberForShortName( FORMAT_BMP ); } if( GRFILTER_FORMAT_NOTFOUND != nFilter ) { - aExt = pFilter->GetExportFormatShortName( nFilter ).ToLowerAscii(); + aExt = rFilter.GetExportFormatShortName( nFilter ).ToLowerAscii(); if( bWriteTransGrf ) { @@ -477,7 +477,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if( 0 == (nFlags & XOUTBMP_DONT_ADD_EXTENSION)) aURL.setExtension( aExt ); rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); - nErr = ExportGraphic( aGraphic, aURL, *pFilter, nFilter, NULL ); + nErr = ExportGraphic( aGraphic, aURL, rFilter, nFilter, NULL ); } } } diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index dad41b9ff77f..eae0c09360e2 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -57,12 +57,6 @@ static char const aChckColor[] = { 0x04, 0x00, 'S','O','C','L'}; // < 5.2 static char const aChckColor0[] = { 0x04, 0x00, 'S','O','C','0'}; // = 5.2 static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 -// ------------------ -// class XColorTable -// ------------------ - -static XColorTable* pTable=0; - /************************************************************************* |* |* XColorTable::XColorTable() @@ -84,11 +78,10 @@ XColorTable::~XColorTable() { } -XColorTable* XColorTable::GetStdColorTable() +XColorTable& XColorTable::GetStdColorTable() { - if ( !pTable ) - pTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - return pTable; + static XColorTable aTable(SvtPathOptions().GetPalettePath()); + return aTable; } /************************************************************************/ diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component index 2f829cb52a77..d266e06188c1 100755 --- a/svx/util/svxcore.component +++ b/svx/util/svxcore.component @@ -25,9 +25,7 @@ * for a copy of the LGPLv3 License. * **********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> +<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> <service name="com.sun.star.frame.PopupMenuController"/> </implementation> @@ -40,10 +38,10 @@ <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <implementation name="com.sun.star.comp.svx.FontworkAlignmentController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <implementation name="com.sun.star.comp.svx.FontworkCharacterSpacingController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> </component> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 9b2f4f2e2aac..3f92f9bedb82 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -54,7 +54,6 @@ #include <dialdll.hxx> - #define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry" #include <comphelper/processfactory.hxx> #include <comphelper/regpathhelper.hxx> @@ -356,7 +355,6 @@ BOOL __EXPORT MyView::QueryDrop( DropEvent& rEvt ) } // --- class EditMainWindow -------------------------------------------- -DECLARE_LIST( ViewList, MyView* ); class EditViewWindow : public Window { @@ -366,7 +364,6 @@ private: Pointer aStdPtr; Pointer aURLPtr; WorkWindow* pTmpWindow; - ViewList aViewList; XubString aTestStr; @@ -1396,15 +1393,6 @@ IMPL_LINK( EditMainWindow, ShowStatus, EditStatus *, pStat ) EditViewWindow::~EditViewWindow() { - // erst die angemeldeten Views zerstoeren - // (melden sich selbst ab) - MyView* pView = aViewList.First(); - while ( pView ) - { - delete pView; - pView = aViewList.Next(); - } - pEditEngine->RemoveView( pEditView ); delete pEditView; // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt, diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 531251215fe2..062014cda385 100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -154,6 +154,7 @@ application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s +application/vnd.lotus-wordpro; %PREFIX -view %s application/wpwin; %PREFIX -view %s application/vnd.openofficeorg.extension; %PREFIX %s END diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 40f7e79ebc8c..dbbff82a9144 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplicat Exec=${UNIXBASISROOTNAME} --base %U MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base -Name[pt_BR]=%PRODUCTNAME_BR Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index 80cc09ddbedb..652847868a11 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Sprea Exec=${UNIXBASISROOTNAME} --calc %U MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf; Name=%PRODUCTNAME Calc -Name[pt_BR]=%PRODUCTNAME_BR Calc GenericName=Spreadsheet Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 57f7ade0aea4..96234c67147a 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawi Exec=${UNIXBASISROOTNAME} --draw %U MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw; Name=%PRODUCTNAME Draw -Name[pt_BR]=%PRODUCTNAME_BR Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 025524e17984..92060e37800d 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Prese Exec=${UNIXBASISROOTNAME} --impress %U MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; Name=%PRODUCTNAME Impress -Name[pt_BR]=%PRODUCTNAME_BR Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop index 8b9c30a2f70f..61e4ea7e3340 100755 --- a/sysui/desktop/menus/javafilter.desktop +++ b/sysui/desktop/menus/javafilter.desktop @@ -5,6 +5,5 @@ Type=Application Exec=${UNIXBASISROOTNAME} --writer %U MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel; Name=%PRODUCTNAME Small Device Format Importer -Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer GenericName=Small Device Format Importer NoDisplay=true diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 55fcc29f312d..7b2e9807cb04 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other Exec=${UNIXBASISROOTNAME} --math %U MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; Name=%PRODUCTNAME Math -Name[pt_BR]=%PRODUCTNAME_BR Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop index 3da4d82a33b1..2d4747605267 100755 --- a/sysui/desktop/menus/printeradmin.desktop +++ b/sysui/desktop/menus/printeradmin.desktop @@ -6,5 +6,4 @@ Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=${UNIXBASISROOTNAME}-printeradmin Name=%PRODUCTNAME Printer Administration -Name[pt_BR]=%PRODUCTNAME_BR Printer Administration diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop index 52ac185b9d3f..fc39c227ade7 100755 --- a/sysui/desktop/menus/qstart.desktop +++ b/sysui/desktop/menus/qstart.desktop @@ -6,5 +6,4 @@ Categories=Office; Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault NoDisplay=true Name=%PRODUCTNAME Quickstarter -Name[pt_BR]=%PRODUCTNAME_BR Quickstarter Comment=Hook for quickstarter startup diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 390dd93f3a0a..0c6d0a1eb8cd 100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -7,6 +7,5 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other Exec=${UNIXBASISROOTNAME} %U MimeType=application/vnd.openofficeorg.extension; Name=%PRODUCTNAME -Name[pt_BR]=%PRODUCTNAME_BR GenericName=Office Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 2222019bbf55..e9c05a54d67a 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -5,9 +5,8 @@ Icon=writer Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; Exec=${UNIXBASISROOTNAME} --writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; Name=%PRODUCTNAME Writer -Name[pt_BR]=%PRODUCTNAME_BR Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. InitialPreference=5 diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications index 6d878010e214..4c3b31ac98e8 100755 --- a/sysui/desktop/mimetypes/openoffice.applications +++ b/sysui/desktop/mimetypes/openoffice.applications @@ -5,5 +5,5 @@ OFFICENAME expects_uris=true requires_terminal=false uses_gnomevfs=true - mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12; + mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12; diff --git a/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk deleted file mode 100755 index 7d1637254a01..000000000000 --- a/sysui/desktop/os2/makefile.mk +++ /dev/null @@ -1,123 +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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sysui -TARGET=icons - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Targets ------------------------------------------------------------- - -all: \ - $(MISC)$/ooo-base-app.ico \ - $(MISC)$/ooo-base-doc.ico \ - $(MISC)$/ooo-calc-app.ico \ - $(MISC)$/ooo-calc-doc.ico \ - $(MISC)$/ooo-calc-tem.ico \ - $(MISC)$/ooo-chart-doc.ico \ - $(MISC)$/ooo-configuration.ico \ - $(MISC)$/ooo-draw-app.ico \ - $(MISC)$/ooo-draw-doc.ico \ - $(MISC)$/ooo-draw-tem.ico \ - $(MISC)$/ooo-empty-doc.ico \ - $(MISC)$/ooo-empty-tem.ico \ - $(MISC)$/ooo-image-doc.ico \ - $(MISC)$/ooo-impress-app.ico \ - $(MISC)$/ooo-impress-doc.ico \ - $(MISC)$/ooo-impress-tem.ico \ - $(MISC)$/ooo-macro-doc.ico \ - $(MISC)$/ooo-main-app.ico \ - $(MISC)$/ooo-master-doc.ico \ - $(MISC)$/ooo-math-app.ico \ - $(MISC)$/ooo-math-doc.ico \ - $(MISC)$/ooo-open.ico \ - $(MISC)$/ooo-printer.ico \ - $(MISC)$/ooo-web-doc.ico \ - $(MISC)$/ooo-writer-app.ico \ - $(MISC)$/ooo-writer-doc.ico \ - $(MISC)$/ooo-writer-tem.ico \ - $(MISC)$/ooo11-base-doc.ico \ - $(MISC)$/ooo11-calc-doc.ico \ - $(MISC)$/ooo11-calc-tem.ico \ - $(MISC)$/ooo11-chart-doc.ico \ - $(MISC)$/ooo11-draw-doc.ico \ - $(MISC)$/ooo11-draw-tem.ico \ - $(MISC)$/ooo11-impress-doc.ico \ - $(MISC)$/ooo11-impress-tem.ico \ - $(MISC)$/ooo11-master-doc.ico \ - $(MISC)$/ooo11-math-doc.ico \ - $(MISC)$/ooo11-writer-doc.ico \ - $(MISC)$/ooo11-writer-tem.ico \ - $(MISC)$/so8-base-app.ico \ - $(MISC)$/so8-base-doc.ico \ - $(MISC)$/so8-calc-app.ico \ - $(MISC)$/so8-calc-doc.ico \ - $(MISC)$/so8-calc-tem.ico \ - $(MISC)$/so8-chart-doc.ico \ - $(MISC)$/so8-configuration.ico \ - $(MISC)$/so8-draw-app.ico \ - $(MISC)$/so8-draw-doc.ico \ - $(MISC)$/so8-draw-tem.ico \ - $(MISC)$/so8-empty-doc.ico \ - $(MISC)$/so8-empty-tem.ico \ - $(MISC)$/so8-image-doc.ico \ - $(MISC)$/so8-impress-app.ico \ - $(MISC)$/so8-impress-doc.ico \ - $(MISC)$/so8-impress-tem.ico \ - $(MISC)$/so8-macro-doc.ico \ - $(MISC)$/so8-main-app.ico \ - $(MISC)$/so8-master-doc.ico \ - $(MISC)$/so8-math-app.ico \ - $(MISC)$/so8-math-doc.ico \ - $(MISC)$/so8-open.ico \ - $(MISC)$/so8-printer.ico \ - $(MISC)$/so8-web-doc.ico \ - $(MISC)$/so8-writer-app.ico \ - $(MISC)$/so8-writer-doc.ico \ - $(MISC)$/so8-writer-tem.ico \ - $(MISC)$/so7-base-doc.ico \ - $(MISC)$/so7-calc-doc.ico \ - $(MISC)$/so7-calc-tem.ico \ - $(MISC)$/so7-chart-doc.ico \ - $(MISC)$/so7-draw-doc.ico \ - $(MISC)$/so7-draw-tem.ico \ - $(MISC)$/so7-impress-doc.ico \ - $(MISC)$/so7-impress-tem.ico \ - $(MISC)$/so7-master-doc.ico \ - $(MISC)$/so7-math-doc.ico \ - $(MISC)$/so7-writer-doc.ico \ - $(MISC)$/so7-writer-tem.ico - -$(MISC)$/%.ico: %.ico - +$(COPY) $< $@ - -.INCLUDE : target.mk - diff --git a/sysui/desktop/os2/ooo-base-app.ico b/sysui/desktop/os2/ooo-base-app.ico Binary files differdeleted file mode 100644 index e55abae34476..000000000000 --- a/sysui/desktop/os2/ooo-base-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-base-doc.ico b/sysui/desktop/os2/ooo-base-doc.ico Binary files differdeleted file mode 100644 index e1b033ad1050..000000000000 --- a/sysui/desktop/os2/ooo-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-app.ico b/sysui/desktop/os2/ooo-calc-app.ico Binary files differdeleted file mode 100644 index 66adbc663516..000000000000 --- a/sysui/desktop/os2/ooo-calc-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-doc.ico b/sysui/desktop/os2/ooo-calc-doc.ico Binary files differdeleted file mode 100644 index 0cfc09f9c9f1..000000000000 --- a/sysui/desktop/os2/ooo-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-tem.ico b/sysui/desktop/os2/ooo-calc-tem.ico Binary files differdeleted file mode 100644 index 363703e35369..000000000000 --- a/sysui/desktop/os2/ooo-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-chart-doc.ico b/sysui/desktop/os2/ooo-chart-doc.ico Binary files differdeleted file mode 100644 index fee582f29d49..000000000000 --- a/sysui/desktop/os2/ooo-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-configuration.ico b/sysui/desktop/os2/ooo-configuration.ico Binary files differdeleted file mode 100644 index 2723b37fcb8e..000000000000 --- a/sysui/desktop/os2/ooo-configuration.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-app.ico b/sysui/desktop/os2/ooo-draw-app.ico Binary files differdeleted file mode 100644 index 1524d9989566..000000000000 --- a/sysui/desktop/os2/ooo-draw-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-doc.ico b/sysui/desktop/os2/ooo-draw-doc.ico Binary files differdeleted file mode 100644 index a63a39b787cf..000000000000 --- a/sysui/desktop/os2/ooo-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-tem.ico b/sysui/desktop/os2/ooo-draw-tem.ico Binary files differdeleted file mode 100644 index cac9513cb3c2..000000000000 --- a/sysui/desktop/os2/ooo-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-empty-doc.ico b/sysui/desktop/os2/ooo-empty-doc.ico Binary files differdeleted file mode 100644 index 350e6ac37da3..000000000000 --- a/sysui/desktop/os2/ooo-empty-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-empty-tem.ico b/sysui/desktop/os2/ooo-empty-tem.ico Binary files differdeleted file mode 100644 index 3cdff3d8c73a..000000000000 --- a/sysui/desktop/os2/ooo-empty-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-image-doc.ico b/sysui/desktop/os2/ooo-image-doc.ico Binary files differdeleted file mode 100644 index b1fed4dca8da..000000000000 --- a/sysui/desktop/os2/ooo-image-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-app.ico b/sysui/desktop/os2/ooo-impress-app.ico Binary files differdeleted file mode 100644 index e58eaad5cdc9..000000000000 --- a/sysui/desktop/os2/ooo-impress-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-doc.ico b/sysui/desktop/os2/ooo-impress-doc.ico Binary files differdeleted file mode 100644 index ba1b6df74e33..000000000000 --- a/sysui/desktop/os2/ooo-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-tem.ico b/sysui/desktop/os2/ooo-impress-tem.ico Binary files differdeleted file mode 100644 index 93a3509ad5fe..000000000000 --- a/sysui/desktop/os2/ooo-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-macro-doc.ico b/sysui/desktop/os2/ooo-macro-doc.ico Binary files differdeleted file mode 100644 index 2fe6c55f581e..000000000000 --- a/sysui/desktop/os2/ooo-macro-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-main-app.ico b/sysui/desktop/os2/ooo-main-app.ico Binary files differdeleted file mode 100644 index f7edd4524bc1..000000000000 --- a/sysui/desktop/os2/ooo-main-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-master-doc.ico b/sysui/desktop/os2/ooo-master-doc.ico Binary files differdeleted file mode 100644 index 2861de24d1c4..000000000000 --- a/sysui/desktop/os2/ooo-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-math-app.ico b/sysui/desktop/os2/ooo-math-app.ico Binary files differdeleted file mode 100644 index c3c3c81c9106..000000000000 --- a/sysui/desktop/os2/ooo-math-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-math-doc.ico b/sysui/desktop/os2/ooo-math-doc.ico Binary files differdeleted file mode 100644 index a605e9e1ae0e..000000000000 --- a/sysui/desktop/os2/ooo-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-open.ico b/sysui/desktop/os2/ooo-open.ico Binary files differdeleted file mode 100644 index 508909ea3815..000000000000 --- a/sysui/desktop/os2/ooo-open.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-printer.ico b/sysui/desktop/os2/ooo-printer.ico Binary files differdeleted file mode 100644 index 30ed6cd00ccc..000000000000 --- a/sysui/desktop/os2/ooo-printer.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-web-doc.ico b/sysui/desktop/os2/ooo-web-doc.ico Binary files differdeleted file mode 100644 index d8b497633528..000000000000 --- a/sysui/desktop/os2/ooo-web-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-app.ico b/sysui/desktop/os2/ooo-writer-app.ico Binary files differdeleted file mode 100644 index c6a5e1fdfc7f..000000000000 --- a/sysui/desktop/os2/ooo-writer-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-doc.ico b/sysui/desktop/os2/ooo-writer-doc.ico Binary files differdeleted file mode 100644 index 02a95ecee479..000000000000 --- a/sysui/desktop/os2/ooo-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-tem.ico b/sysui/desktop/os2/ooo-writer-tem.ico Binary files differdeleted file mode 100644 index b356cffbdcbf..000000000000 --- a/sysui/desktop/os2/ooo-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-base-doc.ico b/sysui/desktop/os2/ooo11-base-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-calc-doc.ico b/sysui/desktop/os2/ooo11-calc-doc.ico Binary files differdeleted file mode 100644 index d891a04c869a..000000000000 --- a/sysui/desktop/os2/ooo11-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-calc-tem.ico b/sysui/desktop/os2/ooo11-calc-tem.ico Binary files differdeleted file mode 100644 index d891a04c869a..000000000000 --- a/sysui/desktop/os2/ooo11-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-chart-doc.ico b/sysui/desktop/os2/ooo11-chart-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-draw-doc.ico b/sysui/desktop/os2/ooo11-draw-doc.ico Binary files differdeleted file mode 100644 index 61312fbe562e..000000000000 --- a/sysui/desktop/os2/ooo11-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-draw-tem.ico b/sysui/desktop/os2/ooo11-draw-tem.ico Binary files differdeleted file mode 100644 index 61312fbe562e..000000000000 --- a/sysui/desktop/os2/ooo11-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-impress-doc.ico b/sysui/desktop/os2/ooo11-impress-doc.ico Binary files differdeleted file mode 100644 index cebf5e56bc77..000000000000 --- a/sysui/desktop/os2/ooo11-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-impress-tem.ico b/sysui/desktop/os2/ooo11-impress-tem.ico Binary files differdeleted file mode 100644 index cebf5e56bc77..000000000000 --- a/sysui/desktop/os2/ooo11-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-master-doc.ico b/sysui/desktop/os2/ooo11-master-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-math-doc.ico b/sysui/desktop/os2/ooo11-math-doc.ico Binary files differdeleted file mode 100644 index ab8c16007727..000000000000 --- a/sysui/desktop/os2/ooo11-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-writer-doc.ico b/sysui/desktop/os2/ooo11-writer-doc.ico Binary files differdeleted file mode 100644 index 901d8ec3df33..000000000000 --- a/sysui/desktop/os2/ooo11-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-writer-tem.ico b/sysui/desktop/os2/ooo11-writer-tem.ico Binary files differdeleted file mode 100644 index 901d8ec3df33..000000000000 --- a/sysui/desktop/os2/ooo11-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-base-doc.ico b/sysui/desktop/os2/so7-base-doc.ico Binary files differdeleted file mode 100644 index 5ffd7549cc5b..000000000000 --- a/sysui/desktop/os2/so7-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-calc-doc.ico b/sysui/desktop/os2/so7-calc-doc.ico Binary files differdeleted file mode 100644 index ead58e51ff6d..000000000000 --- a/sysui/desktop/os2/so7-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-calc-tem.ico b/sysui/desktop/os2/so7-calc-tem.ico Binary files differdeleted file mode 100644 index bdbeb0406ccd..000000000000 --- a/sysui/desktop/os2/so7-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-chart-doc.ico b/sysui/desktop/os2/so7-chart-doc.ico Binary files differdeleted file mode 100644 index 5412287c37ea..000000000000 --- a/sysui/desktop/os2/so7-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-draw-doc.ico b/sysui/desktop/os2/so7-draw-doc.ico Binary files differdeleted file mode 100644 index 3e4ab098070d..000000000000 --- a/sysui/desktop/os2/so7-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-draw-tem.ico b/sysui/desktop/os2/so7-draw-tem.ico Binary files differdeleted file mode 100644 index ca46a39a5f21..000000000000 --- a/sysui/desktop/os2/so7-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-impress-doc.ico b/sysui/desktop/os2/so7-impress-doc.ico Binary files differdeleted file mode 100644 index 4df2d73d3c23..000000000000 --- a/sysui/desktop/os2/so7-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-impress-tem.ico b/sysui/desktop/os2/so7-impress-tem.ico Binary files differdeleted file mode 100644 index 0c29d09ebf53..000000000000 --- a/sysui/desktop/os2/so7-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-master-doc.ico b/sysui/desktop/os2/so7-master-doc.ico Binary files differdeleted file mode 100644 index 70a7fa52afe7..000000000000 --- a/sysui/desktop/os2/so7-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-math-doc.ico b/sysui/desktop/os2/so7-math-doc.ico Binary files differdeleted file mode 100644 index 9e1f3bb4dbf2..000000000000 --- a/sysui/desktop/os2/so7-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-writer-doc.ico b/sysui/desktop/os2/so7-writer-doc.ico Binary files differdeleted file mode 100644 index 01e1fcc897bf..000000000000 --- a/sysui/desktop/os2/so7-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-writer-tem.ico b/sysui/desktop/os2/so7-writer-tem.ico Binary files differdeleted file mode 100644 index c6bc74e0e2e3..000000000000 --- a/sysui/desktop/os2/so7-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-base-app.ico b/sysui/desktop/os2/so8-base-app.ico Binary files differdeleted file mode 100644 index 8480d3cf506f..000000000000 --- a/sysui/desktop/os2/so8-base-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-base-doc.ico b/sysui/desktop/os2/so8-base-doc.ico Binary files differdeleted file mode 100644 index c539d1f4a773..000000000000 --- a/sysui/desktop/os2/so8-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-app.ico b/sysui/desktop/os2/so8-calc-app.ico Binary files differdeleted file mode 100644 index fc129ca9771d..000000000000 --- a/sysui/desktop/os2/so8-calc-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-doc.ico b/sysui/desktop/os2/so8-calc-doc.ico Binary files differdeleted file mode 100644 index b5184ff419aa..000000000000 --- a/sysui/desktop/os2/so8-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-tem.ico b/sysui/desktop/os2/so8-calc-tem.ico Binary files differdeleted file mode 100644 index 6c6b6dbbd44e..000000000000 --- a/sysui/desktop/os2/so8-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-chart-doc.ico b/sysui/desktop/os2/so8-chart-doc.ico Binary files differdeleted file mode 100644 index a3b8ae3c0a1a..000000000000 --- a/sysui/desktop/os2/so8-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-configuration.ico b/sysui/desktop/os2/so8-configuration.ico Binary files differdeleted file mode 100644 index eebd9d899aac..000000000000 --- a/sysui/desktop/os2/so8-configuration.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-app.ico b/sysui/desktop/os2/so8-draw-app.ico Binary files differdeleted file mode 100644 index c491094c5faa..000000000000 --- a/sysui/desktop/os2/so8-draw-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-doc.ico b/sysui/desktop/os2/so8-draw-doc.ico Binary files differdeleted file mode 100644 index 28d1b32e161e..000000000000 --- a/sysui/desktop/os2/so8-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-tem.ico b/sysui/desktop/os2/so8-draw-tem.ico Binary files differdeleted file mode 100644 index caf6ddc8c94d..000000000000 --- a/sysui/desktop/os2/so8-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-empty-doc.ico b/sysui/desktop/os2/so8-empty-doc.ico Binary files differdeleted file mode 100644 index 23b1bfa00843..000000000000 --- a/sysui/desktop/os2/so8-empty-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-empty-tem.ico b/sysui/desktop/os2/so8-empty-tem.ico Binary files differdeleted file mode 100644 index 08d0ff03730b..000000000000 --- a/sysui/desktop/os2/so8-empty-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-image-doc.ico b/sysui/desktop/os2/so8-image-doc.ico Binary files differdeleted file mode 100644 index 2c734453e638..000000000000 --- a/sysui/desktop/os2/so8-image-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-app.ico b/sysui/desktop/os2/so8-impress-app.ico Binary files differdeleted file mode 100644 index f77ba1d055d0..000000000000 --- a/sysui/desktop/os2/so8-impress-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-doc.ico b/sysui/desktop/os2/so8-impress-doc.ico Binary files differdeleted file mode 100644 index 9bf3ea37f130..000000000000 --- a/sysui/desktop/os2/so8-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-tem.ico b/sysui/desktop/os2/so8-impress-tem.ico Binary files differdeleted file mode 100644 index fe6a1ffbc61d..000000000000 --- a/sysui/desktop/os2/so8-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-macro-doc.ico b/sysui/desktop/os2/so8-macro-doc.ico Binary files differdeleted file mode 100644 index e828c0cd7afa..000000000000 --- a/sysui/desktop/os2/so8-macro-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-main-app.ico b/sysui/desktop/os2/so8-main-app.ico Binary files differdeleted file mode 100644 index d158dd3bdbda..000000000000 --- a/sysui/desktop/os2/so8-main-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-master-doc.ico b/sysui/desktop/os2/so8-master-doc.ico Binary files differdeleted file mode 100644 index 1b2ba16e5d45..000000000000 --- a/sysui/desktop/os2/so8-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-math-app.ico b/sysui/desktop/os2/so8-math-app.ico Binary files differdeleted file mode 100644 index 0299bedde70e..000000000000 --- a/sysui/desktop/os2/so8-math-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-math-doc.ico b/sysui/desktop/os2/so8-math-doc.ico Binary files differdeleted file mode 100644 index cacbcd977732..000000000000 --- a/sysui/desktop/os2/so8-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-open.ico b/sysui/desktop/os2/so8-open.ico Binary files differdeleted file mode 100644 index 6dcee498e5e6..000000000000 --- a/sysui/desktop/os2/so8-open.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-printer.ico b/sysui/desktop/os2/so8-printer.ico Binary files differdeleted file mode 100644 index 49780f9cc7b9..000000000000 --- a/sysui/desktop/os2/so8-printer.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-web-doc.ico b/sysui/desktop/os2/so8-web-doc.ico Binary files differdeleted file mode 100644 index 15a4d860c58d..000000000000 --- a/sysui/desktop/os2/so8-web-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-app.ico b/sysui/desktop/os2/so8-writer-app.ico Binary files differdeleted file mode 100644 index 9b36afd75534..000000000000 --- a/sysui/desktop/os2/so8-writer-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-doc.ico b/sysui/desktop/os2/so8-writer-doc.ico Binary files differdeleted file mode 100644 index 12bc54839cfc..000000000000 --- a/sysui/desktop/os2/so8-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-tem.ico b/sysui/desktop/os2/so8-writer-tem.ico Binary files differdeleted file mode 100644 index ff1a9fe2e220..000000000000 --- a/sysui/desktop/os2/so8-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 6f41333370dc..12512cef8418 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -65,11 +65,9 @@ PKGVERSION.libreoffice = $(PKGVERSION) UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l) ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g) -PRODUCTNAME.broffice = BrOffice -PRODUCTVERSION.broffice = $(PRODUCTVERSION) -PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT) -PKGVERSION.broffice = $(PKGVERSION) -UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l) -ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g) - - +PRODUCTNAME.oxygenoffice = OxygenOffice +PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.oxygenoffice = $(PKGVERSION) +UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l) +ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice:s/.//g) diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index 865703b0797a..cab8cc559896 100755 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -220,6 +220,7 @@ application/vnd.writerperfect; %unixfilename -view %s application/wordperfect5.1; %unixfilename -view %s application/x-wordperfect; %unixfilename -view %s application/wordperfect; %unixfilename -view %s +application/vnd.lotus-wordpro; %unixfilename -view %s application/wpwin; %unixfilename -view %s application/vnd.openofficeorg.extension; %unixfilename %s application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index ec71b9f90995..279302ab5f08 100755 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -39,7 +39,6 @@ $destdir = pop @ARGV; mkdir $destdir,0777; $productname = "LibreOffice"; -$productname_br = "BrOffice"; $productfilename = "libreoffice"; $prefix = ""; $iconprefix = ""; @@ -51,10 +50,6 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } - if (/^-b/) { - $productname_br = $ARGV[0]; - shift; - } if (/^-u/) { $productfilename = $ARGV[0]; shift; @@ -121,9 +116,6 @@ while (<>) { } } - # replace %PRODUCTNAME_BR placeholders - s/%PRODUCTNAME_BR/$productname_br/g; - # replace %PRODUCTNAME placeholders s/%PRODUCTNAME/$productname/g; diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf index 88fd05c879d2..77ce7dc1c3b4 100755 --- a/sysui/desktop/share/documents.ulf +++ b/sysui/desktop/share/documents.ulf @@ -67,6 +67,18 @@ en-US = "HTML Document Template" [extension] en-US = "%PRODUCTNAME Extension" +[ms-excel-sheet] +en-US = "Microsoft Excel Worksheet" + +[ms-powerpoint-presentation] +en-US = "Microsoft PowerPoint Presentation" + +[ms-word-document] +en-US = "Microsoft Word Document" + +[ms-word-document2] +en-US = "Microsoft Word Document" + [ms-excel-sheet-12] en-US = "Microsoft Excel Worksheet" diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf index e36949263fce..7bd31794e861 100755 --- a/sysui/desktop/share/launcher_comment.ulf +++ b/sysui/desktop/share/launcher_comment.ulf @@ -1,21 +1,190 @@ [writer] en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer." +ast = "Escribi y edita testos y gráficos en cartes, informes, documentos y páxines web." +ca = "Creeu i editeu text i grà fics a cartes, informes, documents i pà gines web." +da = "Opret og redigér tekst og grafik i breve, rapporter, dokumenter og hjemmesider." +de = "Texte und Grafiken in Briefen, Berichten, Dokumenten und Webseiten erstellen und bearbeiten." +es = "Cree y edite textos y gráficos en cartas, informes, documentos y páginas web." +fi = "Luo ja muokkaa tekstejä ja grafiikkaa kirjeisiin, raportteihin, asiakirjoihin ja WWW-sivuille." +fr = "Créer et modifier des textes et graphiques pour lettres, rapports, documents ou pages Web." +gl = "Cree e modifique textos e gráficos en cartas, informes, documentos e páxinas web." +he = "יצירה ועריכה של טקסט וגרפיקה במכתבי×, דוחות, ×ž×¡×ž×›×™× ×•×תרי ××™× ×˜×¨× ×˜." +hr = "Stvorite i uredite tekstualna i grafiÄka pisma, izvjeÅ¡taje, dokumente i web stranice." +hu = "Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése" +it = "Crea e modifica testo e grafica in lettere, rapporti, documenti e pagine Web." +is = "Búa til og sýsla með texta og myndefni à bréfum, skýrslum, ýmsum textaskjölum og vefsÃðum." +ja = "手紙やレãƒãƒ¼ãƒˆã€æ–‡æ›¸ã€Webページå‘ã‘ã®æ–‡ç« ã‚„ç”»åƒã‚’作æˆãƒ»ç·¨é›†ã—ã¾ã™ã€‚" +ku = "Nivîs û grafîkên di name, rapor, belge û rûpelên torê de çêbike û sererast bike." +nl = "Tekst en afbeeldingen bewerken in brieven, rapporten, documenten en webpagina's. " +pt_BR = "Crie e edite seus textos e gráficos em cartas, relatórios, documentos ou páginas da web." +ro = "CreaÈ›i È™i editaÈ›i documente text È™i grafice sub formă de scrisori, rapoarte, articole sau pagini web." +ru = "Создание и редактирование текÑтов и изображений в пиÑьмах, отчётах, документах и на веб-Ñтраницах." +sl = "Ustvarjajte in urejajte besedilo in grafiko v pismih, poroÄilih, dokumentih in spletnih straneh." +te = "పతà±à°°à°¾à°²à±, నివేదికలౠమరియౠవెబౠపేజీలలో పాఠà±à°¯à°‚ మరియౠగà±à°°à°¾à°«à°¿à°•à±à°¸à± సృషà±à°Ÿà°¿ మరియౠసవరణ" +vi = "Tạo và soạn văn bản và hình trong thÆ°, báo cáo, tà i liệu và trang web." +zh_CN = "创建编辑文档ã€æŠ¥å‘Šã€ä¿¡ä»¶å’Œç½‘页ä¸çš„文本和图形。" +zh_TW = "建立與編輯書信ã€å ±å‘Šã€æ–‡ä»¶èˆ‡ç¶²é ä¸çš„æ–‡å—和圖形。" [impress] en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress." +ast = "Fai y edita presentaciones pa pases de diapositives, reuniones y páxines web." +ca = "Creeu i editeu presentacions per a diapositives, conferències i pà gines web." +da = "Opret og rediger præsentationer til diasshows, møder og hjemmesider." +de = "Präsentationen für Vorführungen, Besprechungen und Web-Auftritte erstellen und bearbeiten." +el = "ΔημιουÏγία και επεξεÏγασία παÏουσιάσεων για Ï€ÏοβολÎÏ‚ διαφανειών, συσκÎψεις και ιστοσελίδες" +es = "Cree y edite presentaciones para pases de diapositivas, reuniones y páginas web." +fi = "Luo ja muokkaa esityksiä esitelmiin, tapaamisiin ja WWW-sivuille." +fr = "Créer et modifier des présentations pour des diaporamas, des conférences et pour le Web." +gl = "Cree e modifique presentacións para diaporamas, conferencias e páxinas web." +he = "יצירה ועריכה של מצגות עבור שקופיות, פגישות ו×תרי ××™× ×˜×¨× ×˜." +hr = "Stvorite i uredite prezentacije za sastanke i web stranice." +hu = "Bemutatók készÃtése és szerkesztése diavetÃtésekhez vagy a webre" +it = "Crea e modifica presentazioni per proiezioni, meeting e pagine Web." +is = "Búa til og breyta kynningum fyrir ráðstefnur, fyrirlestra og fyrir birtingu á vef." +ja = "スライドショーや会è°ã€Webページå‘ã‘ã®ãƒ—レゼンテーションを作æˆãƒ»ç·¨é›†ã—ã¾ã™ã€‚" +nl = "Presentaties maken voor diavoorstellingen, vergaderingen en webpagina's." +pt_BR = "Crie e edite apresentações para reuniões ou páginas da web." +ro = "CreaÈ›i È™i editaÈ›i prezentări, diapozitive sau pagini web." +ru = "Создание и редактирование презентаций Ð´Ð»Ñ Ñлайд-шоу, докладов и веб-Ñтраниц." +sl = "Ustvarjajte in urejajte predstavitve za sreÄanja, predstavitve in spletne strani." +vi = "Tạo trình diá»…n để chiếu tá»± Ä‘á»™ng, cho cuá»™c há»p hoặc trang web" +zh_CN = "创建编辑用于幻ç¯ç‰‡æ”¾æ˜ ã€ä¼šè®®å’Œç½‘页的演示文稿。" +zh_TW = "å»ºç«‹èˆ‡ç·¨è¼¯æŠ•å½±ç‰‡æ”¾æ˜ ã€æœƒè°ã€ç¶²é ä¸çš„ç°¡å ±ã€‚" [draw] en-US = "Create and edit drawings, flow charts, and logos by using Draw." +ast = "Crea y edita dibuxos, diagrames de fluxu y logos." +ca = "Creeu i editeu dibuixos, diagrames de flux i logotips." +da = "Opret og rediger tegninger, diagrammer og logoer." +de = "Zeichnungen, Flussdiagramme und Logos erstellen und bearbeiten" +el = "ΔημιουÏγία και επεξεÏγασία σχεδιασμάτων, διαγÏαμμάτων Ïοής και λογοτÏπων." +es = "Cree y edite dibujos, diagramas de flujo y logotipos." +fi = "Luo ja muokkaa piirroksia, vuokaavioita ja logoja." +fr = "Créer et modifier des dessins, diagrammes et logos." +gl = "Cree e modifique debuxos, diagramas de fluxo e logotipos." +he = ".יצירה ועריכה של ציורי×, תרשימי זרימה וסמלילי×" +hr = "Stvorite i uredite crteže, dijagrame toka i logotipove." +hu = "Rajzok, folyamatábrák és logók létrehozása és szerkesztése" +it = "Crea e modifica disegni, diagrammi di flusso e loghi." +is = "Búa til og breyta teikningum, skýringamyndum og flæðiritum." +ja = "ベクタ画åƒã‚„フãƒãƒ¼ãƒãƒ£ãƒ¼ãƒˆã€ãƒã‚´ã‚’編集ã—ã¾ã™ã€‚" +nl = "Tekeningen, diagrammen en logo's maken." +pt_BR = "Crie e edite desenho, fluxograma ou logos" +ro = "CreaÈ›i È™i editaÈ›i desene, grafice È™i logouri. " +ru = "Создание и редактирование риÑунков, диаграмм и логотипов." +sl = "Ustvarjajte in urejajte slike, diagrame poteka in logotipe." +te = "à°šà°¿à°¤à±à°°à°¾à°²à±,à°šà°¿à°¹à±à°¨à°¾à°²à±(లోగో) మరియౠఫà±à°²à±‹ చారà±à°Ÿà±à°²à± సృషà±à°Ÿà°¿ మరియౠసవరణ" +vi = "Tạo và sá»a hình vẽ, sÆ¡ đồ và biểu tượng" +zh_CN = "创建编辑图形ã€å›¾è¡¨å’Œæ ‡å¿—。" +zn_TW = "建立與編輯繪圖ã€æµç¨‹åœ–與標誌。" [calc] en-US = "Perform calculation, analyze information and manage lists in spreadsheets by using Calc." +ast = "Fai cálculos, analiza información y xestiona llistes en fueyes de cálculu." +ca = "Executeu cà lculs, analitzeu informació i gestioneu llistats en fulls de cà lcul." +da = "Udfør beregninger, analysér information og hÃ¥ndter lister i regneark." +de = "Berechnungen ausführen, Informationen analysieren und Listen in Tabellen verwalten." +el = "ΕκτÎλεση υπολογισμών, ανάλυση πληÏοφοÏιών και διαχείÏιση καταλόγων στα λογιστικά φÏλλα" +es = "Realice cálculos, analice información y gestione listas en hojas de cálculo." +fi = "Tee laskelmia, käsittele tietoa ja hallitse luetteloita laskentataulukoissa." +fr = "Réaliser des calculs, analyser les informations et gérer des listes avec des feuilles de calcul." +gl = "Realice cálculos, analice información e administre listas en follas de cálculo." +he = "ביצוע חישובי×, × ×™×ª×•×— מידע ×•× ×™×”×•×œ רשימות ×‘×’×™×œ×™×•× ×•×ª ××œ×§×˜×¨×•× ×™×." +hr = "Upravljajte izraÄunima i analizirajte informacije u proraÄunskim tablicama." +hu = "SzámÃtások végrehajtása, adatok elemzése és listák kezelése munkafüzetekben" +it = "Esegue calcoli, analizza informazioni e gestisce elenchi in fogli di calcolo." +is = "Framkvæma útreikninga, greina gögn og meðhöndla lista à töfluformi." +ja = "シート上ã«ã‚る数値ã®é›†è¨ˆã‚„分æžã€ã‚·ãƒ¼ãƒˆã®ç®¡ç†ã‚’è¡Œã„ã¾ã™ã€‚" +nl = "Berekeningen maken, informatie analyseren en lijsten beheren in rekenbladen." +pt_BR = "Realize cálculos, analise informação e gerencie listas em planilhas" +ro = "EfectuaÈ›i calcule, analizaÈ›i informaÈ›ii È™i administraÈ›i liste în foi de calcul." +ru = "РаÑчёты, анализ информации и управление ÑпиÑками Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлектронных таблиц." +sl = "Izvajajte izraÄune, analizirajte informacije in upravljajte sezname in preglednice." +te = "à°¸à±à°ªà±à°°à±†à°¡à± షీటౠలో లెకà±à°•à°¿à°‚à°šà±, వివరాలనౠవిశà±à°²à±‡à°·à°¿à°‚చౠమరియౠజాబితా నిరà±à°µà°¹à°¿à°‚à°šà± " +vi = "TÃnh toán, xá» lý thông tin và quản lý danh sách trong tá» bảng tÃnh" +zh_CN = "在电åè¡¨æ ¼ä¸è®¡ç®—ã€åˆ†æžã€ç®¡ç†ä¿¡æ¯ã€‚" +zh_TW = "在試算表ä¸é€²è¡Œè¨ˆç®—ã€åˆ†æžè³‡è¨Šï¼Œä»¥åŠç®¡ç†æ¸…單。" [math] en-US = "Create and edit scientific formulas and equations by using Math." +ast = "Fai y edita fórmules cientÃfiques y ecuaciones." +ca = "Creeu i editeu fórmules cientÃfiques i equacions." +da = "Opret og redigér videnskabelige formler og ligninger." +de = "Wissenschaftliche Formeln und Gleichungen erstellen und bearbeiten." +el = "ΔημιουÏγία και επεξεÏγασία επιστημονικών Ï„Ïπων και εξισώσεων." +es = "Cree y edite fórmulas cientÃficas y ecuaciones." +fi = "Luo ja muokkaa tieteellisiä kaavoja ja yhtälöitä." +fr = "Créer et modifier des formules scientifiques et des équations." +gl = "Cree e modifique fórmulas cientÃficas e ecuacións." +he = "יצירה ועריכה של × ×•×¡×—×•×ª מדעיות ומשוו×ות." +hr = "Stvorite i uredite znanstvene formule i jednadžbe." +hu = "Képletek és egyenletek létrehozása és szerkesztése" +it = "Crea e modifica formule scientifiche ed equazioni." +is = "Búa til og breyta vÃsindaformúlum og jöfnum." +ja = "æ•°å¼ã‚„方程å¼ã‚’作æˆãƒ»ç·¨é›†ã—ã¾ã™ã€‚" +nl = "Wetenschappelijke formules en vergelijkingen maken." +pt_BR = "Crie e edite fórmulas e equações cientÃficas." +ro = "CreaÈ›i È™i editaÈ›i formule È™tiinÈ›ifice È™i ecuaÈ›ii." +ru = "Создание и редактирование научных формул и уравнений." +sl = "Ustvarjajte in urejajte znanstvene formule in enaÄbe." +te = "శాసà±à°¤à±à°° సూతà±à°°à°¾à°²à± మరియౠసమీకరణాల సృషà±à°Ÿà°¿ మరియౠసవరణ" +vi = "Tạo và soạn công thức và phÆ°Æ¡ng trình khoa há»c" +zh_CN = "创建编辑数å¦å…¬å¼å’Œæ–¹ç¨‹" +zh_TW = "建立與編輯科å¸å…¬å¼èˆ‡æ–¹ç¨‹å¼" + [base] en-US = "Manage databases, create queries and reports to track and manage your information by using Base." +ast = "Xestiona bases de datos, fai consultes ya informes, sigui y xestiona la to información." +ca = "Gestioneu bases de dades, creeu consultes i informes per fer un seguiment i gestionar la vostra informació." +da = "HÃ¥ndtér databaser, og opret forespørgsler og rapporter til at overvÃ¥ge og administrere dine informationer." +de = "Datenbanken verwalten, Abfragen und Berichte erstellen, um Ihre Daten zu überblicken und zu verwalten." +el = "ΔιαχείÏιση βάσεων δεδομÎνων, δημιουÏγία εÏωτημάτων και αναφοÏών για την παÏακολοÏθηση και διαχείÏιση των πληÏοφοÏιών σας." +es = "Gestione bases de datos, cree consultas e informes, siga y gestione su información." +fi = "Hallitse tietokantoja, tee hakuja ja raportteja seurataksesi ja hallitaksesi tietoja." +fr = "Gérer des bases de données, créer des requêtes et des rapports pour le suivi et l'analyse de vos données." +gl = "Administre bases de datos, cree consultas e informes, siga e xestione a súa información." +he = "× ×™×”×•×œ מסדי × ×ª×•× ×™×, יצירת חקירות ודוחות על ×ž× ×ª ×œ× ×”×œ ×ת המידע ×©×œ×›× ×•×œ×¢×§×•×‘ ×חריו." +hr = "Upravljajte bazama podataka, definirajte upite i izvjeÅ¡taje za praćenje i upravljanje vaÅ¡im informacijama." +hu = "Adatbázisok kezelése, lekérdezések és jelentések készÃtése az információinak kezeléséhez" +it = "Gestisce database, crea query e rapporti per tracciare e gestire le proprie informazioni." +is = "Sýsla með gagnagrunna, búa til útfyllingarform og skýrslur, safna saman og vinna úr ýmiskonar gögnum." +ja = "データベースã®ç®¡ç†ã‚„クエリã®ä½œæˆã€æƒ…å ±ã®è¿½è·¡ã‚„管ç†ã—ãŸçµæžœã‚’å ±å‘Šã—ã¾ã™ã€‚" +nl = "Databases beheren, query's en rapporten maken om uw informatie te beheren en op te zoeken." +nn = "Handsam databaser og lag spørringar og rapportar for Ã¥ gjera informasjonen oversiktleg" +pt_BR = "Administre base de dados, crie consultas e relatórios para rastrear e gerenciar informação." +ro = "AdministraÈ›i baze de date, creaÈ›i interogări È™i rapoarte pentru a urmări È™i administra informaÈ›iile proprii." +ru = "Управление базами данных, Ñоздание запроÑов и отчётов Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ информации." +sl = "Upravljajte podatkovne zbirke, ustvarjajte poizvedbe in poroÄila za sledenje in upravljanje svojih podatkov." +te = "మీ జాబితా మరియౠవివరాలకోసం డాటాబేసౠనిరà±à°µà°¹à°£ మరియౠపà±à°°à°¶à±à°¨à°²à±, నివేదికల సృషà±à°Ÿà°¿ " +vi = "Quản lý cÆ¡ sở dữ liệu, tạo lệnh tìm kiếm và báo cáo để theo dõi và quản lý thông tin của bạn." +zh_CN = "管ç†æ•°æ®åº“，创建查询和报告，跟踪和管ç†æ‚¨çš„ä¿¡æ¯ã€‚" +zh_TW = "管ç†è³‡æ–™åº«ã€å»ºç«‹æŸ¥è©¢èˆ‡å ±å‘Šï¼Œä»¥è¿½è¹¤åŠç®¡ç†æ‚¨çš„資訊。" + [startcenter] en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation." +ast = "Suite de productividá d'oficina compatible con ODF, el formatu de documentos abiertu y estandarizáu. Col sofitu de la Document Foundation." +ca = "Paquet ofimà tic compatible amb el format està ndard de documents ODF. Mantingut per la Document Foundation." +da = "Office produktionspakken er kompatibel med det Ã¥bne og standardiseret ODF-dokumentformat. Understøttet af The Document Foundation." +de = "Die zum offenen und standardisierten ODF-Format kompatible Sammlung von Büroanwendungen. Unterstützt durch »The Document Foundation«." +es = "Suite de productividad para la oficina compatible con ODF, el formato de documentos abierto y estandarizado. Con el soporte de la Document Foundation." +fi = "Avointa ja standardoitua ODF-asiakirjamuotoa tukeva toimisto-ohjelmisto. The Document Foundation -säätiön tukema." +fr = "Suite bureautique compatible avec le format de document standard et ouvert ODF. Soutenue par The Document Foundation." +gl = "A suite de produtividade de oficina compatÃbel co formato aberto e estandarizado de documentos ODF. Co apoio da Document Foundation" +he = "חבילת הפרודקטיביות המשרדית תו×מת ×ת פורמט ×”×ž×¡×ž×›×™× ×”×¤×ª×•×— ×•×”×ª×§× ×™ ODF. × ×ª×ž×›×ª על ידי The Document Foundation." +hr = "Paket uredskih aplikacija s podrÅ¡kom za otvoren i standardiziran ODF format dokumenata. Podržan od strane Document fundacije." +hu = "A nyÃlt és szabványos ODF formátummal kompatibilis irodai programcsomag a Document Foundation támogatásával" +it = "La suite di produttività compatibile con il formato standard e aperto dei documenti ODF. Supportata dalla The Document Foundation." +is = "Forritavöndull til hjálpar við vinnu við gagna- og textavinnslu, styðst við ODF sjalasniðið sem er staðlað og frjálst snið fyrir ýmiskonar skjöl. Stutt af Document Foundation." +ja = "オープンã§æ¨™æº–化ã•ã‚ŒãŸODFドã‚ュメントフォーマットã«å¯¾å¿œã—ãŸç”Ÿç”£æ€§ã®é«˜ã„オフィススイートã§ã™ã€‚The Document Foundationã«ã‚ˆã£ã¦ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚" +nl = "Het kantoorpakket compatibel met ODF (het gestandaardiseerde Open Document Formaat). Ondersteund door The Document Foundation. " +pt_BR = "SuÃte de escritório produtiva, compatÃvel com o formato aberto ODF. Suportado pela The Document Foundation." +ro = "Suita de birou compatibilă cu formatul de document liber È™i standardizat ODF, cu asistență oferită de The Document Foundation." +ru = "ОфиÑный пакет, ÑовмеÑтимый Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ и Ñтандартизованным форматом документов ODF. ПоддерживаетÑÑ The Document Foundation." +sl = "PisarniÅ¡ka zbirka, združljiva z odprtim in standardiziranim zapisom ODF. Podpira jo The Document Foundation." +te = "రహసà±à°¯à°¾à°²à± లేని మరియౠపà±à°°à°¾à°®à°¾à°£à°¿à°•à°®à±ˆà°¨ ODF à°•à± à°…à°¨à±à°•à±‚లమైన కారà±à°¯à°¾à°²à°¯ ఉతà±à°ªà°¾à°¦à°•à°¤ à°…à°¨à±à°µà°°à±à°¤à°¨à°¾à°² సమà±à°¦à°¾à°¯à°‚, డాకà±à°¯à±à°®à±†à°‚టౠఫౌండేషనౠతోడà±à°ªà°¾à°Ÿà±à°¤à±‹" +vi = "Bá»™ văn phòng thÃch hợp vá»›i chuẩn Ä‘inh dạng tà i liệu mở ODF, nháºn được sá»± há»— trợ từ Quỹ The Document Foundation" +zh_CN = "å…¼å®¹å¼€æ”¾æ ‡å‡† ODF 的办公软件套装。由 The Document Foundation 支æŒã€‚" +zh_TW = "與開放且標準化的 ODF æ–‡ä»¶æ ¼å¼ç›¸å®¹çš„辦公生產力套è£è»Ÿé«”。由文件基金會æ供支æ´ã€‚" diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf index ff8041a155fc..902826c7befd 100755 --- a/sysui/desktop/share/launcher_genericname.ulf +++ b/sysui/desktop/share/launcher_genericname.ulf @@ -1,23 +1,190 @@ [writer] en-US = "Word Processor" +ast = "Procesador de testos" +ca = "Processador de texts" +da = "Tekstbehandling" +de = "Textverarbeitung" +es = "Procesador de textos" +fi = "Tekstinkäsittely" +fr = "Traitement de texte" +gl = "Procesador de texto" +he = "מעבד תמלילי×" +hr = "ObraÄ‘ivaÄ teksta" +hu = "SzövegszerkesztÅ‘" +it = "Word processor" +is = "Ritvinnsla" +ja = "ワープãƒ" +ku = "Bernameya nivîsê" +nl = "Tekstverwerker" +pt_BR = "Processador de texto" +ro = "Procesor de documente" +ru = "Редактор документов" +sl = "Urejevalnik besedila" +te = "పాఠà±à°¯ సవరణ" +vi = "Soạn thảo văn bản" +zh_CN = "文档编辑器" +zh_TW = "文書處ç†å™¨" [impress] en-US = "Presentation" +ast = "Presentación" +ca = "Presentació" +da = "Præsentation" +de = "Präsentationen" +el = "ΠαÏουσίαση" +es = "Presentación" +fi = "Esitys" +fr = "Présentation" +gl = "Presentación" +he = "מצגות" +hr = "Prezentacija" +hu = "BemutatókészÃtÅ‘" +it = "Presentazione" +is = "Skyggnusýning" +ja = "プレゼンテーション" +nl = "Presentatie" +pt_BR = "Apresentação" +ro = "Prezentări" +ru = "ПрезентациÑ" +sl = "Predstavitev" +vi = "Trình diá»…n" +zh_CN = "演示文稿" +zh_TW = "ç°¡å ±" [calc] en-US = "Spreadsheet" +ast = "Fueya de cálculu" +ca = "Full de cà lcul" +da = "Regneark" +de = "Tabellenkalkulation" +el = "Λογιστικό φÏλλο" +es = "Hoja de cálculo" +fi = "Taulukko" +fr = "Feuille de calcul" +gl = "Folla de cálculo" +he = "גיליון ××œ×§×˜×¨×•× ×™" +hr = "ProraÄunske tablice" +hu = "TáblázatkezelÅ‘" +it = "Foglio di calcolo" +is = "Töflureikniblað" +ja = "表計算" +nl = "Rekenblad" +pt_BR = "Planilha" +ro = "Foi de calcul" +ru = "Ðлектронные таблицы" +sl = "Preglednica" +te = "à°¸à±à°ªà±à°°à±†à°¡à± షీటà±" +vi = "Tá» bảng tÃnh" +zh_CN = "电åè¡¨æ ¼" +zh_TW = "試算表" [base] en-US = "Database Development" +ast = "Desendolcu de bases de datos" +ca = "Desenvolupament de bases de dades" +da = "Databaseudvikling" +de = "Datenbankentwicklung" +el = "Ανάπτυξη βάσεων δεδομÎνων" +es = "Desarrollo de bases de datos" +fi = "Tietokanta" +fr = "Développement de bases de données" +gl = "Desenvolvemento de bases de datos" +he = "פיתוח מסדי × ×ª×•× ×™×" +hr = "Razvoj baza podataka" +hu = "Adatbázis-fejlesztés" +it = "Sviluppo database" +is = "Hönnun gagnagrunna" +ja = "データベース開発" +nl = "Database-ontwikkeling" +nn = "Databasehandsaming" +pt_BR = "Desenvolvimento de base de dados" +ro = "Dezvoltare baze de date" +ru = "Разработка баз данных" +sl = "Razvoj podatkovnih zbirk" +te = "డాటాబేసౠఅà°à°¿à°µà±ƒà°¦à±à°§à°¿" +vi = "Phát triển CÆ¡ sở dữ liệu" +zn_CN = "æ•°æ®åº“å¼€å‘" +zh_TW = "資料庫開發" [math] en-US = "Formula Editor" +ast = "Editor de fórmules" +ca = "Editor de fórmules" +da = "Formelredigering" +de = "Formel-Editor" +el = "ΤÏπος" +es = "Editor de fórmulas" +fi = "Kaavaeditori" +fr = "Éditeur de formules" +gl = "Editor de fórmulas" +he = "עורך × ×•×¡×—×•×ª" +hr = "UreÄ‘ivaÄ jednadžbi" +hu = "KépletszerkesztÅ‘" +it = "Editor di formule" +is = "Formúluritill" +ja = "æ•°å¼ã‚¨ãƒ‡ã‚£ã‚¿" +nl = "Formule-editor" +pt_BR = "Editor de fórmula" +ro = "Editor de formule" +ru = "Редактор формул" +sl = "Urejevalnik formule" +te = "సూతà±à°° సవరణి" +vi = "Trình soạn công thức" +zh_CN = "å…¬å¼ç¼–辑器" +zh_TW = "å…¬å¼ç·¨è¼¯å™¨" [draw] en-US = "Drawing Program" +ast = "Programa de dibuxu" +ca = "Programa de dibuix" +da = "Tegneprogram" +de = "Zeichenprogramm" +el = "Î ÏόγÏαμμα Σχεδίασης" +es = "Programa de dibujo" +fi = "Piirros" +fr = "Logiciel de dessin" +gl = "Programa de debuxo" +he = "×ª×•×›× ×ª ציור" +hr = "Crtanje" +hu = "Rajzoló" +it = "Programma di disegno" +is = "Teikniforrit" +ja = "図形æç”»" +nl = "Tekenprogramma" +pt_BR = "Programa para desenho" +ro = "Program de desensare " +ru = "Программа Ð´Ð»Ñ Ñ€Ð¸ÑованиÑ" +sl = "Program za risanje" +te = "à°šà°¿à°¤à±à°°à°²à±‡à°–à°¨ à°ªà±à°°à±‹à°—à±à°°à°¾à°®à±" +vi = "ChÆ°Æ¡ng trình Vẽ" +zh_CN = "绘图工具" +zh_TW = "繪圖程å¼" [startcenter] en-US = "Office" +ast = "Oficina" +ca = "Oficina" +da = "Kontor" +de = "Büroanwendungen" +es = "Oficina" +fi = "Toimisto" +fr = "Bureautique" +gl = "Oficina" +he = "×ופיס" +hr = "Ured" +hu = "Iroda" +it = "Office" +is = "Skrifstofa" +ja = "オフィス" +nl = "Kantoor" +pt_BR = "Escritório" +ro = "Suită de birou" +ru = "ОфиÑ" +sl = "Pisarna" +te = "కారà±à°¯à°¾à°²à°¯à°‚" +vi = "Bá»™ văn phòng" +zh_CN = "办公" +zh_TW = "辦公" [javafilter] en-US = "Small Device Format Importer" diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 45a1b11c85f3..72ba78b99721 100755 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f) @echo Creating desktop entries for $(@:f) .. @echo --------------------------------- - @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f) - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf + @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f) + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf .IF "$(WITH_LIBSN)"=="YES" @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x .ENDIF diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl index cdc636b7a266..197c333e6f37 100755 --- a/sysui/desktop/share/translate.pl +++ b/sysui/desktop/share/translate.pl @@ -37,7 +37,6 @@ eval 'exec perl -wS $0 ${1+"$@"}' my ($prefix, $ext, $key); $productname = "LibreOffice"; -$productname_br = "BrOffice"; $workdir = "."; while ($_ = $ARGV[0], /^-/) { @@ -47,10 +46,6 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } - if (/^-b/) { - $productname_br = $ARGV[0]; - shift; - } if (/^-d/) { $workdir = $ARGV[0]; shift; @@ -127,7 +122,6 @@ KEY: while (<TEMPLATE>) { $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1); # replace resource placeholder - $value=~s/%PRODUCTNAME_BR/$productname_br/g; $value=~s/%PRODUCTNAME/$productname/g; $locale=~s/-/_/; diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index 19407fd81805..f9fc6237b33e 100755 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap @@ -72,6 +72,7 @@ application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s +application/vnd.lotus-wordpro; %PREFIX -view %s application/wpwin; %PREFIX -view %s application/vnd.openofficeorg.extension; %PREFIX %s END diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 74eb0a5fcc9c..6f4ef8ade3ee 100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -231,6 +231,7 @@ application/vnd.wordperfect; %unixfilename -view %s application/wordperfect5.1; %unixfilename -view %s application/x-wordperfect; %unixfilename -view %s application/wordperfect; %unixfilename -view %s +application/vnd.lotus-wordpro; %unixfilename -view %s application/wpwin; %unixfilename -view %s application/vnd.openofficeorg.extension; %unixfilename %s application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx index 845a324400e3..8f62008ba76e 100644 --- a/sysui/source/win32/misc/WinImplHelper.cxx +++ b/sysui/source/win32/misc/WinImplHelper.cxx @@ -35,7 +35,7 @@ #include "WinImplHelper.hxx" #include <com/sun/star/uno/Sequence.hxx> -#include <systools/win32/user9x.h> +#include <windows.h> //------------------------------------------------------------ // namespace directives diff --git a/ucb/qa/unoapi/knownissues.xcl b/ucb/qa/unoapi/knownissues.xcl index efbafe7ebdf9..7929c1612c18 100755 --- a/ucb/qa/unoapi/knownissues.xcl +++ b/ucb/qa/unoapi/knownissues.xcl @@ -1,5 +1,2 @@ ### i86626 ### ucb.UniversalContentBroker::com::sun::star::ucb::XCommandProcessor - -### fd#35727 ### -ucb.UniversalContentBroker::com::sun::star::ucb::XContentProviderManager diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index da1f310f577f..3a3fad5a9778 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -43,14 +43,14 @@ using namespace com::sun::star::registry; using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk index 6360f82320d2..f13a2cfaff79 100755 --- a/ucb/source/core/makefile.mk +++ b/ucb/source/core/makefile.mk @@ -62,11 +62,7 @@ SHL1LIBS=\ $(SLB)$/regexp.lib SHL1IMPLIB=i$(TARGET) -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ELSE SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.ENDIF DEF1NAME=$(SHL1TARGET) diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 6fac85a716df..a477fb9e8902 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -42,14 +42,14 @@ using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index d30cfebf1334..af0089ce70a0 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -38,14 +38,14 @@ using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 593eead0fbfd..0e8fb96b9ca9 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -268,13 +268,13 @@ static const ::cppu::ImplementationEntry s_entries [] = extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 07f5f04ad17a..3f22423063fd 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -75,13 +75,13 @@ namespace ucb { namespace ucp { namespace ext extern "C" { //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //------------------------------------------------------------------------------------------------------------------ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); } diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 1f073e81d157..dda322c10fa9 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -94,7 +94,7 @@ namespace { if (osl::DirectoryItem::get(rPhysicalUrl, aItem) == osl::FileBase::E_None) { - osl::FileStatus aStatus( FileStatusMask_Type ); + osl::FileStatus aStatus( osl_FileStatus_Mask_Type ); if (aItem.getFileStatus(aStatus) == osl::FileBase::E_None) switch (aStatus.getFileType()) { @@ -112,7 +112,7 @@ namespace { RTL_CONSTASCII_USTRINGPARAM("volume")); bResourceType = true; osl::VolumeInfo aVolumeInfo( - VolumeInfoMask_Attributes ); + osl_VolumeInfo_Mask_Attributes ); if( osl::Directory::getVolumeInfo( rPhysicalUrl,aVolumeInfo ) == osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 1299b33284ae..00bb6bc5a02b 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -230,7 +230,7 @@ XInputStream_impl::seek( { if( location < 0 ) throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index 0986e3a738ab..712372268727 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -85,7 +85,7 @@ sal_Bool ReconnectingFile::reconnect() { ::osl::FileBase::RC nRes = ::osl::FileBase::E_NETWORK; - if ( uHow == Pos_Absolut && uPos > 0 ) + if ( uHow == osl_Pos_Absolut && uPos > 0 ) { if ( m_bDisconnect ) { diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 6ecf53620377..93cff9c667fd 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -189,7 +189,7 @@ void SAL_CALL XStream_impl::truncate(void) if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); - if (osl::FileBase::E_None != m_aFile.setPos(Pos_Absolut,sal_uInt64(0))) + if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0))) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } @@ -351,7 +351,7 @@ XStream_impl::seek( { if( location < 0 ) throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index 3d97cb23873c..222daf0cdda8 100755 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -69,10 +69,6 @@ SHL1STDLIBS=\ SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ENDIF - DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index bb14f176532d..d3392ac5ab18 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -51,14 +51,14 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::container; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; @@ -321,8 +321,8 @@ FileProvider::compareContentIds( if ( error != osl::FileBase::E_None ) return iComp; - osl::FileStatus aStatus1( FileStatusMask_FileURL ); - osl::FileStatus aStatus2( FileStatusMask_FileURL ); + osl::FileStatus aStatus1( osl_FileStatus_Mask_FileURL ); + osl::FileStatus aStatus2( osl_FileStatus_Mask_FileURL ); error = aItem1.getFileStatus( aStatus1 ); if ( error == osl::FileBase::E_None ) error = aItem2.getFileStatus( aStatus2 ); @@ -514,7 +514,7 @@ void SAL_CALL FileProvider::initProperties( void ) #if defined ( UNX ) m_FileSystemNotation = FileSystemNotation::UNIX_NOTATION; -#elif defined( WNT ) || defined( OS2 ) +#elif defined( WNT ) m_FileSystemNotation = FileSystemNotation::DOS_NOTATION; #else m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index c4131cab233b..0c7c0f30953f 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -300,7 +300,7 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) )); #else | beans::PropertyAttribute::READONLY)); // under unix/linux only readable @@ -941,33 +941,33 @@ shell::setv( const rtl::OUString& aUnqPath, sal_uInt64 nAttributes(0); if(err == osl::FileBase::E_None) { - osl::FileStatus aFileStatus(FileStatusMask_Attributes); + osl::FileStatus aFileStatus(osl_FileStatus_Mask_Attributes); err = aDirItem.getFileStatus(aFileStatus); if(err == osl::FileBase::E_None && - aFileStatus.isValid(FileStatusMask_Attributes)) + aFileStatus.isValid(osl_FileStatus_Mask_Attributes)) nAttributes = aFileStatus.getAttributes(); } // now we have the attributes provided all went well. if(err == osl::FileBase::E_None) { if(values[i].Name == IsReadOnly) { - nAttributes &= ~(Attribute_OwnWrite | - Attribute_GrpWrite | - Attribute_OthWrite | - Attribute_ReadOnly); + nAttributes &= ~(osl_File_Attribute_OwnWrite | + osl_File_Attribute_GrpWrite | + osl_File_Attribute_OthWrite | + osl_File_Attribute_ReadOnly); if(value) - nAttributes |= Attribute_ReadOnly; + nAttributes |= osl_File_Attribute_ReadOnly; else nAttributes |= ( - Attribute_OwnWrite | - Attribute_GrpWrite | - Attribute_OthWrite); + osl_File_Attribute_OwnWrite | + osl_File_Attribute_GrpWrite | + osl_File_Attribute_OthWrite); } else if(values[i].Name == IsHidden) { - nAttributes &= ~(Attribute_Hidden); + nAttributes &= ~(osl_File_Attribute_Hidden); if(value) - nAttributes |= Attribute_Hidden; + nAttributes |= osl_File_Attribute_Hidden; } err = osl::File::setAttributes( aUnqPath,nAttributes); @@ -1138,7 +1138,6 @@ shell::move( sal_Int32 CommandId, // srcUnqPath and dstUnqPathIn are equal if( srcUnqPath == dstUnqPathIn ) return; - // <-- // osl::FileBase::RC nError; rtl::OUString dstUnqPath( dstUnqPathIn ); @@ -1162,13 +1161,13 @@ shell::move( sal_Int32 CommandId, // stat to determine whether we have a symlink rtl::OUString targetPath(dstUnqPath); - osl::FileStatus aStatus(FileStatusMask_Type|FileStatusMask_LinkTargetURL); + osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); osl::DirectoryItem aItem; osl::DirectoryItem::get(dstUnqPath,aItem); aItem.getFileStatus(aStatus); - if( aStatus.isValid(FileStatusMask_Type) && - aStatus.isValid(FileStatusMask_LinkTargetURL) && + if( aStatus.isValid(osl_FileStatus_Mask_Type) && + aStatus.isValid(osl_FileStatus_Mask_LinkTargetURL) && aStatus.getFileType() == osl::FileStatus::Link ) targetPath = aStatus.getLinkTargetURL(); @@ -1279,9 +1278,9 @@ shell::move( sal_Int32 CommandId, nError ); return; } - osl::FileStatus aStatus( FileStatusMask_Type ); + osl::FileStatus aStatus( osl_FileStatus_Mask_Type ); nError = aItem.getFileStatus( aStatus ); - if( nError != osl::FileBase::E_None || ! aStatus.isValid( FileStatusMask_Type ) ) + if( nError != osl::FileBase::E_None || ! aStatus.isValid( osl_FileStatus_Mask_Type ) ) { installError( CommandId, TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT, @@ -1330,7 +1329,7 @@ bool getType( task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err); return false; } - osl::FileStatus stat(FileStatusMask_Type); + osl::FileStatus stat(osl_FileStatus_Mask_Type); err = item->getFileStatus(stat); if (err != osl::FileBase::E_None) { task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT, err); @@ -1365,7 +1364,7 @@ shell::copy( } rtl::OUString rslvdSrcUnqPath; if (type == osl::FileStatus::Link) { - osl::FileStatus stat(FileStatusMask_LinkTargetURL); + osl::FileStatus stat(osl_FileStatus_Mask_LinkTargetURL); nError = item.getFileStatus(stat); if (nError != osl::FileBase::E_None) { installError( @@ -1525,7 +1524,7 @@ shell::remove( sal_Int32 CommandId, sal_Bool MustExist ) throw() { - sal_Int32 nMask = FileStatusMask_Type | FileStatusMask_FileURL; + sal_Int32 nMask = osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL; osl::DirectoryItem aItem; osl::FileStatus aStatus( nMask ); @@ -2034,7 +2033,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, osl::FileBase::RC next = err; if( err == osl::FileBase::E_None ) { - sal_Int32 n_Mask = FileStatusMask_FileURL | FileStatusMask_FileName | FileStatusMask_Type; + sal_Int32 n_Mask = osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type; osl::DirectoryItem aDirItem; @@ -2043,19 +2042,19 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, sal_Bool IsDoc = false; osl::FileStatus aFileStatus( n_Mask ); aDirItem.getFileStatus( aFileStatus ); - if( aFileStatus.isValid( FileStatusMask_Type ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular; // Getting the information for the next recursive copy sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; rtl::OUString newSrcUnqPath; - if( aFileStatus.isValid( FileStatusMask_FileURL ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) newSrcUnqPath = aFileStatus.getFileURL(); rtl::OUString newDstUnqPath = dstUnqPath; rtl::OUString tit; - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) tit = rtl::Uri::encode( aFileStatus.getFileName(), rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, @@ -2168,9 +2167,9 @@ shell::getMaskFromProperties( n_Mask = 0; for(sal_Int32 j = 0; j < seq.getLength(); ++j) { if(seq[j].Name == Title) - n_Mask |= FileStatusMask_FileName; + n_Mask |= osl_FileStatus_Mask_FileName; else if(seq[j].Name == CasePreservingURL) - n_Mask |= FileStatusMask_FileURL; + n_Mask |= osl_FileStatus_Mask_FileURL; else if(seq[j].Name == IsDocument || seq[j].Name == IsFolder || seq[j].Name == IsVolume || @@ -2179,23 +2178,16 @@ shell::getMaskFromProperties( seq[j].Name == IsCompactDisc || seq[j].Name == IsFloppy || seq[j].Name == ContentType) - n_Mask |= (FileStatusMask_Type | FileStatusMask_LinkTargetURL); + n_Mask |= (osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL); else if(seq[j].Name == Size) - n_Mask |= (FileStatusMask_FileSize | - FileStatusMask_Type | - FileStatusMask_LinkTargetURL); + n_Mask |= (osl_FileStatus_Mask_FileSize | + osl_FileStatus_Mask_Type | + osl_FileStatus_Mask_LinkTargetURL); else if(seq[j].Name == IsHidden || seq[j].Name == IsReadOnly) - n_Mask |= FileStatusMask_Attributes; + n_Mask |= osl_FileStatus_Mask_Attributes; else if(seq[j].Name == DateModified) - n_Mask |= FileStatusMask_ModifyTime; -// n_Mask = FileStatusMask_FileURL; -// n_Mask |= FileStatusMask_LinkTargetURL; -// n_Mask |= FileStatusMask_FileName; -// n_Mask |= FileStatusMask_Type; -// n_Mask |= FileStatusMask_ModifyTime; -// n_Mask |= FileStatusMask_FileSize; -// n_Mask |= FileStatusMask_Attributes; + n_Mask |= osl_FileStatus_Mask_ModifyTime; } } @@ -2290,7 +2282,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( Title ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) { aAny <<= aFileStatus.getFileName(); it1->setValue( aAny ); @@ -2300,7 +2292,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( CasePreservingURL ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_FileURL ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) { aAny <<= aFileStatus.getFileURL(); it1->setValue( aAny ); @@ -2312,19 +2304,19 @@ shell::commit( const shell::ContentMap::iterator& it, sal_Int64 dirSize = 0; - if( aFileStatus.isValid( FileStatusMask_FileSize ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ) ) dirSize = aFileStatus.getFileSize(); - if( aFileStatus.isValid( FileStatusMask_Type ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) { if( osl::FileStatus::Link == aFileStatus.getFileType() && - aFileStatus.isValid( FileStatusMask_LinkTargetURL ) ) + aFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) ) { osl::DirectoryItem aDirItem; - osl::FileStatus aFileStatus2( FileStatusMask_Type ); + osl::FileStatus aFileStatus2( osl_FileStatus_Mask_Type ); if( osl::FileBase::E_None == osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(),aDirItem ) && osl::FileBase::E_None == aDirItem.getFileStatus( aFileStatus2 ) && - aFileStatus2.isValid( FileStatusMask_Type ) ) + aFileStatus2.isValid( osl_FileStatus_Mask_Type ) ) { isVolume = osl::FileStatus::Volume == aFileStatus2.getFileType(); isDirectory = @@ -2333,7 +2325,7 @@ shell::commit( const shell::ContentMap::iterator& it, isFile = osl::FileStatus::Regular == aFileStatus2.getFileType(); - if( aFileStatus2.isValid( FileStatusMask_FileSize ) ) + if( aFileStatus2.isValid( osl_FileStatus_Mask_FileSize ) ) dirSize = aFileStatus2.getFileSize(); } else @@ -2371,10 +2363,10 @@ shell::commit( const shell::ContentMap::iterator& it, if( it1 != properties.end() ) it1->setValue( uno::makeAny( isFile ) ); - osl::VolumeInfo aVolumeInfo( VolumeInfoMask_Attributes ); + osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_Attributes ); if( isVolume && osl::FileBase::E_None == osl::Directory::getVolumeInfo( it->first,aVolumeInfo ) && - aVolumeInfo.isValid( VolumeInfoMask_Attributes ) ) + aVolumeInfo.isValid( osl_VolumeInfo_Mask_Attributes ) ) { // Retrieve the flags; isRemote = aVolumeInfo.getRemoteFlag(); @@ -2431,10 +2423,10 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( IsReadOnly ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_Attributes ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) ) { sal_uInt64 Attr = aFileStatus.getAttributes(); - sal_Bool readonly = ( Attr & Attribute_ReadOnly ) != 0; + sal_Bool readonly = ( Attr & osl_File_Attribute_ReadOnly ) != 0; it1->setValue( uno::makeAny( readonly ) ); } } @@ -2442,10 +2434,10 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( IsHidden ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_Attributes ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) ) { sal_uInt64 Attr = aFileStatus.getAttributes(); - sal_Bool ishidden = ( Attr & Attribute_Hidden ) != 0; + sal_Bool ishidden = ( Attr & osl_File_Attribute_Hidden ) != 0; it1->setValue( uno::makeAny( ishidden ) ); } } @@ -2453,7 +2445,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( DateModified ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_ModifyTime ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_ModifyTime ) ) { TimeValue temp = aFileStatus.getModifyTime(); @@ -2479,7 +2471,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( CreatableContentsInfo ) ); if( it1 != properties.end() ) it1->setValue( uno::makeAny( - isDirectory || !aFileStatus.isValid( FileStatusMask_Type ) + isDirectory || !aFileStatus.isValid( osl_FileStatus_Mask_Type ) ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ) ); } @@ -2504,9 +2496,9 @@ shell::getv( // Always retrieve the type and the target URL because item might be a link osl::FileStatus aFileStatus( n_Mask | - FileStatusMask_FileURL | - FileStatusMask_Type | - FileStatusMask_LinkTargetURL ); + osl_FileStatus_Mask_FileURL | + osl_FileStatus_Mask_Type | + osl_FileStatus_Mask_LinkTargetURL ); aDirItem.getFileStatus( aFileStatus ); aUnqPath = aFileStatus.getFileURL(); @@ -2521,7 +2513,7 @@ shell::getv( osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem ); if ( aTargetItem.is() ) { - osl::FileStatus aTargetStatus( FileStatusMask_Type ); + osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type ); if ( osl::FileBase::E_None == ( result = aTargetItem.getFileStatus( aTargetStatus ) ) ) diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index d77659f20e15..e5bed9fc1a42 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -37,14 +37,14 @@ using namespace com::sun::star; using namespace ftp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk index 6f55fed25fed..9440d0cd6205 100755 --- a/ucb/source/ucp/ftp/makefile.mk +++ b/ucb/source/ucp/ftp/makefile.mk @@ -77,10 +77,6 @@ SHL1STDLIBS=\ $(UCBHELPERLIB) \ $(CURLLIB) -.IF "$(GUI)" == "OS2" -SHL1STDLIBS+=ssl.lib crypto.lib libz.lib -.ENDIF - SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS= \ $(LIB1TARGET) diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 2e56b4f91db1..09596bb65d56 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -103,13 +103,13 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 38e43444abec..3d6b32ea60c8 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -144,15 +144,13 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= -extern "C" void SAL_CALL -component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **/*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL -component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void */*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index cb10ea2ec1a8..d82cc23fa1e8 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -37,14 +37,14 @@ using namespace com::sun::star; using namespace hierarchy_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx index a8eb6f83a6bc..15b75ec4bd39 100644 --- a/ucb/source/ucp/odma/odma_main.cxx +++ b/ucb/source/ucp/odma/odma_main.cxx @@ -44,7 +44,7 @@ /** our main program to convert ODMAIDs to ODMA URLs */ -#if (defined UNX) || (defined OS2) +#if (defined UNX) void main( int argc, char * argv[] ) #else void _cdecl main( int argc, char * argv[] ) diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index e6ca17cea73a..96ea58396310 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -42,14 +42,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 102a7ebe5197..4becb1c3e63c 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -36,14 +36,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 25b407cd5fd3..4fe7c0baaa7d 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -40,14 +40,14 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 0024eb734033..9b02e5c562d6 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -1198,7 +1198,7 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) return sal_True; } return sal_False; - // --> tkr #67048# copy & paste images doesn't display. + // #67048# copy & paste images doesn't display. // if we have a bad connection try again. Up to three times. case DAVException::DAV_HTTP_ERROR: // retry up to three times, if not a client-side error. @@ -1208,11 +1208,9 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) return sal_True; } return sal_False; - // <-- - // --> tkr: if connection has said retry then retry! + // if connection has said retry then retry! case DAVException::DAV_HTTP_RETRY: return sal_True; - // <-- default: return sal_False; // Abort } diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 162d58266406..f91a9717f115 100755..100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -126,18 +126,12 @@ SHL1STDLIBS=\ $(LIBXML2LIB) .IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(WSOCK32LIB) -.IF "$(WINDOWS_VISTA_PSDK)" != "" SHL1STDLIBS+= $(WS2_32LIB) -.ENDIF SHL1STDLIBS+= $(OPENSSLLIB) .ELSE # WNT .IF "$(OS)"=="SOLARIS" SHL1STDLIBS+= -lnsl -lsocket -ldl .ENDIF # SOLARIS -.IF "$(OS)"=="OS2" -SHL1STDLIBS+= pthread.lib libz.lib -.ENDIF # OS2 .IF "$(SYSTEM_OPENSSL)"=="YES" SHL1STDLIBS+= $(OPENSSLLIB) .ELSE diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 54cee2899fca..14dcc4958fea 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -36,14 +36,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 79362cc8cf10..3cda495e0afa 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -67,6 +67,7 @@ #include "com/sun/star/ucb/XInteractionReplaceExistingData.hpp" #include "com/sun/star/ucb/XInteractionSupplyName.hpp" #include "com/sun/star/xforms/InvalidDataOnSubmitException.hpp" +#include "com/sun/star/loader/CannotActivateFactoryException.hpp" #include "osl/conditn.hxx" #include "tools/rcid.h" // RSC_STRING @@ -857,6 +858,23 @@ UUIInteractionHelper::handleRequest_impl( return true; } + loader::CannotActivateFactoryException aCannotActivateFactoryException; + if (aAnyRequest >>= aCannotActivateFactoryException) + { + ErrCode nErrorCode = ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY; + std::vector< rtl::OUString > aArguments; + aArguments.push_back( aCannotActivateFactoryException.Message ); + + handleErrorHandlerRequest( task::InteractionClassification_ERROR, + nErrorCode, + aArguments, + rRequest->getContinuations(), + bObtainErrorStringOnly, + bHasErrorString, + rErrorString ); + return true; + } + /////////////////////////////////////////////////////////////////// // Handle requests which do not have a plain string representation. diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index c292befb1663..8e9d18eac258 100755 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -160,6 +160,7 @@ #define ERRCODE_UUI_LOCKING_LOCKED_SELF (ERRCODE_AREA_UUI + 60) #define ERRCODE_UUI_LOCKING_NOT_LOCKED (ERRCODE_AREA_UUI + 61) #define ERRCODE_UUI_LOCKING_LOCK_EXPIRED (ERRCODE_AREA_UUI + 62) +#define ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY (ERRCODE_AREA_UUI + 63) #define ERRCODE_AREA_UUI_UNKNOWNAUTH 25000 #define SSLWARN_TYPE_DOMAINMISMATCH 10 diff --git a/uui/source/ids.src b/uui/source/ids.src index 378b513b2e42..ad12f2c6ba5c 100644 --- a/uui/source/ids.src +++ b/uui/source/ids.src @@ -403,6 +403,11 @@ Resource RID_UUI_ERRHDL Text [ en-US ] = "Security Warning: Server Certificate Invalid"; }; + String (ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY & ERRCODE_RES_MASK) + { + Text [ en-US ] = "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1)."; + }; + }; diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 125a1d86cd5d..8ced313926d3 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -49,8 +49,7 @@ using ::rtl::OUString; // //============================================================================ -extern "C" void SAL_CALL -component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, uno_Environment **) { *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -62,7 +61,7 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, // //============================================================================ -extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, void * pServiceManager, void *) { diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index dd303eb1ad1f..26912388ad05 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -83,7 +83,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow > xControlWindow( xControl->getPeer(), uno::UNO_QUERY_THROW ); - xControlWindow->setPosSize( (aPosSize.Width - getWidth()) / 2.0, (aPosSize.Height - getHeight()) / 2.0, 0, 0, awt::PosSize::POS ); + xControlWindow->setPosSize(static_cast<sal_Int32>((aPosSize.Width - getWidth()) / 2.0), static_cast<sal_Int32>((aPosSize.Height - getHeight()) / 2.0), 0, 0, awt::PosSize::POS ); } catch( uno::Exception& ) { diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 39aa69bfeb3c..a52ef14402b5 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -724,7 +724,7 @@ double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double PixelsToPoints( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical) { double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical ); - return HmmToPoints( fPixels/fConvertFactor ); + return HmmToPoints(static_cast<sal_Int32>(fPixels/fConvertFactor)); } sal_Int32 PointsToHmm( double fPoints ) diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index eb0ca7e6d886..570f9eebd5d7 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -435,7 +435,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin osl::Directory dirFile( dirName ); osl::DirectoryItem aDirItem; - osl::FileStatus aStatus( FileStatusMask_FileName ); + osl::FileStatus aStatus( osl_FileStatus_Mask_FileName ); sal_Int32 idx; @@ -445,7 +445,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin while( dirFile.getNextItem( aDirItem ) == osl::FileBase::E_None && aDirItem.getFileStatus( aStatus ) == osl::FileBase::E_None ) { - if( ! aStatus.isValid( FileStatusMask_FileName ) ) + if( ! aStatus.isValid( osl_FileStatus_Mask_FileName ) ) continue; fileName = aStatus.getFileName(); @@ -1296,7 +1296,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, osl::DirectoryItem aDirItem; osl::File aFile( fileURL ); - osl::FileStatus aStatus( FileStatusMask_FileSize ); + osl::FileStatus aStatus( osl_FileStatus_Mask_FileSize ); if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) && osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) && diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index b34aa4a34600..402a734fc7d9 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -28,8 +28,8 @@ #ifndef BERKELEYDBPROXY_DB_HXX_ #define BERKELEYDBPROXY_DB_HXX_ -#ifdef SYSTEM_DB -#include <db.h> +#ifdef SYSTEM_DB_HEADER +#include SYSTEM_DB_HEADER #else #include <berkeleydb/db.h> #endif diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 8cba751dff67..0649c6d9e5c2 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -178,7 +178,7 @@ XInputStream_impl::seek( { if( location < 0 ) throw lang::IllegalArgumentException(); - if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException(); } @@ -208,7 +208,7 @@ XInputStream_impl::getLength( if( err != osl::FileBase::E_None ) throw io::IOException(); - err = m_aFile.setPos( Pos_End, 0 ); + err = m_aFile.setPos( osl_Pos_End, 0 ); if( err != osl::FileBase::E_None ) throw io::IOException(); @@ -216,7 +216,7 @@ XInputStream_impl::getLength( if( err != osl::FileBase::E_None ) throw io::IOException(); - err = m_aFile.setPos( Pos_Absolut, uCurrentPos ); + err = m_aFile.setPos( osl_Pos_Absolut, uCurrentPos ); if( err != osl::FileBase::E_None ) throw io::IOException(); else diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk index 38f57c63e705..cc8eaf9355f0 100755 --- a/xmlhelp/source/cxxhelp/provider/makefile.mk +++ b/xmlhelp/source/cxxhelp/provider/makefile.mk @@ -52,9 +52,7 @@ CFLAGSWERRCXX:= CFLAGS += -DHAVE_EXPAT_H -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) .IF "$(SYSTEM_LIBXML)" == "YES" CFLAGS+= $(LIBXML_CFLAGS) diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index 63c3192b4d19..e5b27e41f25f 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -37,14 +37,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 38574b66afc4..609b7bb857d7 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -257,7 +257,7 @@ TVFactory::CreateInstance( } //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { (void)ppEnv; @@ -266,7 +266,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey ) { (void)pRegistryKey; diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 6b74767acbed..ce9acf05663a 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -753,15 +753,15 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) } osl::Directory aDirectory( url ); - osl::FileStatus aFileStatus( FileStatusMask_FileName | FileStatusMask_FileSize | FileStatusMask_FileURL ); + osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_FileSize | osl_FileStatus_Mask_FileURL ); if( osl::Directory::E_None == aDirectory.open() ) { int idx_ = 0; rtl::OUString aFileUrl, aFileName; while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None && aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None && - aFileStatus.isValid( FileStatusMask_FileURL ) && - aFileStatus.isValid( FileStatusMask_FileName ) ) + aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) && + aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) { aFileUrl = aFileStatus.getFileURL(); aFileName = aFileStatus.getFileName(); @@ -777,7 +777,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' ) && ( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) ) { - OSL_ENSURE( aFileStatus.isValid( FileStatusMask_FileSize ), + OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ), "invalid file size" ); rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase(); diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/xmloff/inc/xmloff/txtprmap.hxx index c708391ec0ff..f7c7a3859cec 100644 --- a/xmloff/inc/xmloff/txtprmap.hxx +++ b/xmloff/inc/xmloff/txtprmap.hxx @@ -172,7 +172,6 @@ #define CTF_SHAPE_VERTICALREL (XML_TEXT_CTF_START + 136) #define CTF_SHAPE_VERTICALREL_PAGE (XML_TEXT_CTF_START + 137) #define CTF_SHAPE_VERTICALREL_FRAME (XML_TEXT_CTF_START + 138) -// <-- #define CTF_PARA_ADJUSTLAST (XML_TEXT_CTF_START + 139) #define CTF_DEFAULT_OUTLINE_LEVEL (XML_TEXT_CTF_START + 140) #define CTF_OLD_FLOW_WITH_TEXT (XML_TEXT_CTF_START + 141) diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 5b9fb7c56b0f..0084d1751f07 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -178,18 +178,18 @@ Reference< drawing::XShape > SchXMLAxisContext::getTitleShape() { case SCH_XML_AXIS_X: if( m_aCurrentAxis.nAxisIndex == 0 ) - aPropName = OUString::createFromAscii( "HasXAxisTitle" ); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisTitle" )); else - aPropName = OUString::createFromAscii( "HasSecondaryXAxisTitle" ); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisTitle" )); break; case SCH_XML_AXIS_Y: if( m_aCurrentAxis.nAxisIndex == 0 ) - aPropName = OUString::createFromAscii( "HasYAxisTitle" ); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisTitle" )); else - aPropName = OUString::createFromAscii( "HasSecondaryYAxisTitle" ); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisTitle" )); break; case SCH_XML_AXIS_Z: - aPropName = OUString::createFromAscii( "HasZAxisTitle" ); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )); break; case SCH_XML_AXIS_UNDEF: OSL_TRACE( "Invalid axis" ); @@ -212,21 +212,21 @@ void SchXMLAxisContext::CreateGrid( OUString sAutoStyleName, bool bIsMajor ) { case SCH_XML_AXIS_X: if( bIsMajor ) - aPropName = OUString::createFromAscii("HasXAxisGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxisGrid")); else - aPropName = OUString::createFromAscii("HasXAxisHelpGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxisHelpGrid")); break; case SCH_XML_AXIS_Y: if( bIsMajor ) - aPropName = OUString::createFromAscii("HasYAxisGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxisGrid")); else - aPropName = OUString::createFromAscii("HasYAxisHelpGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxisHelpGrid")); break; case SCH_XML_AXIS_Z: if( bIsMajor ) - aPropName = OUString::createFromAscii("HasZAxisGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxisGrid")); else - aPropName = OUString::createFromAscii("HasZAxisHelpGrid"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxisHelpGrid")); break; case SCH_XML_AXIS_UNDEF: OSL_TRACE( "Invalid axis" ); @@ -418,21 +418,21 @@ void SchXMLAxisContext::CreateAxis() { case SCH_XML_AXIS_X: if( m_aCurrentAxis.nAxisIndex == 0 ) - aPropName = OUString::createFromAscii("HasXAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")); else - aPropName = OUString::createFromAscii("HasSecondaryXAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")); break; case SCH_XML_AXIS_Y: if( m_aCurrentAxis.nAxisIndex == 0 ) - aPropName = OUString::createFromAscii("HasYAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")); else - aPropName = OUString::createFromAscii("HasSecondaryYAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")); break; case SCH_XML_AXIS_Z: if( m_aCurrentAxis.nAxisIndex == 0 ) - aPropName = OUString::createFromAscii("HasXAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")); else - aPropName = OUString::createFromAscii("HasSecondaryXAxis"); + aPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")); break; case SCH_XML_AXIS_UNDEF: OSL_TRACE( "Invalid axis" ); @@ -468,7 +468,7 @@ void SchXMLAxisContext::CreateAxis() { try { - xDiaProp->setPropertyValue( OUString::createFromAscii( "HasXAxis" ), uno::makeAny(sal_True) ); + xDiaProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), uno::makeAny(sal_True) ); } catch( beans::UnknownPropertyException & ) { @@ -486,13 +486,13 @@ void SchXMLAxisContext::CreateAxis() m_xAxisProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), uno::makeAny( COL_BLACK )); - m_xAxisProps->setPropertyValue( OUString::createFromAscii( "DisplayLabels" ), aFalseBool ); + m_xAxisProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DisplayLabels" )), aFalseBool ); // #88077# AutoOrigin 'on' is default - m_xAxisProps->setPropertyValue( OUString::createFromAscii( "AutoOrigin" ), aTrueBool ); + m_xAxisProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )), aTrueBool ); if( m_bAxisTypeImported ) - m_xAxisProps->setPropertyValue( OUString::createFromAscii( "AxisType" ), uno::makeAny(m_nAxisType) ); + m_xAxisProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AxisType" )), uno::makeAny(m_nAxisType) ); if( m_aAutoStyleName.getLength()) { @@ -548,7 +548,7 @@ void SchXMLAxisContext::CreateAxis() Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY ); if( xNewAxisProp.is() ) { - xNewAxisProp->setPropertyValue( OUString::createFromAscii("LineStyle") + xNewAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")) , uno::makeAny(drawing::LineStyle_NONE)); } } @@ -794,31 +794,31 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc chart2::ScaleData aMainXScale = xMainXAxis->getScaleData(); if( 0 == rChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) ) { - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainXScale.Origin >>= fCrossoverValue; - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverValue") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverValue")) , uno::makeAny( fCrossoverValue ) ); if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LabelPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("MarkPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LabelPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("MarkPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } @@ -826,48 +826,48 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc { if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xMainYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainYScale.Origin >>= fCrossoverValue; - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverValue") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverValue")) , uno::makeAny( fCrossoverValue ) ); if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LabelPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("MarkPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) - xSecondaryXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LabelPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); - xMainXAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition") + xMainXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("MarkPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) - xSecondaryXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition") + xSecondaryXAxisProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")) , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } @@ -990,7 +990,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList > bool bSetNewIncrement=false; chart::TimeIncrement aIncrement; - m_xAxisProps->getPropertyValue( OUString::createFromAscii( "TimeIncrement" )) >>= aIncrement; + m_xAxisProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "TimeIncrement" ))) >>= aIncrement; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { @@ -1047,7 +1047,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList > } if( bSetNewIncrement ) - m_xAxisProps->setPropertyValue( OUString::createFromAscii( "TimeIncrement" ), uno::makeAny( aIncrement ) ); + m_xAxisProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "TimeIncrement" )), uno::makeAny( aIncrement ) ); } // ======================================== diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 131b7a97e73e..ccce0fc6bb33 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -683,7 +683,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( -1, uno::makeAny( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue( - ::rtl::OUString::createFromAscii("UseCategoriesAsX"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCategoriesAsX")), -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index f42026fb6d72..f87160839d03 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2316,7 +2316,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty return; chart::TimeIncrement aIncrement; - if( (xAxisProps->getPropertyValue( OUString::createFromAscii( "TimeIncrement" )) >>= aIncrement) ) + if( (xAxisProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "TimeIncrement" ))) >>= aIncrement) ) { sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; if( aIncrement.TimeResolution >>= nTimeResolution ) @@ -2440,7 +2440,7 @@ void SchXMLExportHelper_Impl::exportAxis( bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid, bool bExportContent ) { - static const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" )); + static const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ))); std::vector< XMLPropertyState > aPropertyStates; SvXMLElementExport* pAxis = NULL; diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index e97214645c62..c85353d7ca36 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -114,7 +114,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu { try { - xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "HasLegend" ), uno::makeAny( sal_True ) ); + xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), uno::makeAny( sal_True ) ); } catch( beans::UnknownPropertyException ) { @@ -160,7 +160,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu try { if( SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, GetImport().GetMM100UnitConverter() ) ) - xLegendProps->setPropertyValue( rtl::OUString::createFromAscii( "Alignment" ), aAny ); + xLegendProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny ); } catch( beans::UnknownPropertyException ) { @@ -205,7 +205,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu xLegendShape->setPosition( aLegendPos ); if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM ) - xLegendProps->setPropertyValue( rtl::OUString::createFromAscii( "Expansion" ), uno::makeAny(nLegendExpansion) ); + xLegendProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Expansion" )), uno::makeAny(nLegendExpansion) ); else if( bHasHeight && bHasWidth ) xLegendShape->setSize( aLegendSize ); diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index db606730354f..eef2f7b972ff 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -582,7 +582,7 @@ void SchXMLSeries2Context::EndElement() } else if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() ) { - DomainInfo aDomainInfo( OUString::createFromAscii("values-y"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; + DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM("values-y")), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; aDomainInfos.push_back( aDomainInfo ); } } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 03659c39b2dd..860c566ffd1a 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -449,7 +449,6 @@ void SvXMLExport::_InitCtor() mpImpl->mbSaveBackwardCompatibleODF = bTemp; } } - // <-- } // Shapes in Writer cannot be named via context menu (#i51726#) diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 7b581b662a45..833e76966a13 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -883,7 +883,6 @@ void XMLShapeImportHelper::finishShape( aPosLayoutDir ); } } - // <-- } // helper functions for z-order sorting diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 7a04bdca2e03..2179fdc2922e 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -1927,7 +1927,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA if ( maPath.hasValue() ) { - // --> OD #i115492# + // #i115492# // Ignore svg:d attribute for text documents created by OpenOffice.org // versions before OOo 3.3, because these OOo versions are storing // svg:d values not using the correct unit. @@ -1953,7 +1953,6 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA { xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath ); } - // <-- } SdXMLShapeContext::StartElement(xAttrList); diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 62d8ef90516b..2462ca195a04 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -87,7 +87,6 @@ static const SvXMLEnumMapEntry aChapterDisplayMap[] = //---> i89791 // enabled for ODF 1.2, full index support in 3.0 { XML_PLAIN_NUMBER_AND_NAME, ChapterFormat::NO_PREFIX_SUFFIX }, - //<--- { XML_PLAIN_NUMBER, ChapterFormat::DIGIT }, { XML_TOKEN_INVALID, 0 } }; @@ -174,7 +173,6 @@ void XMLIndexChapterInfoEntryContext::StartElement( } } } - // <-- } if (bOutlineLevelOK) nValues++; diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index fd82a5f8f082..c1285af4e751 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -123,9 +123,9 @@ XMLIndexTOCContext::XMLIndexTOCContext( if (SvXMLUnitConverter::convertEnum(nTmp, rLocalName, aIndexTypeMap)) { // check for array index: - OSL_ENSURE(nTmp < (sizeof(aIndexServiceMap)/sizeof(sal_Char*)), "index out of range"); - OSL_ENSURE(sizeof(aIndexServiceMap) == - sizeof(aIndexSourceElementMap), + OSL_ENSURE(nTmp < (SAL_N_ELEMENTS(aIndexServiceMap)), "index out of range"); + OSL_ENSURE(SAL_N_ELEMENTS(aIndexServiceMap) == + SAL_N_ELEMENTS(aIndexSourceElementMap), "service and source element maps must be same size"); eIndexType = static_cast<IndexTypeEnum>(nTmp); diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 151a233f6f67..dba56113123c 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -1341,7 +1341,6 @@ void XMLSectionExport::ExportIndexTemplateElement( rValues[i].Value >>= nLevel; bLevelOK = sal_True; break; -//<--- case TOK_TPARAM_BIBLIOGRAPHY_DATA: rValues[i].Value >>= nBibliographyData; bBibliographyDataOK = sal_True; @@ -1449,7 +1448,6 @@ void XMLSectionExport::ExportIndexTemplateElement( bChapterFormatOK = sal_False; } } -//<--- // ... and write Element if (eElement != XML_TOKEN_INVALID) @@ -1537,7 +1535,6 @@ void XMLSectionExport::ExportIndexTemplateElement( if (bLevelOK) GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, OUString::valueOf((sal_Int32)nLevel)); -//<--- } //--->i53420 @@ -1552,7 +1549,6 @@ void XMLSectionExport::ExportIndexTemplateElement( GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, OUString::valueOf((sal_Int32)nLevel)); } -//<--- // export template SvXMLElementExport aTemplateElement(GetExport(), XML_NAMESPACE_TEXT, GetXMLToken(eElement), diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 5a80d19b1096..ab73ee1f86f1 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -149,9 +149,8 @@ static SvXMLTokenMapEntry aTextElemTokenMap[] = { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TEXT_FORMS }, { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_TEXT_CALCULATION_SETTINGS }, { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, XML_TOK_TEXT_AUTOMARK }, - // --> FLR #i52127# + // #i52127# { XML_NAMESPACE_TEXT, XML_NUMBERED_PARAGRAPH, XML_TOK_TEXT_NUMBERED_PARAGRAPH }, - // <-- XML_TOKEN_MAP_END }; @@ -1447,9 +1446,7 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, { bRet = sal_False; } - // <-- } - // <-- break; } else @@ -1463,7 +1460,6 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, return bRet; } -// <-- OUString XMLTextImportHelper::SetStyleAndAttrs( SvXMLImport& rImport, const Reference < XTextCursor >& rCursor, diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index f55b2aaa1d7e..e4788a7ecaf2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1198,7 +1198,6 @@ void XMLTableTransformerContext_Impl::StartElement( Reference< XAttributeList > xAttrList( rAttrList ); XMLMutableAttributeList *pMutableAttrList = 0; - // <-- sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index f28ad09234b2..2ef42bf0dfe2 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -520,7 +520,6 @@ void XMLPropertiesTContext_Impl::StartElement( } } pAttrList->AddAttribute( rAttrName, aNewAttrValue ); - // <-- // create old draw:mirror for drawing graphic objects OUString aAttrValue( GetXMLToken( IsXMLToken( rAttrValue, XML_HORIZONTAL ) ? XML_TRUE : XML_FALSE ) ); diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 2761a3f234ef..59bd7a366b23 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -325,7 +325,7 @@ void SAL_CALL XMLTransformerBase::startElement( const OUString& rName, } void SAL_CALL XMLTransformerBase::endElement( const OUString& -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 rName #endif ) @@ -336,7 +336,7 @@ rName // Get topmost context ::rtl::Reference< XMLTransformerContext > xContext = m_pContexts->back(); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE( xContext->GetQName() == rName, "XMLTransformerBase::endElement: popped context has wrong lname" ); #endif @@ -433,7 +433,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments for( sal_Int32 nIndex = 0; nIndex < nAnyCount; nIndex++, pAny++ ) { - // #b6236750# use isAssignableFrom instead of comparing the types to + // use isAssignableFrom instead of comparing the types to // allow XExtendedDocumentHandler instead of XDocumentHandler (used in // writeOasis2OOoLibraryElement in sfx2). // The Any shift operator can't be used to query the type because it diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 746b2c11a007..0e7119368d20 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -106,7 +106,7 @@ namespace xmlscript extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -114,7 +114,7 @@ extern "C" // ----------------------------------------------------------------------------- - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( |