You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2014/01/03 15:45:04 UTC
svn commit: r1555112 [11/18] - in /openoffice/branches/rejuvenate01: ./
main/ main/autodoc/source/parser_i/idoc/ main/dbaccess/source/shared/
main/helpcontent2/source/text/shared/01/
main/offapi/com/sun/star/accessibility/ main/offapi/com/sun/star/anim...
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl Fri Jan 3 14:44:44 2014
@@ -73,7 +73,7 @@ module com { module sun { module star
@see AcceleratorConfiguration
@see <type scope="dom::sun::star::util">XFlushable</type>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XAcceleratorConfiguration
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl Fri Jan 3 14:44:44 2014
@@ -55,7 +55,7 @@ module com { module sun { module star {
@see com::sun::star::frame::XFrame
</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl Fri Jan 3 14:44:44 2014
@@ -65,7 +65,7 @@ module com { module sun { module star {
configuration manager uses.</br>
</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XModuleUIConfigurationManager : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@ module com { module sun { module star {
/** allows to retrieve user interface configuration managers related to
OpenOffice.org modules.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XStatusbarItem.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XStatusbarItem.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XStatusbarItem.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XStatusbarItem.idl Fri Jan 3 14:44:44 2014
@@ -31,7 +31,7 @@ module com { module sun { module star
@see <type scope="com::sun::star::frame">XStatusbarController</type>
- @since Apache OpenOffice 4.0
+ @since OpenOffice 4.0
*/
interface XStatusbarItem
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfiguration.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfiguration.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfiguration.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfiguration.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star {
<p>This can be useful for UI to enable/disable some functions without
actually accessing the data.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIConfiguration : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationListener.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationListener.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationListener.idl Fri Jan 3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star {
/** supplies information about changes of a user interface
configuration manager.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIConfigurationListener : com::sun::star::lang::XEventListener
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManager.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManager.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManager.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManager.idl Fri Jan 3 14:44:44 2014
@@ -66,7 +66,7 @@ module com { module sun { module star {
controls the structure of all customizable user interface
elements.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
/** allows to retrieve the user interface configuration manager related to
an object.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl Fri Jan 3 14:44:44 2014
@@ -34,7 +34,7 @@ module com { module sun { module star {
interface configuration data to a storage and to retrieve information
about the current state.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationStorage.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationStorage.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIConfigurationStorage.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@ module com { module sun { module star {
/** supplies functions to change or get information about the storage
of a user interface configuration manager.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XUIConfigurationStorage : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactory.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactory.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactory.idl Fri Jan 3 14:44:44 2014
@@ -63,7 +63,7 @@ module com { module sun { module star {
</ul>
</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIElementFactory : ::com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl Fri Jan 3 14:44:44 2014
@@ -72,7 +72,7 @@ module com { module sun { module star {
</ul>
</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementSettings.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementSettings.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementSettings.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIElementSettings.idl Fri Jan 3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star {
/** provides functions to retrieve and change user interface element structure
data and to update its visible representation.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XUIElementSettings : com::sun::star::uno::XInterface
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIFunctionListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIFunctionListener.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIFunctionListener.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/XUIFunctionListener.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@
/** special interface to receive notification that a user interface
element will execute a function.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XUIFunctionListener : com::sun::star::lang::XEventListener
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl Fri Jan 3 14:44:44 2014
@@ -63,14 +63,14 @@ published constants CommonFilePickerElem
//---------------------------------------------------------------------
/** The label of the filter listbox of a FilePicker dialog.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
const short LISTBOX_FILTER_LABEL = 6;
//---------------------------------------------------------------------
/** The label of the file name listbox of a FilePicker dialog.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
const short EDIT_FILEURL_LABEL = 7;
};
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl Fri Jan 3 14:44:44 2014
@@ -55,7 +55,7 @@ module com { module sun { module star {
<p>Otherwise, the filter operation is canceled.</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service FilterOptionsDialog
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlAccess.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlAccess.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlAccess.idl Fri Jan 3 14:44:44 2014
@@ -47,7 +47,7 @@ module com { module sun { module star {
@see com::sun::star::ui::dialogs::FilePicker
@see com::sun::star::ui::dialogs::FilePicker
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XControlAccess: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlInformation.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlInformation.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/ui/dialogs/XControlInformation.idl Fri Jan 3 14:44:44 2014
@@ -40,7 +40,7 @@ module com { module sun { module star {
/** Interface to query for controls and control properties supported by the
implementing instance.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XControlInformation: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Duration.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Duration.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Duration.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Duration.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star
for example, a Duration of 400 Days is valid.
</p>
- @since OOo 3.3
+ @since OpenOffice 3.3
*/
struct Duration
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Endianness.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Endianness.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Endianness.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Endianness.idl Fri Jan 3 14:44:44 2014
@@ -30,7 +30,7 @@ module com { module sun { module star {
The endianness specifies the order in which the bytes of larger
types are laid out in memory.<p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
constants Endianness
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/ModeChangeEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/ModeChangeEvent.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/ModeChangeEvent.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/ModeChangeEvent.idl Fri Jan 3 14:44:44 2014
@@ -39,7 +39,7 @@ module com { module sun { module star
@see XModeChangeBroadcaster
@see XModeChangeListener
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published struct ModeChangeEvent : com::sun::star::lang::EventObject
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/NumberFormatsSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/NumberFormatsSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/NumberFormatsSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/NumberFormatsSupplier.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@
@see NumberFormats
@see NumberFormatter
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service NumberFormatsSupplier
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/OfficeInstallationDirectories.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/OfficeInstallationDirectories.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/OfficeInstallationDirectories.idl Fri Jan 3 14:44:44 2014
@@ -46,7 +46,7 @@ module com { module sun { module star
possibility to share one office user data directory among parallel office
installtions.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published service OfficeInstallationDirectories
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSettings.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSettings.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSettings.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSettings.idl Fri Jan 3 14:44:44 2014
@@ -53,7 +53,7 @@ module com { module sun { module star
See <type>PathSubstitution</type>
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service PathSettings
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSubstitution.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSubstitution.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSubstitution.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/PathSubstitution.idl Fri Jan 3 14:44:44 2014
@@ -90,7 +90,7 @@ module com { module sun { module star
provide (a) valid substituted path(s).
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service PathSubstitution
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/SortDescriptor2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/SortDescriptor2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/SortDescriptor2.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/SortDescriptor2.idl Fri Jan 3 14:44:44 2014
@@ -40,7 +40,7 @@ module com { module sun { module star
@see com::sun::star::table::TableSortDescriptor2
@see com::sun::star::text::TextSortDescriptor2
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service SortDescriptor2
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Sortable.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Sortable.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Sortable.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/Sortable.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star
@deprecated
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service Sortable
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/VetoException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/VetoException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/VetoException.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/VetoException.idl Fri Jan 3 14:44:44 2014
@@ -36,7 +36,7 @@ module com { module sun { module star
/** thrown to indicate a general veto.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception VetoException : com::sun::star::uno::Exception
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XBroadcaster.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XBroadcaster.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XBroadcaster.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XBroadcaster.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star
/** allows to control notification behaviour of a broadcaster.
- @since OOo 3.0
+ @since OpenOffice 3.0
*/
interface XBroadcaster: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeApproveListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeApproveListener.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeApproveListener.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeApproveListener.idl Fri Jan 3 14:44:44 2014
@@ -46,7 +46,7 @@ module com { module sun { module star
@see XModeChangeBroadcaster
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XModeChangeApproveListener : com::sun::star::lang::XEventListener
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeBroadcaster.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeBroadcaster.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeBroadcaster.idl Fri Jan 3 14:44:44 2014
@@ -52,7 +52,7 @@ module com { module sun { module star
@see XModeChangeListener
@see XModeChangeApproveListener
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XModeChangeBroadcaster : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeListener.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeListener.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XModeChangeListener.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star
@see XModeChangeBroadcaster
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XModeChangeListener : com::sun::star::lang::XEventListener
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl Fri Jan 3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star {
later. In many cases, storing the reference directly would destroy the
relocatability of an office installation.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
published interface XOfficeInstallationDirectories : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XStringSubstitution.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XStringSubstitution.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XStringSubstitution.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XStringSubstitution.idl Fri Jan 3 14:44:44 2014
@@ -46,7 +46,7 @@
of the implementation that must specify these parameters.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XStringSubstitution : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XTimeStamped.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XTimeStamped.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XTimeStamped.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/util/XTimeStamped.idl Fri Jan 3 14:44:44 2014
@@ -47,7 +47,7 @@ module com { module sun { module star {
timestamps, depend on the implementation.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XTimeStamped : ::com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/PrintJobEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/PrintJobEvent.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/PrintJobEvent.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/PrintJobEvent.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star
<p><member scope="com::sun::star::lang">EventObject::Source</member>
contains the <type>XPrintJob</type> having changed its state</p>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published struct PrintJobEvent : com::sun::star::lang::EventObject
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderDescriptor.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderDescriptor.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderDescriptor.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderDescriptor.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star
/** describes the options for Render jobs.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service RenderDescriptor
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderOptions.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderOptions.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderOptions.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/RenderOptions.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star
/** describes the options for Render jobs.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service RenderOptions
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XFormLayerAccess.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XFormLayerAccess.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XFormLayerAccess.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XFormLayerAccess.idl Fri Jan 3 14:44:44 2014
@@ -45,7 +45,7 @@ module com { module sun { module star {
/** provides access to the form layer elements in a view
- @since OOo 2.3
+ @since OpenOffice 2.3
*/
interface XFormLayerAccess
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJob.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJob.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJob.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJob.idl Fri Jan 3 14:44:44 2014
@@ -49,7 +49,7 @@ module com { module sun { module star
@see XPrintJobListener
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XPrintJob : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobBroadcaster.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobBroadcaster.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobBroadcaster.idl Fri Jan 3 14:44:44 2014
@@ -44,7 +44,7 @@ module com { module sun { module star
@see XPrintJobListener
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XPrintJobBroadcaster : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobListener.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobListener.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XPrintJobListener.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star
@see XPrintJobBroadcaster
@see XPrintJob
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XPrintJobListener : com::sun::star::lang::XEventListener
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XRenderable.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XRenderable.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XRenderable.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/view/XRenderable.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star
/** represents something that can be rendered.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XRenderable : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ExportFilter.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ExportFilter.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ExportFilter.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ExportFilter.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star {
a <type scope="com::sun::star::xml::sax">SAXException</type> in the
<type scope="com::sun::star::xml::sax">XDocumentHandler</type> calls.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service ExportFilter
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ImportFilter.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ImportFilter.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ImportFilter.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ImportFilter.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
/** describes an import filter for XML-based file formats.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published service ImportFilter
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
unknown by its parser, that belong to the XML element representing
it (the component).
- @since OOo 2.0.4
+ @since OpenOffice 2.0.4
*/
published service ParaUserDefinedAttributesSupplier
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
unknown by its parser, that belong to the XML element representing
it (the component).
- @since OOo 2.0.4
+ @since OpenOffice 2.0.4
*/
published service TextUserDefinedAttributesSupplier
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
unknown by its parser, that belong to the XML element representing
it (the component).
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
@deprecated because of typo in service name.
Please use the service UserDefinedAttributesSupplier instead.
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
unknown by its parser, that belong to the XML element representing
it (the component).
- @since OOo 2.0.4
+ @since OpenOffice 2.0.4
*/
published service UserDefinedAttributesSupplier
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XExportFilter.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XExportFilter.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XExportFilter.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XExportFilter.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star {
/** interface to implement for an XML-based import filter. i
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XExportFilter: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XImportFilter.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XImportFilter.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XImportFilter.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/XImportFilter.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star {
/** interface to implement for an XML-based import filter.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XImportFilter: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/CipherID.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/CipherID.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/CipherID.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/CipherID.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
algorithms.
@see <type>XCipherContextSupplier</type>
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
constants CipherID
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/DigestID.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/DigestID.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/DigestID.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/DigestID.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
algorithms.
@see <type>XDigestContextSupplier</type>
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
constants DigestID
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContext.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContext.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContext.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContext.idl Fri Jan 3 14:44:44 2014
@@ -46,7 +46,7 @@
</p>
@see <type>XCipherContextSupplier</type>
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
interface XCipherContext : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl Fri Jan 3 14:44:44 2014
@@ -47,7 +47,7 @@
/** This interface allows to get an object that allows to encrypt/decrypt data
using the specified algorithm.
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
interface XCipherContextSupplier : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContext.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContext.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContext.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContext.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@
</p>
@see <type>XDigestContextSupplier</type>
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
interface XDigestContext : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl Fri Jan 3 14:44:44 2014
@@ -47,7 +47,7 @@
/** This interface allows to get an object to generate a digest of a specified
format.
- @since OOo 3.4
+ @since OpenOffice 3.4
*/
interface XDigestContextSupplier : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/dom/XNode.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/dom/XNode.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/dom/XNode.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/dom/XNode.idl Fri Jan 3 14:44:44 2014
@@ -75,7 +75,7 @@ information.</p>
</table></p>
@see <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113">Document Object Model (DOM) Level 2 Core Specification</a> </p>
-@since OOo 2.0
+@since OpenOffice 2.0
*/
interface XNode : com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl Fri Jan 3 14:44:44 2014
@@ -48,7 +48,7 @@ module com { module sun { module star {
<p>
</p>
- @since OOo 3.1
+ @since OpenOffice 3.1
*/
interface XFastSAXSerializable
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XSAXSerializable.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XSAXSerializable.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/sax/XSAXSerializable.idl Fri Jan 3 14:44:44 2014
@@ -40,7 +40,7 @@ module com { module sun { module star {
<p>
</p>
- @since OOo 3.0
+ @since OpenOffice 3.0
*/
interface XSAXSerializable
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/xpath/XPathException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/xpath/XPathException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/xpath/XPathException.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/xml/xpath/XPathException.idl Fri Jan 3 14:44:44 2014
@@ -34,7 +34,7 @@ module com { module sun { module star {
//=============================================================================
/** Exception that may occur when evaluating an XPath expression.
- @since OOo 3.0
+ @since OpenOffice 3.0
@see XXPathAPI
*/
Modified: openoffice/branches/rejuvenate01/main/oox/inc/oox/xls/worksheethelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/oox/inc/oox/xls/worksheethelper.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/oox/inc/oox/xls/worksheethelper.hxx (original)
+++ openoffice/branches/rejuvenate01/main/oox/inc/oox/xls/worksheethelper.hxx Fri Jan 3 14:44:44 2014
@@ -154,6 +154,7 @@ struct ValidationModel
ApiCellRangeList maRanges;
ApiTokenSequence maTokens1;
ApiTokenSequence maTokens2;
+ ::rtl::OUString msRef;
::rtl::OUString maInputTitle;
::rtl::OUString maInputMessage;
::rtl::OUString maErrorTitle;
Modified: openoffice/branches/rejuvenate01/main/oox/source/xls/worksheetfragment.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/oox/source/xls/worksheetfragment.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/oox/source/xls/worksheetfragment.cxx (original)
+++ openoffice/branches/rejuvenate01/main/oox/source/xls/worksheetfragment.cxx Fri Jan 3 14:44:44 2014
@@ -158,6 +158,7 @@ void DataValidationsContext::importDataV
{
mxValModel.reset( new ValidationModel );
getAddressConverter().convertToCellRangeList( mxValModel->maRanges, rAttribs.getString( XML_sqref, OUString() ), getSheetIndex(), true );
+ mxValModel->msRef = rAttribs.getString( XML_sqref, OUString() );
mxValModel->maInputTitle = rAttribs.getXString( XML_promptTitle, OUString() );
mxValModel->maInputMessage = rAttribs.getXString( XML_prompt, OUString() );
mxValModel->maErrorTitle = rAttribs.getXString( XML_errorTitle, OUString() );
Modified: openoffice/branches/rejuvenate01/main/oox/source/xls/worksheethelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/oox/source/xls/worksheethelper.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/oox/source/xls/worksheethelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/oox/source/xls/worksheethelper.cxx Fri Jan 3 14:44:44 2014
@@ -1073,6 +1073,26 @@ void WorksheetGlobals::finalizeValidatio
{
PropertySet aValProps( xValidation );
+ try
+ {
+ sal_Int32 nIndex = 0;
+ OUString aToken = aIt->msRef.getToken( 0, ' ', nIndex );
+
+ Reference<XSpreadsheet> xSheet = getSheetFromDoc( getCurrentSheetIndex() );
+ Reference<XCellRange> xDBCellRange;
+ Reference<XCell> xCell;
+ xDBCellRange = xSheet->getCellRangeByName( aToken );
+
+ xCell = xDBCellRange->getCellByPosition( 0, 0 );
+ Reference<XCellAddressable> xCellAddressable( xCell, UNO_QUERY_THROW );
+ CellAddress aFirstCell = xCellAddressable->getCellAddress();
+ Reference<XSheetCondition> xCondition( xValidation, UNO_QUERY_THROW );
+ xCondition->setSourcePosition( aFirstCell );
+ }
+ catch( Exception& )
+ {
+ }
+
// convert validation type to API enum
ValidationType eType = ValidationType_ANY;
switch( aIt->mnType )
Modified: openoffice/branches/rejuvenate01/main/sc/inc/attarray.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/attarray.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/attarray.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/attarray.hxx Fri Jan 3 14:44:44 2014
@@ -188,6 +188,11 @@ public:
void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow );
//UNUSED2008-05 void ConvertFontsAfterLoad(); // old binary file format
+
+ /* i123909: Pre-calculate needed memory, and pre-reserve enough memory */
+ bool Reserve( SCSIZE nCount );
+ SCSIZE Count() const{ return nCount; }
+ SCSIZE Count( SCROW nRw1, SCROW nRw2 );
};
Modified: openoffice/branches/rejuvenate01/main/sc/inc/column.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/column.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/column.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/column.hxx Fri Jan 3 14:44:44 2014
@@ -404,6 +404,9 @@ public:
xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision,
SCROW nRowStart, SCROW nRowEnd ) const;
+ SCSIZE GetPatternCount( );
+ SCSIZE GetPatternCount( SCROW nRw1, SCROW nRw2 );
+ bool ReservedPatternCount( SCSIZE nReserved );
private:
ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos);
//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet );
Modified: openoffice/branches/rejuvenate01/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/document.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/document.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/document.hxx Fri Jan 3 14:44:44 2014
@@ -1908,6 +1908,10 @@ private: // CLOOK-Impl-Methoden
public:
void FillDPCache( ScDPTableDataCache * pCache, SCTAB nDocTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
+private:
+ SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol );
+ SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRw1, SCROW nRw2 );
+ bool ReservedPatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserved );
};
inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
{
Modified: openoffice/branches/rejuvenate01/main/sc/inc/table.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/table.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/table.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/table.hxx Fri Jan 3 14:44:44 2014
@@ -311,6 +311,9 @@ public:
SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
void SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
+ SCSIZE GetPatternCount( SCCOL nCol );
+ SCSIZE GetPatternCount( SCCOL nCol, SCROW nRw1, SCROW nRw2 );
+ bool ReservedPatternCount( SCCOL nCol, SCSIZE nReserved );
void GetString( SCCOL nCol, SCROW nRow, String& rString );
void FillDPCache( ScDPTableDataCache * pCache, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/attarray.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/attarray.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/attarray.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/attarray.cxx Fri Jan 3 14:44:44 2014
@@ -295,6 +295,24 @@ void ScAttrArray::SetPattern( SCROW nRow
SetPatternArea( nRow, nRow, pPattern, bPutToPool );
}
+bool ScAttrArray::Reserve( SCSIZE nReserve )
+{
+ if ( nCount <= nReserve )
+ {
+ if( ScAttrEntry* pNewData = new (std::nothrow) ScAttrEntry[nReserve] )
+ {
+ nLimit = nReserve;
+ memcpy( pNewData, pData, nCount*sizeof(ScAttrEntry) );
+ delete[] pData;
+ pData = pNewData;
+ return true;
+ }
+ else
+ return false;
+ }
+ else
+ return false;
+}
void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPatternAttr *pPattern, sal_Bool bPutToPool )
{
@@ -2647,3 +2665,15 @@ void ScAttrArray::Load( SvStream& /* rSt
//UNUSED2008-05 }
//UNUSED2008-05 }
+SCSIZE ScAttrArray::Count( SCROW nStartRow, SCROW nEndRow )
+{
+ SCSIZE nIndex1, nIndex2;
+
+ if( !Search( nStartRow, nIndex1 ) )
+ return 0;
+
+ if( !Search( nEndRow, nIndex2 ) )
+ nIndex2 = this->nCount - 1;
+
+ return nIndex2 - nIndex1 + 1;
+}
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/column2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/column2.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/column2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/column2.cxx Fri Jan 3 14:44:44 2014
@@ -1885,7 +1885,17 @@ sal_uLong ScColumn::GetCodeCount() const
return nCodeCount;
}
+SCSIZE ScColumn::GetPatternCount()
+{
+ return this->pAttrArray ? this->pAttrArray->Count() : 0;
+}
+SCSIZE ScColumn::GetPatternCount( SCROW nRw1, SCROW nRw2 )
+{
+ return this->pAttrArray ? this->pAttrArray->Count( nRw1, nRw2 ) : 0;
+}
-
-
+bool ScColumn::ReservedPatternCount( SCSIZE nReserved )
+{
+ return this->pAttrArray ? this->pAttrArray->Reserve( nReserved ) : false;
+}
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/documen3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/documen3.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/documen3.cxx Fri Jan 3 14:44:44 2014
@@ -2149,3 +2149,27 @@ void ScDocument::GetUsedDPObjectCache( s
}
}
// End Comments
+
+SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol )
+{
+ if( ValidTab(nTab) && pTab[nTab] )
+ return pTab[nTab]->GetPatternCount( nCol );
+ else
+ return 0;
+}
+
+SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRw1, SCROW nRw2 )
+{
+ if( ValidTab(nTab) && pTab[nTab] )
+ return pTab[nTab]->GetPatternCount( nCol, nRw1, nRw2 );
+ else
+ return 0;
+}
+
+bool ScDocument::ReservedPatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserved )
+{
+ if( ValidTab(nTab) && pTab[nTab] )
+ return pTab[nTab]->ReservedPatternCount( nCol, nReserved );
+ else
+ return false;
+}
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/document.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/document.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/document.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/document.cxx Fri Jan 3 14:44:44 2014
@@ -2187,6 +2187,26 @@ void ScDocument::CopyFromClip( const ScR
if (nR2 > nRow2)
nR2 = nRow2;
+ const unsigned PERFORMANCEOPTIMIZATION4PATTERNTHRESHOLD = 8192;
+ bool bNeedPerformanceOptimization4Pattern = nRow2 - nRow1 > PERFORMANCEOPTIMIZATION4PATTERNTHRESHOLD;
+ std::vector< std::vector< SCSIZE > > vvPatternCount( bNeedPerformanceOptimization4Pattern ? nCol2 - nCol1 + 1 : 0 );
+ std::vector< SCTAB > vTables;
+
+ if( bNeedPerformanceOptimization4Pattern )
+ {
+ for (SCTAB i = aCBFCP.nTabStart; i <= aCBFCP.nTabEnd; i++)
+ if (pTab[i] && rMark.GetTableSelect( i ) )
+ vTables.push_back( i );
+
+ for( SCSIZE i = 0; i < vvPatternCount.size(); i++ )
+ {
+ vvPatternCount[i].resize( vTables.size() );
+
+ for( std::vector< SCTAB >::size_type j = 0; j<vTables.size(); j++ )
+ vvPatternCount[i][j] = this->GetPatternCount( vTables[j], nCol1+i );
+ }
+ }
+
do
{
// Pasting is done column-wise, when pasting to a filtered
@@ -2223,6 +2243,21 @@ void ScDocument::CopyFromClip( const ScR
nC2 = nC1 + nXw;
if (nC2 > nCol2)
nC2 = nCol2;
+
+ if( bNeedPerformanceOptimization4Pattern && vvPatternCount.size() )
+ {
+ for( SCSIZE i = 0; i < vvPatternCount.size(); i++ )
+ {
+ vvPatternCount[i].resize( vTables.size() );
+
+ for( std::vector< SCTAB >::size_type j = 0; j<vTables.size(); j++ )
+ this->ReservedPatternCount( vTables[j], nCol1+i, vvPatternCount[i][j] + ( this->GetPatternCount( vTables[j], nCol1+i, nR1, nR2 ) ) * ( ( nRow2 - nRow1 + 1 ) / ( nYw + 1 ) ) );
+ }
+
+ bNeedPerformanceOptimization4Pattern = false;
+ vvPatternCount.clear();
+ }
+
nR1 = nR2 + 1;
nR2 = Min((SCROW)(nR1 + nYw), nRow2);
} while (nR1 <= nRow2);
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/table4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/table4.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/table4.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/table4.cxx Fri Jan 3 14:44:44 2014
@@ -2024,8 +2024,26 @@ void ScTable::CompileColRowNameFormula()
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileColRowNameFormula();
}
+SCSIZE ScTable::GetPatternCount( SCCOL nCol )
+{
+ if( ValidCol( nCol ) )
+ return aCol[nCol].GetPatternCount();
+ else
+ return 0;
+}
+SCSIZE ScTable::GetPatternCount( SCCOL nCol, SCROW nRw1, SCROW nRw2 )
+{
+ if( ValidCol( nCol ) && ValidRow( nRw1 ) && ValidRow( nRw2 ) )
+ return aCol[nCol].GetPatternCount( nRw1, nRw2 );
+ else
+ return 0;
+}
-
-
-
+bool ScTable::ReservedPatternCount( SCCOL nCol, SCSIZE nReserved )
+{
+ if( ValidCol( nCol ) )
+ return aCol[nCol].ReservedPatternCount( nReserved );
+ else
+ return false;
+}
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/dif/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/dif/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/dif/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/dif/makefile.mk Fri Jan 3 14:44:44 2014
@@ -37,6 +37,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/excel/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/excel/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/excel/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/excel/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCH4DLL=TRUE
PROJECTPCH=filt_pch
PROJECTPCHSOURCE=..\pch\filt_pch
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/ftools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/ftools/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/ftools/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/ftools/makefile.mk Fri Jan 3 14:44:44 2014
@@ -37,6 +37,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/html/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/html/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/html/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/html/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCH4DLL=TRUE
PROJECTPCH=filt_pch
PROJECTPCHSOURCE=..\pch\filt_pch
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/lotus/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/lotus/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/lotus/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/lotus/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCHSOURCE=..\pch\filt_pch
AUTOSEG=true
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/qpro/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/qpro/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/qpro/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/qpro/makefile.mk Fri Jan 3 14:44:44 2014
@@ -38,6 +38,7 @@ AUTOSEG=true
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/rtf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/rtf/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/rtf/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/rtf/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCH4DLL=TRUE
PROJECTPCH=filt_pch
PROJECTPCHSOURCE=..\pch\filt_pch
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/starcalc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/starcalc/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/starcalc/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/starcalc/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCHSOURCE=..\pch\filt_pch
AUTOSEG=true
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/xcl97/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/xcl97/makefile.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/xcl97/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/xcl97/makefile.mk Fri Jan 3 14:44:44 2014
@@ -32,13 +32,12 @@ PROJECTPCH4DLL=TRUE
PROJECTPCH=filt_pch
PROJECTPCHSOURCE=..\pch\filt_pch
-VISIBILITY_HIDDEN=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : scpre.mk
.INCLUDE : settings.mk
.INCLUDE : sc.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/src/scfuncs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/src/scfuncs.src?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/src/scfuncs.src (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/src/scfuncs.src Fri Jan 3 14:44:44 2014
@@ -8399,7 +8399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 3 // Description of Parameter 1
{
- Text [ en-US ] = "Text for the concatentation." ;
+ Text [ en-US ] = "Text for the concatenation." ;
};
};
// -=*# Resource for function IDENTISCH #*=-
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/viewuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/viewuno.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/viewuno.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/viewuno.cxx Fri Jan 3 14:44:44 2014
@@ -1285,6 +1285,7 @@ sal_Bool ScTabViewObj::MousePressed( con
aMouseEvent.ClickCount = e.ClickCount;
aMouseEvent.PopupTrigger = e.PopupTrigger;
aMouseEvent.Target = xTarget;
+ aMouseEvent.Modifiers = e.Modifiers;
for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ )
{
@@ -1379,6 +1380,7 @@ sal_Bool ScTabViewObj::MouseReleased( co
aMouseEvent.ClickCount = e.ClickCount;
aMouseEvent.PopupTrigger = e.PopupTrigger;
aMouseEvent.Target = xTarget;
+ aMouseEvent.Modifiers = e.Modifiers;
for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ )
{
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/DrawController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/DrawController.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/DrawController.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/DrawController.cxx Fri Jan 3 14:44:44 2014
@@ -762,7 +762,7 @@ void DrawController::FillPropertyTable (
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveLayer") ),
PROPERTY_ACTIVE_LAYER,
- ::getCppuBooleanType(),
+ ::getCppuType((const Reference< drawing::XLayer > *)0),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomValue") ),
Modified: openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_map?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_map (original)
+++ openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_map Fri Jan 3 14:44:44 2014
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <unordered_map>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include <unordered_map>
#elif defined(_MSC_VER)
#include <../../VC/include/unordered_map>
#define STLP4_EMUBASE_NS ::std::tr1
Modified: openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_set
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_set?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_set (original)
+++ openoffice/branches/rejuvenate01/main/stlport/systemstl/hash_set Fri Jan 3 14:44:44 2014
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <unordered_set>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include <unordered_set>
#elif defined(_MSC_VER)
#include <../../VC/include/unordered_set>
#define STLP4_EMUBASE_NS ::std::tr1
Modified: openoffice/branches/rejuvenate01/main/stlport/systemstl/slist
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stlport/systemstl/slist?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/stlport/systemstl/slist (original)
+++ openoffice/branches/rejuvenate01/main/stlport/systemstl/slist Fri Jan 3 14:44:44 2014
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <forward_list>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include <forward_list>
#elif defined(_MSC_VER)
#include <../../VC/include/list>
#define STLP4_SLIST_WITH_LIST
Modified: openoffice/branches/rejuvenate01/main/svtools/inc/svtools/table/tablemodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/inc/svtools/table/tablemodel.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/inc/svtools/table/tablemodel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/inc/svtools/table/tablemodel.hxx Fri Jan 3 14:44:44 2014
@@ -528,6 +528,10 @@ namespace svt { namespace table
It is legitimate to return <NULL/> here, in this case, the table model does not support sorting.
*/
virtual ITableDataSort* getSortAdapter() = 0;
+
+ /** returns enabled state.
+ */
+ virtual bool isEnabled() const = 0;
/// destroys the table model instance
virtual ~ITableModel() { }
Modified: openoffice/branches/rejuvenate01/main/svtools/source/table/gridtablerenderer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/table/gridtablerenderer.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/table/gridtablerenderer.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/table/gridtablerenderer.cxx Fri Jan 3 14:44:44 2014
@@ -277,7 +277,9 @@ namespace svt { namespace table
_rDevice.SetTextColor( textColor );
Rectangle const aTextRect( lcl_getTextRenderingArea( lcl_getContentArea( *m_pImpl, _rArea ) ) );
- sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, _nCol ) | TEXT_DRAW_CLIP;
+ sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, _nCol ) | TEXT_DRAW_CLIP;
+ if ( !m_pImpl->rModel.isEnabled() )
+ nDrawTextFlags |= TEXT_DRAW_DISABLE;
_rDevice.DrawText( aTextRect, sHeaderText, nDrawTextFlags );
::boost::optional< ::Color > const aLineColor( m_pImpl->rModel.getLineColor() );
@@ -413,7 +415,9 @@ namespace svt { namespace table
_rDevice.SetTextColor( textColor );
Rectangle const aTextRect( lcl_getTextRenderingArea( lcl_getContentArea( *m_pImpl, _rArea ) ) );
- sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, 0 ) | TEXT_DRAW_CLIP;
+ sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, 0 ) | TEXT_DRAW_CLIP;
+ if ( !m_pImpl->rModel.isEnabled() )
+ nDrawTextFlags |= TEXT_DRAW_DISABLE;
// TODO: is using the horizontal alignment of the 0'th column a good idea here? This is pretty ... arbitray ..
_rDevice.DrawText( aTextRect, rowTitle, nDrawTextFlags );
}
@@ -517,8 +521,8 @@ namespace svt { namespace table
}
else
imageSize.Height() = i_context.aContentArea.GetHeight() - 1;
-
- i_context.rDevice.DrawImage( imagePos, imageSize, i_image, 0 );
+ sal_uInt16 const nStyle = m_pImpl->rModel.isEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+ i_context.rDevice.DrawImage( imagePos, imageSize, i_image, nStyle );
}
//------------------------------------------------------------------------------------------------------------------
@@ -563,7 +567,9 @@ namespace svt { namespace table
}
Rectangle const textRect( lcl_getTextRenderingArea( i_context.aContentArea ) );
- sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, i_context.nColumn ) | TEXT_DRAW_CLIP;
+ sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, i_context.nColumn ) | TEXT_DRAW_CLIP;
+ if ( !m_pImpl->rModel.isEnabled() )
+ nDrawTextFlags |= TEXT_DRAW_DISABLE;
i_context.rDevice.DrawText( textRect, i_text, nDrawTextFlags );
}
Modified: openoffice/branches/rejuvenate01/main/svtools/source/table/tablecontrol_impl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/table/tablecontrol_impl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/table/tablecontrol_impl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/table/tablecontrol_impl.cxx Fri Jan 3 14:44:44 2014
@@ -219,6 +219,10 @@ namespace svt { namespace table
{
return NULL;
}
+ virtual bool isEnabled() const
+ {
+ return true;
+ }
virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent )
{
(void)i_row;
Modified: openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.cxx Fri Jan 3 14:44:44 2014
@@ -855,6 +855,20 @@ void SVTXGridControl::ProcessWindowEvent
}
//----------------------------------------------------------------------------------------------------------------------
+void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
+{
+ ::vos::OGuard aGuard( GetMutex() );
+ m_pTableModel->setEnabled( bEnable );
+ Window * pWindow = GetWindow();
+ if ( pWindow )
+ {
+ pWindow->Enable( bEnable, sal_True );
+ pWindow->EnableInput( bEnable );
+ pWindow->Invalidate();
+ }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
void SVTXGridControl::ImplCallItemListeners()
{
TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
Modified: openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/uno/svtxgridcontrol.hxx Fri Jan 3 14:44:44 2014
@@ -105,6 +105,9 @@ public:
// ::com::sun::star::lang::XComponent
void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
+
+ // XWindow
+ void SAL_CALL setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException);
protected:
// VCLXWindow
Modified: openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.cxx Fri Jan 3 14:44:44 2014
@@ -102,6 +102,7 @@ namespace svt { namespace table
::boost::optional< ::Color > m_aTextLineColor;
::boost::optional< ::std::vector< ::Color > > m_aRowColors;
VerticalAlignment m_eVerticalAlign;
+ bool bEnabled;
ModellListeners m_aListeners;
WeakReference< XGridDataModel > m_aDataModel;
WeakReference< XGridColumnModel > m_aColumnModel;
@@ -128,6 +129,7 @@ namespace svt { namespace table
,m_aTextLineColor ( )
,m_aRowColors ( )
,m_eVerticalAlign ( VerticalAlignment_TOP )
+ ,bEnabled ( true )
{
}
};
@@ -166,6 +168,7 @@ namespace svt { namespace table
DBG_CTOR( UnoControlTableModel, UnoControlTableModel_checkInvariants );
m_pImpl->bHasColumnHeaders = true;
m_pImpl->bHasRowHeaders = false;
+ m_pImpl->bEnabled = true;
m_pImpl->pRenderer.reset( new GridTableRenderer( *this ) );
m_pImpl->pInputHandler.reset( new DefaultInputHandler );
}
@@ -813,6 +816,20 @@ namespace svt { namespace table
return this;
return NULL;
}
+
+ //------------------------------------------------------------------------------------------------------------------
+ bool UnoControlTableModel::isEnabled() const
+ {
+ DBG_CHECK_ME();
+ return m_pImpl->bEnabled;
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ void UnoControlTableModel::setEnabled( bool _bEnabled )
+ {
+ DBG_CHECK_ME();
+ m_pImpl->bEnabled = _bEnabled;
+ }
//------------------------------------------------------------------------------------------------------------------
void UnoControlTableModel::sortByColumn( ColPos const i_column, ColumnSortDirection const i_sortDirection )
Modified: openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svtools/source/uno/unocontroltablemodel.hxx Fri Jan 3 14:44:44 2014
@@ -96,6 +96,7 @@ namespace svt { namespace table
virtual ::com::sun::star::style::VerticalAlignment
getVerticalAlign() const;
virtual ITableDataSort* getSortAdapter();
+ virtual bool isEnabled() const;
// ITableDataSort overridables
virtual void sortByColumn( ColPos const i_column, ColumnSortDirection const i_sortDirection );
@@ -139,6 +140,7 @@ namespace svt { namespace table
void setRowBackgroundColors( ::com::sun::star::uno::Any const & i_APIValue );
void setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign);
+ void setEnabled( bool _bEnabled );
// multiplexing of XGridDataListener events
void notifyRowsInserted( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const;