[ooo-build-commit] Branch 'ooo/master' - 2 commits - bridges/source offapi/com sal/inc sal/rtl sal/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jul 3 19:38:57 PDT 2009
bridges/source/remote/urp/urp_environment.cxx | 9 +
offapi/com/sun/star/awt/MouseWheelBehavior.idl | 61 ++++++++++++
offapi/com/sun/star/awt/UnoControlComboBoxModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlDateFieldModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlListBoxModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl | 8 +
offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl | 8 +
offapi/com/sun/star/awt/makefile.mk | 1
offapi/com/sun/star/form/XErrorListener.idl | 1
offapi/com/sun/star/linguistic2/Dictionary.idl | 2
offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl | 2
offapi/com/sun/star/linguistic2/ProofreadingResult.idl | 2
offapi/com/sun/star/linguistic2/SingleProofreadingError.idl | 2
offapi/com/sun/star/linguistic2/XProofreader.idl | 2
offapi/com/sun/star/linguistic2/XProofreadingIterator.idl | 2
offapi/com/sun/star/linguistic2/XSearchableDictionary.idl | 2
offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl | 4
offapi/com/sun/star/sheet/DatabaseRange.idl | 2
offapi/com/sun/star/sheet/NamedRange.idl | 2
offapi/com/sun/star/style/Style.idl | 2
offapi/com/sun/star/text/DocumentSettings.idl | 12 --
offapi/com/sun/star/text/NumberingLevel.idl | 20 +--
offapi/com/sun/star/text/ReferenceFieldPart.idl | 12 +-
offapi/com/sun/star/text/ViewSettings.idl | 8 +
offapi/com/sun/star/text/fieldmaster/Database.idl | 2
sal/inc/rtl/logfile.h | 8 +
sal/inc/rtl/logfile.hxx | 11 +-
sal/rtl/source/logfile.cxx | 5
sal/util/sal.map | 5
33 files changed, 207 insertions(+), 44 deletions(-)
New commits:
commit 7aae697d4c87261349883c8a10eb769e4e4f596e
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 3 14:21:50 2009 +0000
CWS-TOOLING: integrate CWS dba32c
2009-06-29 20:53:25 +0200 fs r273484 : #i103138# Rectangle conversion
2009-06-29 20:51:50 +0200 fs r273483 : #i103138# yet more refactoring, now also setting the proper zoom level at the proper point in time
2009-06-29 13:40:26 +0200 fs r273470 : added svn:ignore to ignore output paths
2009-06-29 10:08:54 +0200 fs r273455 : #i103138#
refactored the code for positioning/zooming the control
Basically, we now allow adjustControlGeometry_throw (formerly known as positionControl_throw and setControlZoom) to
take an additional ViewTransformation parameter, describing the transformation to obtain the actual
control position/size. Consequently, positionControl itself also allows for a ViewTransformation parameter.
This has become necessary since during painting, the device which we created our control for might not necessarily
have a proper MapMode set. In this case, if we would use this map mode for calculating the control's position/size,
this would lead to wrong results.
Note that this problem was introduced by the fix for #i101398#: During the fix, we postponed the control creation
to a later time (when it is really needed). At this later time, the MapMode at the device is broken, at the earlier
time where we formerly crearted the control (createPrimitive2DSequence), it is not yet broken.
Whether or not the MapMode is defined as "broken" might depend on one's point of view, however ...
I consider it broken, since:
- we need the map mode to obtain the proper zoom level, which is to be forwarded to the control
- there are scenarios where the MapMode is *not* set to MAP_PIXEL (in those scenarios, everything works
fine), and there are scenarios where it *is* set to MAP_PIXEL (in those the bug 103138 appears).
It somehow feels wrong that one cannot rely on the device's map mode this way, but on the other hand
one has no possibility to obtain the current zoom by other means.
Note that one issue (still to be submitted) is left: In the page pane of a Draw/Impress document, controls
have a wrong text size. This is because in this pane, the above-mentioned "broken" map mode is used,
which means the controls have a zoom of "1:1" set, which is wrong here.
2009-06-25 13:41:35 +0200 msc r273380 : #100000# the tabs changed die to new properties
2009-06-24 12:42:40 +0200 msc r273330 : #102082# remove issue warning
2009-06-22 10:43:14 +0200 fs r273201 : createPrimitive2DSequence: care for being disposed
2009-06-18 12:35:13 +0200 oj r273109 : #i102305# make nooptfiles for gcc
2009-06-17 12:14:37 +0200 oj r273056 : #i102305# fix for linux
2009-06-17 07:20:22 +0200 oj r273046 : #i102305# move ValueTransfer into the for loop to avoid a crash under Linux
2009-06-17 07:17:28 +0200 oj r273045 : #i102305# use varchar
2009-06-15 14:11:27 +0200 fs r272983 : added since tag
2009-06-15 12:11:39 +0200 oj r272973 : #i102305# SAL_DLLPUBLIC_EXPORT inserted
2009-06-15 11:08:53 +0200 fs r272969 : #i10000#
2009-06-15 09:25:13 +0200 fs r272963 : merging fix for P1 issue #i102701#
2009-06-11 11:31:24 +0200 fs r272858 : #i10000# copied the fix which before the rebase was done in ../dialog/macropg.src
2009-06-11 09:38:14 +0200 fs r272846 : CWS-TOOLING: rebase CWS dba32c to trunk at 272827 (milestone: DEV300:m50)
2009-06-02 09:53:10 +0200 fs r272483 : #i10000#
2009-05-29 15:55:03 +0200 fs r272465 : #i100818#
2009-05-29 12:58:43 +0200 fs r272452 : don't apply comphelper::getString on possibly VOID any
2009-05-29 10:38:35 +0200 oj r272437 : #i101519# handle where condition
2009-05-29 09:53:39 +0200 fs r272434 : #i100818# call into releaseStubs /without/ locked GlobalMutex
2009-05-28 07:53:44 +0200 oj r272375 : #i101369# parse tree changed
2009-05-27 14:53:36 +0200 fs r272347 : #i10000#
2009-05-27 09:29:15 +0200 oj r272327 : #i101626# check for double before hard cast
2009-05-27 09:13:58 +0200 oj r272326 : #i101626# handle void correctly
2009-05-27 08:04:39 +0200 oj r272321 : #i102256# wrong method signature used
2009-05-27 07:55:52 +0200 oj r272320 : #i101519# look up parameter typ if used in function
2009-05-27 06:49:07 +0200 oj r272319 : #i101519# set parameter from rowset as well
2009-05-26 13:30:56 +0200 oj r272297 : #i101987# impl XBatchExecution
2009-05-26 12:44:34 +0200 oj r272293 : #i101700# check if group is not set
2009-05-26 12:16:53 +0200 oj r272290 : #i101369# resolved some reduce7reduce problems with boolean_term and search_condition
2009-05-26 12:12:42 +0200 oj r272289 : #i101369# fix for or on one line criteria
2009-05-25 16:02:25 +0200 fs r272257 : #i999704# +PROPERTY_MOUSE_WHEEL_BEHAVIOR
2009-05-25 16:01:55 +0200 fs r272256 : merging the changes from CWS dba32b herein
2009-05-25 15:49:57 +0200 fs r272254 : #i999704#
2009-05-25 15:32:57 +0200 fs r272252 : #i99704# grid columns also to respect the MouseWheelBehavior property
2009-05-25 15:23:43 +0200 fs r272251 : don't pass empty Anys to ::comphelper::getString
2009-05-25 14:48:43 +0200 fs r272248 : merged changes from CWS dba32b herein
2009-05-25 14:44:40 +0200 fs r272247 : #i99704# support new MouseWheelBehavior property
2009-05-25 14:43:18 +0200 fs r272246 : #i99704# WheelWithoutFocus (peer property) superseded by MouseWheelBehavior (model property)
2009-05-25 14:41:03 +0200 fs r272245 : #i99704# no need to set the mouse wheel behavior at the peer, this is now a model property, having the right default
2009-05-25 14:39:31 +0200 fs r272243 : removed dead import
2009-05-25 14:35:36 +0200 fs r272242 : the new EnableVisible doesn't make sense for grid columns
2009-05-25 14:34:33 +0200 fs r272241 : #i99704# +MouseWheelBehavior - allow to enable/disable the mouse wheel for the control, or make it focus-dependent
2009-05-25 14:26:11 +0200 fs r272240 : #i99704# change MouseSettings wheel flag (NoWheelActionWithoutFocus) to a three-state option, allowing to completely ignore the mouse wheel
2009-05-23 21:35:59 +0200 fs r272213 : localize 'sub component opened/closed' event
2009-05-22 21:42:47 +0200 fs r272211 : #i102003#
2009-05-22 21:42:20 +0200 fs r272210 : grammar
2009-05-22 21:36:10 +0200 fs r272209 : #i102140# load only once, not twice, and show error messages during loading (and during any form action, that is) asynchronously
2009-05-22 21:35:11 +0200 fs r272208 : #i102140# +clear
2009-05-22 14:50:30 +0200 fs r272194 : #i102139# for newly created DB docs, set the MacroExecutionMode to USE_CONFIG
2009-05-22 12:03:42 +0200 fs r272180 : #i88878#
provided by noel.power at novell.com
implement a visibility property (EnableVisible) for toolkit controls, and usage in forms and UNO dialogs
2009-05-15 15:37:31 +0200 fs r271942 : #i100671# corrected some @since tags, so autodoc has better chances of correctly reading them
2009-05-15 15:33:11 +0200 fs r271940 : don't call comphelper::getFOO for VOID values
2009-05-15 15:08:31 +0200 fs r271937 : includes
2009-05-15 13:39:22 +0200 fs r271934 : #i101398# createPrimitive2DSequence: when we already have a control, use the old code. In particular, call positionControlForPaint
2009-05-15 12:33:48 +0200 fs r271933 : make the geometry a part of the ControlPrimitive2D's identity
2009-05-15 10:15:44 +0200 fs r271928 : #i10000#
2009-05-14 20:55:38 +0200 fs r271921 : #i101398# don't reuse the name PRIMITIVE_ID_CONTROLPRIMITIVE2D, make the name of our own ControlPrimitive2D unique
2009-05-14 20:55:31 +0200 fs r271920 : #i101398# don't reuse the name PRIMITIVE_ID_CONTROLPRIMITIVE2D, make the name of our own ControlPrimitive2D unique
2009-05-14 20:23:23 +0200 fs r271919 : #i101622#
2009-05-14 16:04:38 +0200 fs r271898 : don't use comphelper::getInt32 on voids
2009-05-14 16:04:12 +0200 fs r271897 : merge fix for issue whose number just slipped my memory ... (originally fixed in CWS dba32b)
2009-05-14 15:36:55 +0200 fs r271895 : merging changes from DEV300:m48
2009-05-07 14:43:19 +0200 fs r271670 : #i101477#
2009-05-07 14:37:30 +0200 fs r271668 : #i101477#
2009-05-07 09:27:30 +0200 oj r271628 : #i101343# remove pch
2009-05-06 09:36:02 +0200 fs r271568 : getFoo: diagnostics
2009-05-04 09:23:06 +0200 oj r271438 : CWS-TOOLING: rebase CWS dba32c to trunk at 271427 (milestone: DEV300:m47)
2009-04-29 23:18:13 +0200 fs r271394 : #i101398# use a dedicated 2DPrimitive for UNO Controls, which is able to provide the B2DRange *without* actually creating the control
2009-04-29 13:52:25 +0200 fs r271366 : #i101308#
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx
index 1e65bf6..69a0223 100644
--- a/bridges/source/remote/urp/urp_environment.cxx
+++ b/bridges/source/remote/urp/urp_environment.cxx
@@ -342,10 +342,13 @@ static void SAL_CALL RemoteEnvironment_thisDispose( uno_Environment *pEnvRemote
pImpl->m_pReader = 0;
}
- ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
- if( ! g_bStaticDestructorsCalled )
+ bool bReleaseStubs = false;
+ {
+ ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+ bReleaseStubs = !g_bStaticDestructorsCalled;
+ }
+ if( bReleaseStubs )
{
- // delete the stubs
releaseStubs( pEnvRemote );
}
}
diff --git a/offapi/com/sun/star/awt/MouseWheelBehavior.idl b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
new file mode 100755
index 0000000..6c03330
--- /dev/null
+++ b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef __com_sun_star_awt_MouseWheelBehavior_idl__
+#define __com_sun_star_awt_MouseWheelBehavior_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module awt {
+
+//=============================================================================
+
+/** describes the scroll behavior of the mouse wheel for a control
+ @since OOo 3.2
+ */
+constants MouseWheelBehavior
+{
+ /** defines that the mouse wheel cannot be used to scroll through the control's content
+ */
+ const short SCROLL_DISABLED = 0;
+
+ /** defines that the mouse can only be used to scroll through the control's content if it currently
+ has the focus.
+ */
+ const short SCROLL_FOCUS_ONLY = 1;
+
+ /** defines that the mouse can be used to scroll through the control's content, no matter whether or not
+ it has the focus, as long as the mouse pointer is over the control.
+ */
+ const short SCROLL_ALWAYS = 2;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 7a4d6ea..d5b9450 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -220,6 +220,14 @@ published service UnoControlComboBoxModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel scrool through the control's entry list. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index 14c38e9..65da33c 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -254,6 +254,14 @@ published service UnoControlCurrencyFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index 557511e..a70adc8 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -266,6 +266,14 @@ published service UnoControlDateFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index d22be5f..7aff33a 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -299,6 +299,14 @@ published service UnoControlFormattedFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 41bd5ec..db4356e 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -203,6 +203,14 @@ published service UnoControlListBoxModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel scrool through the control's entry list. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index 2e7fe53..c291bef 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -242,6 +242,14 @@ published service UnoControlNumericFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index fc1e916..3066a30 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -201,6 +201,14 @@ published service UnoControlPatternFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index 3d64042..3e90905 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -169,6 +169,14 @@ service UnoControlSpinButtonModel
is specified with this property.</p>
*/
[property] long RepeatDelay;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index bc9da97..07dc85a 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -246,6 +246,14 @@ published service UnoControlTimeFieldModel
@since OOo 3.1
*/
[optional, property] short WritingMode;
+
+ /** defines how the mouse wheel can be used to scroll through the control's content.
+
+ <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property,
+ and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
+ this is possible.</p>
+ */
+ [optional, property] short MouseWheelBehavior;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index ff4d827..c0c501c 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -127,6 +127,7 @@ IDLFILES=\
MessageBoxCommand.idl\
MouseButton.idl\
MouseEvent.idl\
+ MouseWheelBehavior.idl\
PaintEvent.idl\
Point.idl\
PopupMenuDirection.idl\
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index c8bc38b..15cb5c7 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -54,6 +54,7 @@
<p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
by <type scope="com::sun::star::sdb">XSQLErrorListener</type>.</p>
+ at since foo
@deprecated
*/
published interface XErrorListener: com::sun::star::lang::XEventListener
diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl
index 57708de..fd9934e 100644
--- a/offapi/com/sun/star/linguistic2/Dictionary.idl
+++ b/offapi/com/sun/star/linguistic2/Dictionary.idl
@@ -57,7 +57,7 @@ module com { module sun { module star { module linguistic2 {
@see com::sun::star::linguistic2::DictionaryList
@see com::sun::star::linguistic2::XSearchableDictionaryList
- @since OOo 3.01
+ @since OOo 3.0.1
*/
service Dictionary
{
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
index 88eadfd..1d28d5c 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
@@ -62,7 +62,7 @@ published constants LinguServiceEventFlags
//-------------------------------------------------------------------------
/** Request new proofreading of the document
- @since OOo 3.01
+ @since OOo 3.0.1
*/
const short PROOFREAD_AGAIN = 8;
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
index 855a17a..f3e768b 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
@@ -58,7 +58,7 @@ interface XProofreader;
//=============================================================================
/** holds the results from proofreading a sentence.
- @since OOo 3.01
+ @since OOo 3.0.1
*/
struct ProofreadingResult
{
diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
index 1d2e624..346ec80 100644
--- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
+++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module linguistic2 {
//=============================================================================
/** holds a single error found by the proofreader.
- @since OOo 3.01
+ @since OOo 3.0.1
*/
struct SingleProofreadingError
{
diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl
index 35dd4e7..96a3009 100644
--- a/offapi/com/sun/star/linguistic2/XProofreader.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreader.idl
@@ -65,7 +65,7 @@ module com { module sun { module star { module linguistic2 {
//=============================================================================
/** API for proofreading a text
- @since OOo 3.01
+ @since OOo 3.0.1
*/
interface XProofreader: com::sun::star::linguistic2::XSupportedLocales
{
diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
index ec4ed46..b4cc711 100644
--- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
@@ -61,7 +61,7 @@ module com { module sun { module star { module linguistic2 {
//=============================================================================
/** API for the proofreading iterator that mediates between the document and the proofreader.
- @since OOo 3.01
+ @since OOo 3.0.1
*/
interface XProofreadingIterator: com::sun::star::uno::XInterface
{
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
index f40fea4..4e03cb2 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
@@ -60,7 +60,7 @@ interface XSearchableDictionary : com::sun::star::linguistic2::XDictionary
@see <type scope="com::sun::star::linguistic2">XDictionaryEntry</type>
@see <type scope="com::sun::star::linguistic2">XSearchableDictionaryList</type>
- @since OOo 3.01
+ @since OOo 3.0.1
*/
sequence< com::sun::star::linguistic2::XDictionaryEntry > searchSimilarEntries( [in] string aWord );
diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
index 20cb519..656f045 100644
--- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
@@ -55,7 +55,7 @@ interface XSetSpellAlternatives : com::sun::star::uno::XInterface
/**
set the list of suggestions to be returned.
- @since OOo 3.01
+ @since OOo 3.0.1
*/
void setAlternatives( [in] sequence< string > aAlternatives );
@@ -64,7 +64,7 @@ interface XSetSpellAlternatives : com::sun::star::uno::XInterface
set the type of error found.
@see <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>
- @since OOo 3.01
+ @since OOo 3.0.1
*/
void setFailureType( [in] short nFailureType );
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index b613b4e..eb2fe13 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -160,7 +160,7 @@ published service DatabaseRange
@see com::sun::star::sheet::FormulaToken
@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::DB_AREA
- @since OOo 2.x
+ @since OOo 3.0
*/
[optional, readonly, property] long TokenIndex;
};
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 65c14dc..c6f97c0 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -84,7 +84,7 @@ published service NamedRange
@see com::sun::star::sheet::FormulaToken
@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::NAME
- @since OOo 2.x
+ @since OOo 3.0
*/
[optional, readonly, property] long TokenIndex;
diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl
index b50ec1f..675a149 100644
--- a/offapi/com/sun/star/style/Style.idl
+++ b/offapi/com/sun/star/style/Style.idl
@@ -165,7 +165,7 @@ published service Style
</ul>
- @since OOo 2.0.1.
+ @since OOo 2.0.1
*/
[optional, property] sequence< com::sun::star::beans::NamedValue > ParaStyleConditions;
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index edb1d56..eca43a7 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -129,8 +129,6 @@ published service DocumentSettings
/** specifies if the former (till OpenOffice.org 1.1) or the new
line spacing formatting is applied.
- @since OOo 2.0.0
-
<p>This property controls how a set line spacing at a paragraph
influences the formatting of the text lines and the spacing between
paragraphs.
@@ -144,14 +142,13 @@ published service DocumentSettings
a proportional line spacing is only applied below a text line and
it's always added to the paragraph spacing between two paragraphs.</p>
+ @since OOo 2.0.0
*/
[optional, property] boolean UseFormerLineSpacing;
// ------------------------------------------------------------
/** specifies if paragraph and table spacing is added at the
bottom of table cells
- @since OOo 2.0.0
-
<p>This property controls, if the spacing of the last paragraph
respectively table of a table cell is added at the bottom of this
table cells
@@ -162,14 +159,13 @@ published service DocumentSettings
the spacing of the last paragraph respectively table of a table
cell isn't added at the bottom of this table cell.</p>
+ @since OOo 2.0.0
*/
[optional, property] boolean AddParaSpacingToTableCells;
// ------------------------------------------------------------
/** specifies if the former (till OpenOffice.org 1.1) or the new
object positioning is applied.
- @since OOo 2.0.0
-
<p>This property controls how floating screen objects (Writer
fly frames and drawing objects are positioned.
If <TRUE/>, the object positioning till OpenOffice.org 1.1 is
@@ -181,6 +177,7 @@ published service DocumentSettings
its vertical position, doesn't include the lower spacing and the
line spacing of the previous paragraph.</p>
+ @since OOo 2.0.0
*/
[optional, property] boolean UseFormerObjectPositioning;
@@ -188,8 +185,6 @@ published service DocumentSettings
/** specifies if the text wrap of floating screen objects are
considered in a specified way in the positioning algorithm.
- @since OOo 2.0.0
-
<p>This property controls how floating screen objects (Writer
fly frames and drawing objects) are positioned.
If <TRUE/>, the object positioning algorithm will consider
@@ -199,6 +194,7 @@ published service DocumentSettings
If <FALSE/> (default value), the former object positioning
algorithm (known from OpenOffice.org 1.1) is applied.</p>
+ @since OOo 2.0.0
*/
[optional, property] boolean ConsiderTextWrapOnObjPos;
diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl
index 030fdc8..b7187da 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -201,8 +201,6 @@ published service NumberingLevel
/** position and space mode
- @since OOo 3.0
-
<p>
Specifies the position and space mode of the numbering level.
For valid values see com::sun::star::text::PositionAndSpaceMode.
@@ -211,53 +209,55 @@ published service NumberingLevel
If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy,
ListtabStopPosition, FirstLineIndent, IndentAt are used.
</p>
+
+ @since OOo 3.0
*/
[optional, property] short PositionAndSpaceMode;
/** character following the list label
- @since OOo 3.0
-
<p>
Specifies the character following the list label.
For valid values see com::sun::star::text::LabelFollow.
Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
</p>
+
+ @since OOo 3.0
*/
[optional, property] short LabelFollowedBy;
/** list tab position
- @since OOo 3.0
-
<p>
Specifies the position of the list tab stop - only non-negative
values are allowed.
Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT
and LabelFollowedBy equal LABELFOLLOW_LISTTAB
</p>
+
+ @since OOo 3.0
*/
[optional, property] long ListtabStopPosition;
/** additional line indent for the first text line
- @since OOo 3.0
-
<p>
Specifies the first line indent.
Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
</p>
+
+ @since OOo 3.0
*/
[optional, property] long FirstLineIndent;
/** indentation of the text lines
- @since OOo 3.0
-
<p>
Specifies the indent of the text lines
Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
</p>
+
+ @since OOo 3.0
*/
[optional, property] long IndentAt;
};
diff --git a/offapi/com/sun/star/text/ReferenceFieldPart.idl b/offapi/com/sun/star/text/ReferenceFieldPart.idl
index 7e6b929..0b2f72d 100644
--- a/offapi/com/sun/star/text/ReferenceFieldPart.idl
+++ b/offapi/com/sun/star/text/ReferenceFieldPart.idl
@@ -88,8 +88,6 @@ published constants ReferenceFieldPart
/** The numbering label and depending of the reference field context numbering lables of
superior list levels of the reference are displayed.
- @since OOo 3.0
-
<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
<p>The contents of the list label of the paragraph, at which the bookmark respectively the
set reference starts - named "referenced item" in the following - is displayed. To unambiguous
@@ -102,23 +100,23 @@ published constants ReferenceFieldPart
be the level of the most superior level, then no list label content of superior levels greater or
equal than X are added.
If the referenced item isn't numbered, nothing is displayed.</p>
+
+ @since OOo 3.0
*/
const short NUMBER = 8;
//-------------------------------------------------------------------------
/** The numbering label of the reference is displayed.
- @since OOo 3.0
-
<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
<p>The contents of the list label of the paragraph, at which the bookmark respectively the
set reference starts, is displayed. If this paragraph isn't numbered, nothing is displayed.</p>
+
+ @since OOo 3.0
*/
const short NUMBER_NO_CONTEXT = 9;
//-------------------------------------------------------------------------
/** The numbering label and numbering lables of superior list levels of the reference are displayed.
- @since OOo 3.0
-
<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
<p>The contents of the list label of the paragraph, at which the bookmark respectively the
set reference starts - named "referenced item" in the following - is displayed and the contents
@@ -128,6 +126,8 @@ published constants ReferenceFieldPart
be the level of the most superior level, then no list label content of superior levels greater or
equal than X are added.
If the referenced item is numbered nothing is displayed.</p>
+
+ @since OOo 3.0
*/
const short NUMBER_FULL_CONTEXT = 10;
};
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index fbfd71e..7ddf98e 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -342,14 +342,18 @@ published service ViewSettings
[optional, property] boolean ShowNonprintingCharacters;
//-------------------------------------------------------------------------
/** metric unit of the horizontal ruler
+
+ <p>Uses values <type scope="com::sun::star::awt">FieldUnit</type></p>
+
@since OOo 3.1.0
- <p>Uses values from com::sun::star::awt::FieldUnit</p>
*/
[optional, property] long HorizontalRulerMetric;
//-------------------------------------------------------------------------
/** metric unit of the vertical ruler
+
+ <p>Uses values from <type scope="com::sun::star::awt">FieldUnit</type></p>
+
@since OOo 3.1.0
- <p>Uses values from com::sun::star::awt::FieldUnit</p>
*/
[optional, property] long VerticalRulerMetric;
};
diff --git a/offapi/com/sun/star/text/fieldmaster/Database.idl b/offapi/com/sun/star/text/fieldmaster/Database.idl
index d327be6..78dea09 100644
--- a/offapi/com/sun/star/text/fieldmaster/Database.idl
+++ b/offapi/com/sun/star/text/fieldmaster/Database.idl
@@ -85,7 +85,7 @@ published service Database
//------------------------------------------------------------------------
/** contains the DataColumnName but it enables the fieldmaster and its
depending fields to work without setting DataSourceName, DataTableName and CommandType
- @since OOo 2.x
+ @since OOo 2.3
*/
[optional, property] string Name;
commit 842324d8c48410e2877e0b41c765f3b27a1ba9e2
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 3 10:14:57 2009 +0000
CWS-TOOLING: integrate CWS perftest08
2009-07-02 10:03:16 +0200 lla r273621 : #159516# support systems with no JAVA_HOME
2009-07-02 10:00:25 +0200 lla r273620 : #159516# if path is null this not an error
2009-07-01 14:36:05 +0200 lla r273583 : #159516# add check for wrong cygwin path
2009-06-22 13:18:14 +0200 lla r273223 : #159516# add PipeConnectionString
2009-06-18 21:44:59 +0200 lla r273137 : #159516# cleanups
2009-06-18 21:44:17 +0200 lla r273136 : #159516# handle null
2009-06-18 21:42:56 +0200 lla r273135 : #159516# add getElementCount() function
2009-06-15 10:40:05 +0200 lla r272966 : CWS-TOOLING: rebase CWS perftest08 to trunk at 272827 (milestone: DEV300:m50)
2009-06-02 09:06:22 +0200 lla r272480 : CWS-TOOLING: rebase CWS perftest08 to trunk at 272291 (milestone: DEV300:m49)
2009-05-08 11:40:22 +0200 mib r271710 : #159717#: File name info for performance test (added void to hasLogFile() parameter list)
2009-05-05 14:14:25 +0200 mib r271514 : #159717#: File name info for performance test
2009-05-04 15:23:01 +0200 mib r271466 : #159717#: File name infor for performance test
2009-05-04 15:22:27 +0200 mib r271465 : #159717#: File name infor for performance test
2009-05-04 15:21:56 +0200 mib r271464 : #159717#: File name infor for performance test
2009-05-04 15:21:18 +0200 mib r271462 : #159717#: File name infor for performance test
2009-04-29 16:23:40 +0200 lla r271383 : #159516# cleanups
2009-04-29 16:23:20 +0200 lla r271382 : #159516# cleanups
2009-04-08 12:23:01 +0200 lla r270631 : #159516# typo
2009-04-07 10:30:35 +0200 lla r270580 : #159516# add prototype
2009-04-07 10:21:15 +0200 lla r270579 : #159516# cleanup
2009-04-03 09:05:26 +0200 lla r270448 : #159516# small cleanups
2009-03-30 13:22:26 +0200 lla r270221 : #159517# merge perftest07
diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h
index 6c3c641..f4d92ce 100644
--- a/sal/inc/rtl/logfile.h
+++ b/sal/inc/rtl/logfile.h
@@ -67,6 +67,14 @@ void SAL_CALL rtl_logfile_trace( const sal_Char* pszFormat, ... );
*/
void SAL_CALL rtl_logfile_longTrace(char const * format, ...);
+/** Return if a log file is written.
+
+ @return true if a log file is written
+
+ @since UDK 3.2.11
+*/
+sal_Bool SAL_CALL rtl_logfile_hasLogFile( void );
+
#ifdef __cplusplus
}
#endif
diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index db64ac3..db146c0 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -189,12 +189,19 @@ namespace rtl
#define RTL_LOGFILE_PRODUCT_TRACE( string ) \
rtl_logfile_longTrace( "| : %s\n", string )
-#define RTL_LOGFILE_PRODUCT_CONTEXT( instance, name ) \
- ::rtl::Logfile instance( name )
#define RTL_LOGFILE_PRODUCT_TRACE1( frmt, arg1 ) \
rtl_logfile_longTrace( "| : " ); \
rtl_logfile_trace( frmt, arg1 ); \
rtl_logfile_trace( "\n" )
+#define RTL_LOGFILE_PRODUCT_CONTEXT( instance, name ) \
+ ::rtl::Logfile instance( name )
+#define RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1( instance, frmt, arg1 ) \
+ rtl_logfile_longTrace( "| %s : ", \
+ instance.getName() ); \
+ rtl_logfile_trace( frmt, arg1 ); \
+ rtl_logfile_trace( "\n" )
+#define RTL_LOGFILE_HASLOGFILE() \
+ rtl_logfile_hasLogFile()
#endif
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 71fbafb..8d9c69e 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -250,3 +250,8 @@ extern "C" void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
va_end(args);
}
}
+
+extern "C" sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
+ init();
+ return g_buffer != 0;
+}
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 03af5c1..ad063f3 100755
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -588,6 +588,11 @@ UDK_3.9 { # OOo 3.1
rtl_math_atanh;
} UDK_3.8;
+UDK_3.10 { # OOo 3.2
+ global:
+ rtl_logfile_hasLogFile;
+} UDK_3.9;
+
PRIVATE_1.0 {
global:
osl_detail_ObjectRegistry_storeAddresses;
More information about the ooo-build-commit
mailing list