diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:03:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:03:55 +0000 |
| commit | 89ef863090fb0a619659ab51fc34025792ff5bc0 (patch) | |
| tree | 4a9a2432cb59becb2e21a53fd272789ce2f89ecf | |
| parent | 4728462953156cb2b4c0fa0d8bbbb3ab0b11e762 (diff) | |
| parent | 1f5e32262c475444b09293e7e7b78141a1704696 (diff) | |
koheidatapilot03: merge with DEV300_m57
51 files changed, 2368 insertions, 53 deletions
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index a529dc00d48b..5285b709b7b5 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -32,6 +32,7 @@ #include "precompiled_bridges.hxx" #include <stdio.h> +#include <string.h> #include <cxxabi.h> #include <hash_map> diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk index 823c3888516b..242d21617d5e 100644 --- a/bridges/source/cpp_uno/mingw_intel/makefile.mk +++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk @@ -47,11 +47,17 @@ ENABLE_EXCEPTIONS=TRUE .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA .ENDIF +.IF "$(EXCEPTIONS)" == "sjlj" +CFLAGS += -DBROKEN_ALLOCA +.ENDIF # In case someone enabled the non-standard -fomit-frame-pointer which does not # work with the .cxx sources in this directory: CFLAGSCXX += -fno-omit-frame-pointer +NOOPTFILES= \ + $(SLO)$/uno2cpp.obj + CFLAGSNOOPT=-O0 SLOFILES= \ diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx index 0c12fac5c93f..f6b6a1c6511d 100644 --- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx @@ -44,10 +44,6 @@ #include "share.hxx" #include "smallstruct.hxx" -#ifdef __MINGW32__ -#define BROKEN_ALLOCA -#endif - using namespace ::rtl; using namespace ::com::sun::star::uno; diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 03c7ef9fbc64..b3b4e5ab8b06 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -41,10 +41,6 @@ #include <algorithm> -#ifdef __MINGW32__ -#define BROKEN_ALLOCA -#endif - using namespace ::rtl; namespace jni_uno diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index d9ad7f92b124..50c551427959 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -40,10 +40,6 @@ #include "jni_bridge.h" -#ifdef __MINGW32__ -#define BROKEN_ALLOCA -#endif - using namespace ::std; using namespace ::rtl; diff --git a/bridges/source/jni_uno/makefile.mk b/bridges/source/jni_uno/makefile.mk index 36f6ffbde5b9..d020eb7e91a1 100644 --- a/bridges/source/jni_uno/makefile.mk +++ b/bridges/source/jni_uno/makefile.mk @@ -47,6 +47,12 @@ nojava: # --- Files -------------------------------------------------------- +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(EXCEPTIONS)" == "sjlj" +CFLAGS += -DBROKEN_ALLOCA +.ENDIF +.ENDIF + SLOFILES= \ $(SLO)$/jni_info.obj \ $(SLO)$/jni_data.obj \ diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst index a0caa14cbd9d..a22ca9ec8b66 100644 --- a/cppu/prj/build.lst +++ b/cppu/prj/build.lst @@ -8,4 +8,5 @@ cu cppu\source\cppu nmake - all cu_cppu cu_inc NULL cu cppu\source\helper\purpenv nmake - all cu_helper_purpenv cu_inc NULL cu cppu\source\UnsafeBridge nmake - all cu_UnsafeBridge cu_inc NULL cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL -cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL +cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL +cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index 3355b6dc2c52..411a51cf2518 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -67,5 +67,8 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\bin\affine_u*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib%_EXT%\* +..\%__SRC%\bin\log_u*.dll %_DEST%\bin%_EXT%\* +..\%__SRC%\lib\liblog_uno_uno.* %_DEST%\lib%_EXT%\* + linklib: libuno_cppu.*.* linklib: libuno_purpenvhelper*.*.* diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx new file mode 100755 index 000000000000..6bb32e4f0666 --- /dev/null +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -0,0 +1,280 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: LogBridge.cxx,v $ + * $Revision: 1.5 $ + * + * 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_cppu.hxx" + +#include "osl/mutex.hxx" +#include "osl/thread.h" +#include "uno/dispatcher.h" +#include "typelib/typedescription.hxx" +#include "cppu/helper/purpenv/Environment.hxx" +#include "cppu/helper/purpenv/Mapping.hxx" +#include "cppu/EnvDcp.hxx" +#include "rtl/logfile.hxx" +#include "uno/environment.hxx" +#include <com/sun/star/uno/Type.hxx> +#include <hash_map> +#include <memory> + +namespace +{ +class LogBridge : public cppu::Enterable +{ + osl::Mutex m_mutex; + sal_Int32 m_count; + oslThreadIdentifier m_threadId; + + virtual ~LogBridge(void); + +public: + explicit LogBridge(void); + + virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam); + virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam); + + virtual void v_enter(void); + virtual void v_leave(void); + + virtual int v_isValid(rtl::OUString * pReason); +}; + +LogBridge::LogBridge(void) + : m_count (0) + ,m_threadId(0) +{ +} + +LogBridge::~LogBridge(void) +{ + OSL_ASSERT(m_count >= 0); +} + +void LogBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) +{ + enter(); + pCallee(pParam); + leave(); +} + +void LogBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) +{ + OSL_ASSERT(m_count > 0); + + -- m_count; + pCallee(pParam); + ++ m_count; + + if (!m_threadId) + m_threadId = osl_getThreadIdentifier(NULL); +} + +void LogBridge::v_enter(void) +{ + m_mutex.acquire(); + + OSL_ASSERT(m_count >= 0); + + if (m_count == 0) + m_threadId = osl_getThreadIdentifier(NULL); + + ++ m_count; +} + +void LogBridge::v_leave(void) +{ + OSL_ASSERT(m_count > 0); + + -- m_count; + if (!m_count) + m_threadId = 0; + + + m_mutex.release(); +} + +int LogBridge::v_isValid(rtl::OUString * pReason) +{ + int result = 1; + + result = m_count > 0; + if (!result) + *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); + + else + { + result = m_threadId == osl_getThreadIdentifier(NULL); + + if (!result) + *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread")); + } + + if (result) + *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK")); + + return result; +} + + void traceValue(typelib_TypeDescriptionReference* _pTypeRef,void* pArg) + { + switch(_pTypeRef->eTypeClass) + { + case typelib_TypeClass_STRING: + { + const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding())); + rtl_logfile_trace( "%s", sValue.getStr()); + } + break; + case typelib_TypeClass_BOOLEAN: + rtl_logfile_trace( "%d", *static_cast<sal_Bool*>(pArg)); + break; + case typelib_TypeClass_BYTE: + rtl_logfile_trace( "%d", *static_cast<sal_Int8*>(pArg)); + break; + case typelib_TypeClass_CHAR: + rtl_logfile_trace( "%c", *static_cast<sal_Char*>(pArg)); + break; + case typelib_TypeClass_SHORT: + case typelib_TypeClass_UNSIGNED_SHORT: + rtl_logfile_trace( "%d", *static_cast<sal_Int16*>(pArg)); + break; + case typelib_TypeClass_LONG: + case typelib_TypeClass_UNSIGNED_LONG: + case typelib_TypeClass_ENUM: + rtl_logfile_trace( "%d", *static_cast<sal_Int32*>(pArg)); + break; + case typelib_TypeClass_HYPER: + case typelib_TypeClass_UNSIGNED_HYPER: + rtl_logfile_trace( "%d", *static_cast<sal_Int64*>(pArg)); + break; + case typelib_TypeClass_FLOAT: + rtl_logfile_trace( "%f", *static_cast<float*>(pArg)); + break; + case typelib_TypeClass_DOUBLE: + rtl_logfile_trace( "%f", *static_cast<double*>(pArg)); + break; + case typelib_TypeClass_TYPE: + { + const ::rtl::OString sValue( ::rtl::OUStringToOString(((com::sun::star::uno::Type*)pArg)->getTypeName(),osl_getThreadTextEncoding())); + rtl_logfile_trace( "%s", sValue.getStr()); + } + break; + case typelib_TypeClass_ANY: + if ( static_cast<uno_Any*>(pArg)->pData ) + traceValue(static_cast<uno_Any*>(pArg)->pType,static_cast<uno_Any*>(pArg)->pData); + else + rtl_logfile_trace( "void"); + break; + case typelib_TypeClass_EXCEPTION: + rtl_logfile_trace( "exception"); + break; + case typelib_TypeClass_INTERFACE: + { + const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding())); + rtl_logfile_trace( "%s 0x%p", sValue.getStr(),pArg); + } + break; + case typelib_TypeClass_VOID: + rtl_logfile_trace( "void"); + break; + default: + rtl_logfile_trace( "0x%p", pArg); + break; + } // switch(pParams[i].pTypeRef->eTypeClass) + } +} + +void LogProbe( + bool pre, + void * /*pThis*/, + void * /*pContext*/, + typelib_TypeDescriptionReference * pReturnTypeRef, + typelib_MethodParameter * pParams, + sal_Int32 nParams, + typelib_TypeDescription const * pMemberType, + void * pReturn, + void * pArgs[], + uno_Any ** ppException ) +{ + static ::std::auto_ptr< ::rtl::Logfile> pLogger; + ::rtl::OString sTemp; + if ( pMemberType && pMemberType->pTypeName ) + sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); + if ( pre ) + { + rtl_logfile_longTrace( "{ LogBridge () %s", sTemp.getStr() ); + if ( nParams ) + { + rtl_logfile_trace( "\n| : ( LogBridge "); + for(sal_Int32 i = 0;i < nParams;++i) + { + if ( i > 0 ) + rtl_logfile_trace( ","); + traceValue(pParams[i].pTypeRef,pArgs[i]); + + } + rtl_logfile_trace( ")"); + } // if ( nParams ) + rtl_logfile_trace( "\n"); + } + else if ( !pre ) + { + rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr()); + if ( ppException && *ppException ) + { + rtl_logfile_trace( " excption occured : "); + typelib_TypeDescription * pElementTypeDescr = 0; + TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); + const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); + rtl_logfile_trace( "%s", sValue.getStr()); + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); + } + else if ( pReturnTypeRef ) + { + rtl_logfile_trace( " return : "); + traceValue(pReturnTypeRef,pReturn); + } // if ( pReturn && pReturnTypeRef ) + + rtl_logfile_trace( "\n"); + } +} + +extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) + SAL_THROW_EXTERN_C() +{ + cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge()); +} + +extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping, + uno_Environment * pFrom, + uno_Environment * pTo ) +{ + cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo,LogProbe); +} diff --git a/cppu/source/LogBridge/makefile.mk b/cppu/source/LogBridge/makefile.mk new file mode 100755 index 000000000000..c7bc5e5172f6 --- /dev/null +++ b/cppu/source/LogBridge/makefile.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.4 $ +# +# 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 := cppu +TARGET := LogBridge + +ENABLE_EXCEPTIONS := TRUE +NO_BSYMBOLIC := TRUE +USE_DEFFILE := FALSE + + +.INCLUDE: settings.mk + + +SLOFILES := $(SLO)$/LogBridge.obj + + +.INCLUDE: target.mk + diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index dc06e9284e72..3aac0524218b 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -72,6 +72,21 @@ SHL4DEF := empty.def SHL4OBJS := $(SLO)$/AffineBridge.obj SHL4RPATH := URELIB + +SHL5TARGET := log_uno_uno +SHL5IMPLIB := i$(SHL5TARGET) +SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB) +SHL5OBJS := $(SLO)$/LogBridge.obj + +.IF "$(GUI)"=="OS2" +SHL5VERSIONMAP=unsafe_os2.map +SHL5DEF=$(MISC)$/$(SHL5TARGET).def +DEF5NAME=LogMapping.def +.ELSE +SHL5DEF := empty.def +.ENDIF +SHL5RPATH := URELIB + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index db5d91124a14..2008d27f5310 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -315,7 +315,26 @@ static OUString getLibEnv(OUString const & aModulePath, } if (!pEnv->is() && pEnvTypeName) + { *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName); + const char * pUNO_ENV_LOG = ::getenv( "UNO_ENV_LOG" ); + if (pUNO_ENV_LOG && rtl_str_getLength(pUNO_ENV_LOG) ) + { + OString implName(OUStringToOString(cImplName, RTL_TEXTENCODING_ASCII_US)); + OString aEnv( pUNO_ENV_LOG ); + sal_Int32 nIndex = 0; + do + { + const OString aStr( aEnv.getToken( 0, ';', nIndex ) ); + if ( aStr.equals(implName) ) + { + *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log")); + break; + } + } while( nIndex != -1 ); + } + + } return aExcMsg; } diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl index 2a876af40885..d848f84cb322 100644 --- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl +++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl @@ -367,6 +367,22 @@ published constants AccessibleEventId old and new accessible objects representing the table summary. */ const short TABLE_SUMMARY_CHANGED = 31; + + /** Constant used to indicate that a list box entry has been expanded. + <member>AccessibleEventObject::OldValue</member> is empty. + <member>AccessibleEventObject::NewValue</member> contains the expanded list box entry. + + @since OOo 3.2 + */ + const short LISTBOX_ENTRY_EXPANDED = 32; + + /** Constant used to indicate that a list box entry has been collapsed. + <member>AccessibleEventObject::OldValue</member> is empty. + <member>AccessibleEventObject::NewValue</member> contains the collapsed list box entry. + + @since OOo 3.2 + */ + const short LISTBOX_ENTRY_COLLAPSED = 33; }; }; }; }; }; diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl new file mode 100644 index 000000000000..67e5b7572de3 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl @@ -0,0 +1,54 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: UnoControlEdit.idl,v $ + * $Revision: 1.9 $ + * + * 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 __com_sun_star_awt_DefaultGridColumnModel_idl__ +#define __com_sun_star_awt_DefaultGridColumnModel_idl__ + +#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__ +#include <com/sun/star/awt/grid/XGridColumnModel.idl> +#endif + +//============================================================================= + + module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service. + */ +service DefaultGridColumnModel +{ + interface com::sun::star::awt::grid::XGridColumnModel; +}; + +//============================================================================= + +}; }; }; };}; + +#endif diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl new file mode 100644 index 000000000000..40a77668887c --- /dev/null +++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl @@ -0,0 +1,54 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: UnoControlEdit.idl,v $ + * $Revision: 1.9 $ + * + * 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 __com_sun_star_awt_DefaultGridDataModel_idl__ +#define __com_sun_star_awt_DefaultGridDataModel_idl__ + +#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__ +#include <com/sun/star/awt/grid/XGridDataModel.idl> +#endif + +//============================================================================= + + module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service. + */ +service DefaultGridDataModel +{ + interface com::sun::star::awt::grid::XGridDataModel; +}; + +//============================================================================= + +}; }; }; };}; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl new file mode 100644 index 000000000000..90db6f82b258 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridColumn.idl @@ -0,0 +1,54 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: UnoControlEdit.idl,v $ + * $Revision: 1.9 $ + * + * 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 __com_sun_star_awt_GridColumn_idl__ +#define __com_sun_star_awt_GridColumn_idl__ + +#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ +#include <com/sun/star/awt/grid/XGridColumn.idl> +#endif + +//============================================================================= + + module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** Represents a column as used by the <type>DefaultGridColumnModel</type> + */ +service GridColumn +{ + interface com::sun::star::awt::grid::XGridColumn; +}; + +//============================================================================= + +}; }; }; };}; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl new file mode 100644 index 000000000000..c6c5ac646cdf --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl @@ -0,0 +1,79 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ActionEvent.idl,v $ + * $Revision: 1.11 $ + * + * 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 __com_sun_star_awt_grid_GridColumnEvent_idl__ +#define __com_sun_star_awt_grid_GridColumnEvent_idl__ + +#ifndef __com_sun_star_lang_EventObject_idl__ +#include <com/sun/star/lang/EventObject.idl> +#endif + +#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ +#include <com/sun/star/awt/grid/XGridColumn.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An event used by a <type>XGridColumnModel</type> to notify changes in the column + model to the <type>XGridControl</type>. + You usually need to fill this event only if you implement the <type>XGridColumnModel</type> + yourself. + + @see XGridColumnModel + @see XGridControl + @see XGridColumnListener + */ +struct GridColumnEvent: com::sun::star::lang::EventObject +{ + /** Contains the property name of the changed value **/ + string valueName; + + /** Contains the old value **/ + any oldValue; + + /** Contains the new value **/ + any newValue; + + /** Contains the index of the changed column**/ + long index; + + /** Contains the changed column**/ + XGridColumn column; + //------------------------------------------------------------------------- +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridControlEvent.idl b/offapi/com/sun/star/awt/grid/GridControlEvent.idl new file mode 100644 index 000000000000..87b3a9064387 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridControlEvent.idl @@ -0,0 +1,57 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ActionEvent.idl,v $ + * $Revision: 1.11 $ + * + * 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 __com_sun_star_awt_GridControlEvent_idl__ +#define __com_sun_star_awt_GridControlEvent_idl__ + +#ifndef __com_sun_star_lang_EventObject_idl__ +#include <com/sun/star/lang/EventObject.idl> +#endif + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + + +struct GridControlEvent: com::sun::star::lang::EventObject +{ + //------------------------------------------------------------------------- + + string ActionCommand; + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl new file mode 100644 index 000000000000..a4ff1a58d5c7 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl @@ -0,0 +1,82 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ActionEvent.idl,v $ + * $Revision: 1.11 $ + * + * 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 __com_sun_star_awt_grid_GridDataEvent_idl__ +#define __com_sun_star_awt_grid_GridDataEvent_idl__ + +#ifndef __com_sun_star_lang_EventObject_idl__ +#include <com/sun/star/lang/EventObject.idl> +#endif + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An event used by a <type>XGridDataModel</type> to notify changes in the data + model to the <type>XGridControl</type>. + You usually need to fill this event only if you implement the <type>XGridDataModel</type> + yourself. + + @see XGridDataModel + @see XGridControl + @see XGridDataListener + */ +struct GridDataEvent: com::sun::star::lang::EventObject +{ + //------------------------------------------------------------------------- + + /** Contains the property name of the changed value **/ + string valueName; + + /** Contains the old value **/ + any oldValue; + + /** Contains the new value **/ + any newValue; + + /** Contains the index of the changed row**/ + long index; + + /** Contains the header name of the changed row**/ + string headerName; + + /** Contains the changed row**/ + sequence<string> rowData; + + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl new file mode 100644 index 000000000000..a2ec28361ca0 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl @@ -0,0 +1,71 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ActionEvent.idl,v $ + * $Revision: 1.11 $ + * + * 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 __com_sun_star_awt_GridSelectionEvent_idl__ +#define __com_sun_star_awt_GridSelectionEvent_idl__ + +#ifndef __com_sun_star_lang_EventObject_idl__ +#include <com/sun/star/lang/EventObject.idl> +#endif + +#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ +#include <com/sun/star/awt/grid/SelectionEventType.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An event used by a <type>XGridControl</type> to notify changes in the selection. + + @see XGridControl + @see XGridSelectionListener + */ +struct GridSelectionEvent: com::sun::star::lang::EventObject +{ + //------------------------------------------------------------------------- + + /** Contains the x coordinate of the selected cell**/ + long x; + + /** Contains the y coordinate of the selected cell**/ + long y; + + /** Contains the action <type>SelectionEventType</types> that was performed **/ + SelectionEventType action; + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/ScrollBarMode.idl b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl new file mode 100644 index 000000000000..579ca0bab1ae --- /dev/null +++ b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl @@ -0,0 +1,73 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: AdjustmentType.idl,v $ + * $Revision: 1.7 $ + * + * 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 __com_sun_star_awt_grid_ScrollBarMode_idl__ +#define __com_sun_star_awt_grid_ScrollBarMode_idl__ + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** specifies the adjustment type. + */ +enum ScrollBarMode +{ + //------------------------------------------------------------------------- + + /** adjustment is originated by a line jump. + + <p>A line jump can, for example, be caused by a click on + one of the pointer buttons.</p> + */ + AUTO, + + //------------------------------------------------------------------------- + + /** adjustment is originated by a page jump. + + <p>A page jump can, for example, be caused by a click in the + background area of the scrollbar (neither one of the pointer + buttons, nor the thumb).</p> + */ + ON, + + OFF + + + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl new file mode 100644 index 000000000000..4d8aa7fc0cdb --- /dev/null +++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl @@ -0,0 +1,63 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: AdjustmentType.idl,v $ + * $Revision: 1.7 $ + * + * 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 __com_sun_star_awt_grid_SelectionEventType_idl__ +#define __com_sun_star_awt_grid_SelectionEventType_idl__ + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** specifies the type of a selection event, as used by + <type>GridSelectionEvent</type>. + */ +enum SelectionEventType +{ + //------------------------------------------------------------------------- + + /** This value indicates that a selection was added to the grid control + */ + ADD, + + //------------------------------------------------------------------------- + + /** This value indicates that a selection was removed from the grid control + */ + REMOVE + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl new file mode 100644 index 000000000000..d45bf024afb1 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl @@ -0,0 +1,84 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: UnoControlEdit.idl,v $ + * $Revision: 1.9 $ + * + * 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 __com_sun_star_awt_UnoControlGrid_idl__ +#define __com_sun_star_awt_UnoControlGrid_idl__ + +#ifndef __com_sun_star_awt_UnoControl_idl__ +#include <com/sun/star/awt/UnoControl.idl> +#endif + +#ifndef __com_sun_star_awt_grid_XGridControl_idl__ +#include <com/sun/star/awt/grid/XGridControl.idl> +#endif + +//============================================================================= + + module com { module sun { module star { module awt { module grid { + +//============================================================================= + +//============================================================================= + +/** A control that displays a set of tabular data. + + <p> + <h4>The Column Model</h4> + <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type> + The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model. + </p> + <p> + <h4>The Data Model</h4> + <p> All row data are stored in the <type>XGridDataModel</type>. + Use the <type>DefaultGridDataModel</type> to add <member>XGridDataModel::addRow()</member> or remove <member>XGridDataModel::removeRow()</member> rows. + </p> + + <p>The column and data model must be set at the <member>UnoControlGridModel::ColumnModel</member> and <member>UnoControlGridModel::GridDataModel</member> properties.</p> + + <h4>Selection</h4> + <p>If you are interested in knowing when the selection changes implement a + <type>XGridSelectionListener</type> and add the instance with the method + <member>XGridSelection::addSelectionListener()</member>. + You than will be notified for any selection change. + + The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control. + </p> + */ +service UnoControlGrid +{ + service com::sun::star::awt::UnoControl; + + interface com::sun::star::awt::grid::XGridControl; +}; + +//============================================================================= + +}; }; }; };}; + +#endif diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl new file mode 100644 index 000000000000..eabe7515fb5c --- /dev/null +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -0,0 +1,101 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: UnoControlEditModel.idl,v $ + * $Revision: 1.16 $ + * + * 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 __com_sun_star_awt_grid_UnoControlGridModel_idl__ +#define __com_sun_star_awt_grid_UnoControlGridModel_idl__ + +#include <com/sun/star/awt/grid/XGridColumnModel.idl> + +#include <com/sun/star/awt/grid/XGridDataModel.idl> + +#include <com/sun/star/awt/grid/ScrollBarMode.idl> + +#include <com/sun/star/awt/UnoControlModel.idl> + +#include <com/sun/star/view/SelectionType.idl> + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** specifies the standard model of a <type>UnoControlGridModel</type>. + */ +service UnoControlGridModel +{ + /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */ + service com::sun::star::awt::UnoControlModel; + + /** Specifies whether the grid control should display a special header column. + <p>The default value is <FALSE/></p> + */ + [property] boolean ShowRowHeader; + + /** Specifies whether the grid control should display a title row. + <p>The default value is <TRUE/></p> + */ + [property] boolean ShowColumnHeader; + + /** Specifies the <type>XGridColumnModel</type> that is providing the column structure. + + <p>You can implement your own instance of <type>XGridColumnModel</type> or use + the <type>DefaultGridColumnModel</type>. + */ + [property] XGridColumnModel ColumnModel; + + /** Specifies the <type>XGridDataModel</type> that is providing the hierarchical data. + + <p>You can implement your own instance of <type>XGridDataModel</type> or use + the <type>DefaultGridDataModel</type>. + */ + [property] XGridDataModel DataModel; + + /** Specifies the vertical scrollbar mode. + <p>The default value is <FALSE/></p> + */ + [property] boolean HScroll; + + /** Specifies the horizontal scrollbar mode. + <p>The default value is <FALSE/></p> + */ + [property] boolean VScroll; + + /** Specifies the selection mode that is enabled for this grid control. + <p>The default value is <member scope="com::sun::star::view">SelectionType::SINGLE</member></p> + */ + [property] ::com::sun::star::view::SelectionType SelectionModel; + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl new file mode 100644 index 000000000000..40f55109e24c --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridCell.idl @@ -0,0 +1,59 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridCell_idl__ +#define __com_sun_star_awt_grid_XGridCell_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +interface XGridCell: com::sun::star::uno::XInterface +{ + + [attribute] string Value; + + [attribute] boolean Editable; + + [attribute] any Data; +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl new file mode 100644 index 000000000000..88fd77697876 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl @@ -0,0 +1,56 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridCellRenderer_idl__ +#define __com_sun_star_awt_grid_XGridCellRenderer_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** gives access to the items of a list box and makes it possible to + register item and action event listeners. + */ +interface XGridCellRenderer: com::sun::star::uno::XInterface +{ + //------------------------------------------------------------------------- + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl new file mode 100644 index 000000000000..741af231ed03 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -0,0 +1,72 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XGridColumn.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridColumn_idl__ +#define __com_sun_star_awt_grid_XGridColumn_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control + */ +interface XGridColumn: com::sun::star::uno::XInterface +{ + /** Specifies the an idendifier of the colomn.**/ + [attribute] any Identifier; + + /** Specifies the default column witdth. **/ + [attribute] long ColumnWidth; + /* + [attribute] long PreferredWidth; + + [attribute] long MinWidth; + + [attribute] long MaxWidth; + + [attribute] boolean Resizable; + */ + + /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/ + [attribute] string Title; + + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl new file mode 100644 index 000000000000..09a2b602e800 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl @@ -0,0 +1,74 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridColumnListener_idl__ +#define __com_sun_star_awt_grid_XGridColumnListener_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + +#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__ +#include <com/sun/star/awt/grid/GridColumnEvent.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An instance of this interface is used by the <type>XGridColumnModel</type> to + get notifications about column model changes. + + <p>Usually you must not implement this interface yourself, but you must notify it correctly if + you implement the <type>XGridColumnModel</type> yourself</p>. + */ +interface XGridColumnListener: com::sun::star::uno::XInterface +{ + /** + Invoked after a column was added to the column model. + */ + void columnAdded( [in] GridColumnEvent event ); + + /** + Invoked after a column was removed from the column model. + */ + void columnRemoved( [in] GridColumnEvent event ); + + /** + Invoked after a column was modified. + */ + void columnChanged( [in] GridColumnEvent event ); +}; +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl new file mode 100644 index 000000000000..f4cf2a7a3694 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl @@ -0,0 +1,116 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridColumnModel_idl__ +#define __com_sun_star_awt_grid_XGridColumnModel_idl__ + +#include <com/sun/star/uno/XInterface.idl> + +#include <com/sun/star/awt/grid/XGridColumn.idl> +#include <com/sun/star/awt/grid/XGridColumnListener.idl> + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An instance of this interface is used by the <type>UnoControlGrid</type> to + retrieve the column structure that is displayed in the actual control. + + If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>. +*/ +interface XGridColumnModel: com::sun::star::uno::XInterface +{ + /** Specifies whether column selection is allowed + */ + [attribute] boolean ColumnSelectionAllowed; + + /** Returns the number of columns. + @returns + the number of columns. + */ + long getColumnCount(); + + /** Adds a column to the model. + @param column + the column to add to the model. + + @returns + the index of new created column. + */ + long addColumn( [in] XGridColumn column ); + + /* + long getSelectedCount(); + + sequence<XGridColumn> getSelectedColumns(); + + sequence<long> getSelectedIndex(); + + */ + + /** Returns all columns of the model. + @returns + all columns associated with the model in a sequence of <type>XGridColumn</type>. + */ + sequence<XGridColumn> getColumns(); + + /** Returns a specific column. + @param index + the position of the reuquested column. + @returns + the requested column. + */ + XGridColumn getColumn( [in] long index); + + /* + long getTotalColumnWidth(); + */ + + /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes. + @param Listener + the listener to add. + */ + [oneway] void addColumnListener( [in] XGridColumnListener listener); + + //------------------------------------------------------------------------- + + /** Removes a listener previously added with <method>addColumnListener()</method>. + @param Listener + the listener to remove. + */ + [oneway] void removeColumnListener( [in] XGridColumnListener listener); +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl new file mode 100644 index 000000000000..fc7c23c720a1 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridControl.idl @@ -0,0 +1,78 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridControl_idl__ +#define __com_sun_star_awt_grid_XGridControl_idl__ + +#include <com/sun/star/awt/grid/XGridSelection.idl> +#include <com/sun/star/awt/grid/XGridColumnModel.idl> +#include <com/sun/star/awt/grid/XGridDataModel.idl> +#include <com/sun/star/awt/XMouseListener.idl> + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An interface to a control that displays a tabular data. + + @see UnoControlGrid + */ +interface XGridControl: XGridSelection +{ + /** Specifies the <type>XGridColumnModel</type> of the control. + */ + [attribute] XGridColumnModel ColumnModel; + + /** Specifies the <type>XGridDataModel</type> of the control. + */ + [attribute] XGridDataModel DataModel; + + + /** Converting + */ + + long getItemIndexAtPoint( [in] long x, [in] long y); + + /** registers a listener for mouse events. + */ + //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); + + /** unregisters a listener for mouse events. + */ + //[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener ); + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl new file mode 100644 index 000000000000..c7fa1fd41e2f --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridControlListener_idl__ +#define __com_sun_star_awt_grid_XGridControlListener_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +interface XGridControlListener: com::sun::star::uno::XInterface +{ + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl new file mode 100644 index 000000000000..ce6479496034 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl @@ -0,0 +1,76 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridDataListener_idl__ +#define __com_sun_star_awt_grid_XGridDataListener_idl__ + +#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ +#include <com/sun/star/awt/grid/GridDataEvent.idl> +#endif + +#ifndef __com_sun_star_lang_XEventListener_idl__ +#include <com/sun/star/lang/XEventListener.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An instance of this interface is used by the <type>XGridDataModel</type> to + get notifications about data model changes. + + <p>Usually you must not implement this interface yourself, but you must notify it correctly if + you implement the <type>XGridDataModel</type> yourself</p>. + */ +interface XGridDataListener: com::sun::star::lang::XEventListener +{ + + /** + Invoked after a row was added to the data model. + */ + void rowAdded( [in] GridDataEvent Event ); + + /** + Invoked after a row was added to the data model. + */ + void rowRemoved( [in] GridDataEvent Event ); + + /** + Invoked after a row was added to the data model. + */ + void dataChanged( [in] GridDataEvent Event ); +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl new file mode 100644 index 000000000000..17e224fa6b41 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -0,0 +1,110 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridDataModel_idl__ +#define __com_sun_star_awt_grid_XGridDataModel_idl__ + + +#include <com/sun/star/lang/XComponent.idl> +#include <com/sun/star/awt/grid/XGridDataListener.idl> + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= +/** An instance of this interface is used by the <type>UnoControlGrid</type> to + retrieve the content data that is displayed in the actual control. + + If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>. +*/ +interface XGridDataModel: ::com::sun::star::lang::XComponent +{ + /** Specifies the height of each row. + */ + [attribute] long RowHeight; + + /** Contains the row header. + */ + [attribute] sequence< string > RowHeaders; + + /** Returns the content of each row. + */ + [attribute,readonly] sequence< sequence< string > > Data; + + /** Returns the number of rows in in the model. + @returns + the number of rows. + */ + long getRowCount(); + + /** Adds a row to the model. + + @param headername + specifies the name of the row. + @param data + the content of the row. + */ + void addRow( [in] string headername, [in] sequence< string > data ); + + /** Removes a row from the model. + + @param index + the index of the row that should be removed. + */ + void removeRow( [in] long index); + + /** Removes all rows from the model. + */ + void removeAll(); + + //------------------------------------------------------------------------- + + /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes. + @param Listener + the listener to add. + */ + [oneway] void addDataListener( [in] XGridDataListener listener); + + //------------------------------------------------------------------------- + + /** Removes a listener previously added with <method>addDataListener()</method>. + @param Listener + the listener to remove. + */ + [oneway] void removeDataListener( [in] XGridDataListener listener); + +}; + +//============================================================================= + +}; }; }; };}; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl new file mode 100644 index 000000000000..b567b7570ddc --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl @@ -0,0 +1,126 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridSelection_idl__ +#define __com_sun_star_awt_grid_XGridSelection_idl__ + +#include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/awt/grid/XGridSelectionListener.idl> +#include <com/sun/star/view/SelectionType.idl> + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. + */ +interface XGridSelection: com::sun::star::uno::XInterface +{ + /** Returns the lowest index of the selection. + @returns + the lowest index. + */ + long getMinSelectionIndex(); + + /** Returns the highest index of the selection. + @returns + the highest index. + */ + long getMaxSelectionIndex(); + + /** Adds a selection intervall. + @param start + the start row index. + @param length + the number of rows to be selected. + */ + [oneway] void insertIndexIntervall( [in] long start, [in] long length); + + /** Removes a selection intervall. + @param start + the start row index. + @param length + the number of rows to be selected. + */ + [oneway] void removeIndexIntervall( [in] long start, [in] long length); + + /** Returns the indicies of all selected rows. + @returns + a sequence of indicies. + */ + sequence< long > getSelection(); + + /** Returns whether rows are selected. + @returns + <true/> if rows are selected otherwise <false/>. + */ + boolean isSelectionEmpty(); + + /** Returns whether a specific row is selected. + @param + the index of a row. + @returns + <true/> if row are selected otherwise <false/>. + */ + boolean isSelectedIndex( [in] long index); + + /** Marks a row as selected. + @param + the index of a row. + */ + [oneway] void selectRow( [in] long y); + + /* + [oneway] void selectColumn( [in] long x); + */ + + /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes. + @param Listener + the listener to add. + */ + [oneway] void addSelectionListener( [in] XGridSelectionListener listener); + + //------------------------------------------------------------------------- + + /** Removes a listener previously added with <method>addSelectionListener()</method>. + @param Listener + the listener to remove. + */ + [oneway] void removeSelectionListener( [in] XGridSelectionListener listener); + + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl new file mode 100644 index 000000000000..eba8d794d3c0 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl @@ -0,0 +1,66 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XListBox.idl,v $ + * $Revision: 1.8 $ + * + * 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 __com_sun_star_awt_grid_XGridSelectionListener_idl__ +#define __com_sun_star_awt_grid_XGridSelectionListener_idl__ + +#ifndef __com_sun_star_lang_XEventListener_idl__ +#include <com/sun/star/lang/XEventListener.idl> +#endif + +#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__ +#include <com/sun/star/awt/grid/GridSelectionEvent.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** An instance of this interface is used by the <type>XGridSelection</type> to + get notifications about selection changes. + + <p>Usually you must not implement this interface yourself, but you must notify it correctly if + you implement the <type>XGridSelection</type> yourself</p>. + */ +interface XGridSelectionListener: com::sun::star::lang::XEventListener +{ + //------------------------------------------------------------------------- + /** Invoked after a selection was changed. + */ + [oneway] void selectionChanged( [in] GridSelectionEvent gridSelectionEvent); + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk new file mode 100644 index 000000000000..124ca44edd09 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/makefile.mk @@ -0,0 +1,68 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.3 $ +# +# 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=api + +TARGET=cssawtgrid +PACKAGE=com$/sun$/star$/awt$/grid + +# --- Settings ----------------------------------------------------- + +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# ------------------------------------------------------------------------ +IDLFILES=\ + GridColumnEvent.idl\ + GridControlEvent.idl\ + GridDataEvent.idl\ + SelectionEventType.idl\ + GridSelectionEvent.idl\ + XGridControlListener.idl\ + XGridSelectionListener.idl\ + XGridSelection.idl\ + XGridColumn.idl\ + XGridColumnListener.idl\ + XGridDataListener.idl\ + XGridCell.idl\ + XGridCellRenderer.idl\ + DefaultGridDataModel.idl\ + XGridDataModel.idl\ + XGridColumnModel.idl\ + ScrollBarMode.idl\ + XGridControl.idl\ + UnoControlGrid.idl\ + UnoControlGridModel.idl +# ------------------------------------------------------------------ + +.INCLUDE : target.mk +.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl new file mode 100644 index 000000000000..64fba52e3339 --- /dev/null +++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl @@ -0,0 +1,72 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: FilledNetDiagram.idl,v $ + * $Revision: 1.10 $ + * + * 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 __com_sun_star_chart_FilledNetDiagram_idl__ +#define __com_sun_star_chart_FilledNetDiagram_idl__ + +#ifndef __com_sun_star_chart_Diagram_idl__ +#include <com/sun/star/chart/Diagram.idl> +#endif + +#ifndef __com_sun_star_chart_StackableDiagram_idl__ +#include <com/sun/star/chart/StackableDiagram.idl> +#endif + +#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ +#include <com/sun/star/chart/ChartAxisXSupplier.idl> +#endif + +#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ +#include <com/sun/star/chart/ChartAxisYSupplier.idl> +#endif + + +//============================================================================= + + module com { module sun { module star { module chart { + +//============================================================================= + +/** specifies filled net diagrams. @since OOo 3.2 + + <p>Net diagrams are also known as radar diagrams.</p> + */ +published service FilledNetDiagram +{ + service com::sun::star::chart::Diagram; + service com::sun::star::chart::ChartAxisXSupplier; + service com::sun::star::chart::ChartAxisYSupplier; + service com::sun::star::chart::StackableDiagram; +}; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk index 802c832ea154..781c78d08177 100644 --- a/offapi/com/sun/star/chart/makefile.mk +++ b/offapi/com/sun/star/chart/makefile.mk @@ -91,6 +91,7 @@ IDLFILES=\ Diagram.idl\ Dim3DDiagram.idl\ DonutDiagram.idl\ + FilledNetDiagram.idl\ LineDiagram.idl\ MissingValueTreatment.idl\ NetDiagram.idl\ diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl index eff5c91aa645..23574e24dd18 100644 --- a/offapi/com/sun/star/style/ParagraphProperties.idl +++ b/offapi/com/sun/star/style/ParagraphProperties.idl @@ -448,6 +448,15 @@ published service ParagraphProperties */ [optional, property] string ListId; + //------------------------------------------------------------------------- + /** specifies the outline level to which the paragraph belongs + + @since OOo 3.1 + + <p>Value 0 indicates that the paragraph belongs to the body text.</p> + <p>Values [1..10] indicates that the paragraph belongs to the corresponding outline level.</p> + */ + [optional, property] short OutlineLevel; }; //============================================================================= diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl index 792cac35f583..eadf841134e3 100644 --- a/offapi/com/sun/star/text/BaseFrameProperties.idl +++ b/offapi/com/sun/star/text/BaseFrameProperties.idl @@ -354,6 +354,26 @@ published service BaseFrameProperties */ [optional, property, maybevoid] com::sun::star::awt::Size LayoutSize; + //------------------------------------------------------------------------- + /** contains short title for the object + + <p>This short title is visible as an alternative tag in HTML format. + Accessibility tools can read this text.</p> + + @since OOo 3.2 + */ + [optional, property] string Title; + + //------------------------------------------------------------------------- + /** contains description for the object + + <p>The long description text can be entered to describe a object in + more detail to users with screen reader software. The description is + visible as an alternative tag for accessibility tools.</p> + + @since OOo 3.2 + */ + [optional, property] string Description; }; //============================================================================= diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl index 6fc5e45430f2..1d1d32bf17a8 100644 --- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl +++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl @@ -78,14 +78,26 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface com::sun::star::security::XCertificate createCertificateFromAscii( [in] string asciiCertificate ) raises( com::sun::star::uno::SecurityException ) ; /** - * Verify a certificate. - * - * The method provides a way to verify a certificate. - * - * The validation status will returned as a bit-wise long, please refer to - * CertificateValidity definition. + Verify a certificate. + + The method provides a way to verify a certificate. + @param xEECertificate + The certificate which is to be validated. + + @param intermediateCertificates + Additional certificates which can be used by the method in constructing + the certificate chain. The root certificate may also be contained. However, + the implementation must check if the root certificate is indeed trusted by + the user. + All entries of the sequence must be non-null references. + + @return + The validation status will returned as a bit-wise long, please refer to + CertificateValidity definition. */ - long verifyCertificate( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ; + long verifyCertificate( [in] com::sun::star::security::XCertificate xEECertificate, + [in] sequence< com::sun::star::security::XCertificate > intermediateCertificates) + raises( com::sun::star::uno::SecurityException ) ; /** * Get a certificate characters. diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl new file mode 100644 index 000000000000..de5f8df99397 --- /dev/null +++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl @@ -0,0 +1,102 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XSAXSerializable.idl,v $ + * $Revision: 1.3 $ + * + * 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 __com_sun_star_xml_sax_XFastSAXSerializable_idl__ +#define __com_sun_star_xml_sax_XFastSAXSerializable_idl__ + +#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ +#include <com/sun/star/xml/sax/XFastDocumentHandler.idl> +#endif + +#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ +#include <com/sun/star/xml/sax/XFastTokenHandler.idl> +#endif + +#ifndef __com_sun_star_beans_StringPair_idl__ +#include <com/sun/star/beans/StringPair.idl> +#endif + +#ifndef __com_sun_star_beans_Pair_idl__ +#include <com/sun/star/beans/Pair.idl> +#endif + +module com { module sun { module star { module xml { module sax { + +//============================================================================= +/** serializes a DOM tree by generating FastSAX events. + + <p> + </p> + + @since OOo 3.1 + +*/ +interface XFastSAXSerializable +{ + + //------------------------------------------------------------------------- + /** serializes an object (e.g. a DOM tree) that represents an XML document + by generating fast SAX events. + + @param handler + the SAX event handler that should receive the generated events + @param tokenHandler + the fast SAX token handler that is used to translate names + @param namespaces + a list of namespace declarations that will be added to the root + element node of the XML document + <p> + This is necessary mostly because the DOM implementation does + not permit attaching namespaces declarations directly to nodes, + which may lead to duplicate namespace declarations on export, + and thus larger documents. + Note that the first part of each tuple is the prefix, + e.g. "office", and the second is the numeric namespace identifier. + </p> + @param registerNamespaces + a list of namespace url / namespace token pairs. you need + to register all namespace in order to have them recognized + during export. Namespace tokens must be greater than + FastToken::NAMESPACE. + </p> + + @throws com::sun::star::xml::sax::SAXException + if serializing the XML document fails + */ + void fastSerialize([in] sax::XFastDocumentHandler handler, + [in] sax::XFastTokenHandler tokenHandler, + [in] sequence< beans::StringPair > namespaces, + [in] sequence< beans::Pair<string, long> > registerNamespaces) + raises( com::sun::star::xml::sax::SAXException ); +}; + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/xml/sax/makefile.mk b/offapi/com/sun/star/xml/sax/makefile.mk index 2fe672ffb219..87319dca8a9a 100644 --- a/offapi/com/sun/star/xml/sax/makefile.mk +++ b/offapi/com/sun/star/xml/sax/makefile.mk @@ -58,6 +58,7 @@ IDLFILES=\ XFastParser.idl\ XFastDocumentHandler.idl\ XFastContextHandler.idl\ + XFastSAXSerializable.idl\ XFastSerializer.idl\ XFastShapeContextHandler.idl\ XFastTokenHandler.idl\ diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst index ede720d44540..6b4a0b95a054 100644 --- a/offapi/prj/build.lst +++ b/offapi/prj/build.lst @@ -7,6 +7,7 @@ oa offapi\com\sun\star\auth nmake - all oa_auth NULL oa offapi\com\sun\star\accessibility nmake - all oa_accessibility oa_awt NULL oa offapi\com\sun\star\awt nmake - all oa_awt NULL oa offapi\com\sun\star\awt\tree nmake - all oa_awttree NULL +oa offapi\com\sun\star\awt\grid nmake - all oa_awtgrid NULL oa offapi\com\sun\star\chart nmake - all oa_chart NULL oa offapi\com\sun\star\chart2 nmake - all oa_chart2 NULL oa offapi\com\sun\star\chart2\data nmake - all oa_chart2_data NULL @@ -103,4 +104,4 @@ oa offapi\com\sun\star\geometry nmake - all oa_geometry NULL oa offapi\com\sun\star\rendering nmake - all oa_rendering oa_geometry NULL oa offapi\com\sun\star\rdf nmake - all oa_rdf oa_datatransfer oa_text NULL oa offapi\drafts\com\sun\star\form nmake - all oa_drafts_form NULL -oa offapi\util nmake - all oa_util oa_auth oa_awt oa_awttree oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement NULL +oa offapi\util nmake - all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement NULL diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst index f0ec9d7549e7..9532cd773c6f 100644 --- a/offapi/prj/d.lst +++ b/offapi/prj/d.lst @@ -12,6 +12,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\animations mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\auth mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree +mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data @@ -127,6 +128,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\drafts\com\sun\star\form ..\com\sun\star\auth\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\auth ..\com\sun\star\awt\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt ..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree +..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid ..\com\sun\star\chart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart ..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2 ..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk index 52b63249839a..fcf3e4bd6c02 100644 --- a/offapi/util/makefile.mk +++ b/offapi/util/makefile.mk @@ -45,6 +45,7 @@ UNOIDLDBFILES= \ $(UCR)$/cssauth.db \ $(UCR)$/cssawt.db \ $(UCR)$/cssawttree.db \ + $(UCR)$/cssawtgrid.db \ $(UCR)$/csschart.db \ $(UCR)$/csschart2.db \ $(UCR)$/csschart2data.db \ diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst index a18d037a4c2f..0e85b261e8e2 100644 --- a/offuh/prj/d.lst +++ b/offuh/prj/d.lst @@ -7,6 +7,7 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\auth mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree +mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\beans mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation @@ -139,6 +140,8 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf ..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hpp ..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hdl ..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hpp +..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hdl +..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hpp ..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hdl ..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hpp ..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hdl diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index a6ceb8c4e160..bed549bca19f 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -30,7 +30,6 @@ #include <pyuno/pyuno.hxx> -#include <osl/module.hxx> #include <osl/process.h> #include <osl/file.h> #include <osl/thread.h> @@ -116,27 +115,6 @@ Sequence< OUString > getSupportedServiceNames() return Sequence< OUString > ( &serviceName, 1 ); } -static OUString getLibDir() -{ - static OUString *pLibDir; - if( !pLibDir ) - { - osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); - if( ! pLibDir ) - { - static OUString libDir; - - if( osl::Module::getUrlFromAddress( - reinterpret_cast< oslGenericFunction >(getLibDir) , libDir ) ) - { - libDir = OUString( libDir.getStr(), libDir.lastIndexOf('/' ) ); - } - pLibDir = &libDir; - } - } - return *pLibDir; -} - static void setPythonHome ( const OUString & pythonHome ) { OUString systemPythonHome; @@ -190,16 +168,13 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c { OUString pythonPath; OUString pythonHome; - OUString path = getLibDir(); - if( path.getLength() ) - { - path += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SAL_CONFIGFILE("pythonloader.uno" ))); - rtl::Bootstrap bootstrap(path); + OUString path( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR/program/" SAL_CONFIGFILE("pythonloader.uno" ))); + rtl::Bootstrap::expandMacros(path); //TODO: detect failure + rtl::Bootstrap bootstrap(path); - // look for pythonhome - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome ); - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath ); - } + // look for pythonhome + bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome ); + bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath ); // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console // sadly, there is no api for setting the pythonpath, we have to use the environment variable diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index e2a91cf3fd03..52a8561588c2 100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -142,7 +142,9 @@ STDSHL= .IF "$(COM)"=="GCC" SHL1STDLIBS=\ -lmingw32 \ - -lgcc + $(MINGW_LIBGCC) +MINGWSSTDOBJ= +MINGWSSTDENDOBJ= .ELSE SHL1STDLIBS=\ unicows.lib diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index f56e6f88f058..bc8026aa860f 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -113,6 +113,10 @@ SHL1STDLIBS= \ $(COMDLG32LIB)\ $(USER32LIB)\ $(OLE32LIB) +.IF "$(COM)"=="GCC" +MINGWSSTDOBJ= +MINGWSSTDENDOBJ= +.ENDIF .ENDIF # WNT .IF "$(GUI)"=="UNX" diff --git a/ure/source/README b/ure/source/README index 6528c58a537a..eec7dc4177b7 100644 --- a/ure/source/README +++ b/ure/source/README @@ -81,6 +81,7 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/liburp_uno.so [private] /opt/openoffice.org/ure/lib/libunsafe_uno_uno.so [private] /opt/openoffice.org/ure/lib/libaffine_uno_uno.so [private] +/opt/openoffice.org/ure/lib/liblog_uno_uno.so [private] /opt/openoffice.org/ure/lib/libjpipe.so [private] /opt/openoffice.org/ure/lib/libjuh.so [private] /opt/openoffice.org/ure/lib/libjuhx.so [private] @@ -142,6 +143,7 @@ Program Files\URE\bin\cli_uno.dll [private] Program Files\URE\bin\urp_uno.dll [private] Program Files\URE\bin\unsafe_uno_uno.dll [private] Program Files\URE\bin\affine_uno_uno.dll [private] +Program Files\URE\bin\log_uno_uno.dll [private] Program Files\URE\bin\jpipe.dll [private] Program Files\URE\bin\juh.dll [private] Program Files\URE\bin\juhx.dll [private] |