[Libreoffice-commits] core.git: 4 commits - offapi/type_reference udkapi/com udkapi/type_reference unoidl/source
Stephan Bergmann
sbergman at redhat.com
Thu Oct 10 01:13:59 PDT 2013
offapi/type_reference/offapi.idl | 32 ++++++------
udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl | 4 -
udkapi/com/sun/star/beans/XMultiPropertySet.idl | 12 ++--
udkapi/com/sun/star/beans/XMultiPropertyStates.idl | 8 +--
udkapi/com/sun/star/beans/XPropertySetInfo.idl | 4 -
udkapi/com/sun/star/beans/XPropertyState.idl | 4 -
udkapi/com/sun/star/registry/XRegistryKey.idl | 16 +++---
udkapi/com/sun/star/registry/XSimpleRegistry.idl | 4 -
udkapi/com/sun/star/script/XDebugging.idl | 4 -
udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl | 4 -
udkapi/com/sun/star/script/XLibraryAccess.idl | 4 -
udkapi/com/sun/star/uno/XAggregation.idl | 6 +-
udkapi/type_reference/udkapi.idl | 2
unoidl/source/unoidl-check.cxx | 3 -
14 files changed, 54 insertions(+), 53 deletions(-)
New commits:
commit 62828c9e11e27a2a9b69a9ad0919279df9a10359
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 10 10:12:13 2013 +0200
Make changes of interface method parameter names a hard failure
...instead of a warning, now that all the deliberate changes have been
addressed.
Change-Id: I6075a36a560bd68826c6840992eefb8f51b939ba
diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx
index ff84f52..f1264d2 100644
--- a/unoidl/source/unoidl-check.cxx
+++ b/unoidl/source/unoidl-check.cxx
@@ -537,12 +537,13 @@ void checkMap(
}
if (k->name != l->name) {
std::cerr
- << "Warning: interface type " << name
+ << "interface type " << name
<< " direct method " << i->name
<< " parameter #"
<< k - i->parameters.begin() + 1
<< " changed name from " << k->name
<< " to " << l->name << std::endl;
+ std::exit(EXIT_FAILURE);
}
}
}
commit 8a97f996b2a1526e69e32f39fd599aee25140efe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 10 10:09:46 2013 +0200
Adapt type_reference to fixes of illegal method parameter names
...UNOIDL identifiers starting with an underscore, or starting with a lowercase
letter and containing an underscore, are invalid, so occurrences of those as
method parameter names had been changed (even though changing them is strictly
speaking incompatible, but correctness trumps compatibility here).
Change-Id: I1cd2c32ff1486a13bf0218bcb7d3df5fc615ac01
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 7647760..509fe6b 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -4669,9 +4669,9 @@ module com {
module document {
interface XDocumentEventBroadcaster {
interface ::com::sun::star::uno::XInterface;
- void addDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener _Listener);
- void removeDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener _Listener);
- void notifyDocumentEvent([in] string _EventName, [in] ::com::sun::star::frame::XController2 _ViewController, [in] any _Supplement) raises (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException);
+ void addDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener Listener);
+ void removeDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener Listener);
+ void notifyDocumentEvent([in] string EventName, [in] ::com::sun::star::frame::XController2 ViewController, [in] any Supplement) raises (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException);
};
published interface XDocumentPropertiesSupplier {
interface ::com::sun::star::uno::XInterface;
@@ -6642,8 +6642,8 @@ module com {
interface XGridControl {
interface ::com::sun::star::form::XGrid;
interface ::com::sun::star::form::XGridFieldDataSupplier;
- void addGridControlListener([in] ::com::sun::star::form::XGridControlListener _listener);
- void removeGridControlListener([in] ::com::sun::star::form::XGridControlListener _listener);
+ void addGridControlListener([in] ::com::sun::star::form::XGridControlListener listener);
+ void removeGridControlListener([in] ::com::sun::star::form::XGridControlListener listener);
};
/** @deprecated */ published interface XGridPeer {
interface ::com::sun::star::uno::XInterface;
@@ -9916,14 +9916,14 @@ module com {
published interface XScannerManager {
interface ::com::sun::star::uno::XInterface;
sequence< ::com::sun::star::scanner::ScannerContext > getAvailableScanners();
- boolean configureScanner([inout] ::com::sun::star::scanner::ScannerContext scanner_context) raises (::com::sun::star::scanner::ScannerException);
- void startScan([in] ::com::sun::star::scanner::ScannerContext scanner_context, [in] ::com::sun::star::lang::XEventListener listener) raises (::com::sun::star::scanner::ScannerException);
- ::com::sun::star::scanner::ScanError getError([in] ::com::sun::star::scanner::ScannerContext scanner_context) raises (::com::sun::star::scanner::ScannerException);
- ::com::sun::star::awt::XBitmap getBitmap([in] ::com::sun::star::scanner::ScannerContext scanner_context) raises (::com::sun::star::scanner::ScannerException);
+ boolean configureScanner([inout] ::com::sun::star::scanner::ScannerContext scannerContext) raises (::com::sun::star::scanner::ScannerException);
+ void startScan([in] ::com::sun::star::scanner::ScannerContext scannerContext, [in] ::com::sun::star::lang::XEventListener listener) raises (::com::sun::star::scanner::ScannerException);
+ ::com::sun::star::scanner::ScanError getError([in] ::com::sun::star::scanner::ScannerContext scannerContext) raises (::com::sun::star::scanner::ScannerException);
+ ::com::sun::star::awt::XBitmap getBitmap([in] ::com::sun::star::scanner::ScannerContext scannerContext) raises (::com::sun::star::scanner::ScannerException);
};
published interface XScannerManager2 {
interface ::com::sun::star::scanner::XScannerManager;
- boolean configureScannerAndScan([inout] ::com::sun::star::scanner::ScannerContext scanner_context, [in] ::com::sun::star::lang::XEventListener listener) raises (::com::sun::star::scanner::ScannerException);
+ boolean configureScannerAndScan([inout] ::com::sun::star::scanner::ScannerContext scannerContext, [in] ::com::sun::star::lang::XEventListener listener) raises (::com::sun::star::scanner::ScannerException);
};
published service ScannerManager: ::com::sun::star::scanner::XScannerManager2;
};
@@ -17346,19 +17346,19 @@ module com {
};
published interface XModeChangeApproveListener {
interface ::com::sun::star::lang::XEventListener;
- void approveModeChange([in] ::com::sun::star::util::ModeChangeEvent _rSource) raises (::com::sun::star::util::VetoException);
+ void approveModeChange([in] ::com::sun::star::util::ModeChangeEvent rSource) raises (::com::sun::star::util::VetoException);
};
published interface XModeChangeListener;
published interface XModeChangeBroadcaster {
interface ::com::sun::star::uno::XInterface;
- void addModeChangeListener([in] ::com::sun::star::util::XModeChangeListener _rxListener);
- void removeModeChangeListener([in] ::com::sun::star::util::XModeChangeListener _rxListener);
- void addModeChangeApproveListener([in] ::com::sun::star::util::XModeChangeApproveListener _rxListener) raises (::com::sun::star::lang::NoSupportException);
- void removeModeChangeApproveListener([in] ::com::sun::star::util::XModeChangeApproveListener _rxListener) raises (::com::sun::star::lang::NoSupportException);
+ void addModeChangeListener([in] ::com::sun::star::util::XModeChangeListener rxListener);
+ void removeModeChangeListener([in] ::com::sun::star::util::XModeChangeListener rxListener);
+ void addModeChangeApproveListener([in] ::com::sun::star::util::XModeChangeApproveListener rxListener) raises (::com::sun::star::lang::NoSupportException);
+ void removeModeChangeApproveListener([in] ::com::sun::star::util::XModeChangeApproveListener rxListener) raises (::com::sun::star::lang::NoSupportException);
};
published interface XModeChangeListener {
interface ::com::sun::star::lang::XEventListener;
- void modeChanged([in] ::com::sun::star::util::ModeChangeEvent _rSource);
+ void modeChanged([in] ::com::sun::star::util::ModeChangeEvent rSource);
};
published interface XModifyListener {
interface ::com::sun::star::lang::XEventListener;
commit 2872cf80f2bc8758dfc82d081cc6c03a9564cfe6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 10 10:08:18 2013 +0200
Adapt type_reference to typo fix in method parameter name
...strictly speaking, such a change is incompatible, but in case of such a typo
it is probably best to do the cosmetic change anyway.
Change-Id: Ia4f773676addff5bfa64817ac724fa27c61b2a4b
diff --git a/udkapi/type_reference/udkapi.idl b/udkapi/type_reference/udkapi.idl
index 0f2eb57..b107589 100644
--- a/udkapi/type_reference/udkapi.idl
+++ b/udkapi/type_reference/udkapi.idl
@@ -600,7 +600,7 @@ module com {
};
published interface XIdentifierAccess {
interface ::com::sun::star::container::XElementAccess;
- any getByIdentifier([in] long Identifierr) raises (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException);
+ any getByIdentifier([in] long Identifier) raises (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException);
sequence< long > getIdentifiers();
};
published interface XIdentifierReplace {
commit ab02cebc9ae257bf1de4a2ab35c4508d246c6fb4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 10 10:06:55 2013 +0200
Change back method parameter name spellings
...changing them is deemed incompatible, so best avoid such cosmetic changes.
Change-Id: Id57d38721a4f3b83933fa13c509c20eacb95f903
diff --git a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
index e2fbf62..079e661 100644
--- a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
@@ -66,7 +66,7 @@ published interface XMultiHierarchicalPropertySet: com::sun::star::uno::XInterfa
<p> Unknown properties are ignored. </p>
- @param HierarchicalPropertyNames
+ @param aHierarchicalPropertyNames
This parameter specifies the names of the properties.
@param Values
@@ -93,7 +93,7 @@ published interface XMultiHierarchicalPropertySet: com::sun::star::uno::XInterfa
*/
- void setHierarchicalPropertyValues( [in] sequence<string> HierarchicalPropertyNames,
+ void setHierarchicalPropertyValues( [in] sequence<string> aHierarchicalPropertyNames,
[in] sequence<any> Values )
raises( com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException,
diff --git a/udkapi/com/sun/star/beans/XMultiPropertySet.idl b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
index 409be2b..c49b9a0 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
@@ -123,26 +123,26 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
<p>It is suggested to allow multiple registration of the same listener,
thus for each time a listener is added, it has to be removed.
- @param Listener
+ @param xListener
contains the listener to be removed.
@see addPropertiesChangeListener
*/
void removePropertiesChangeListener(
- [in] com::sun::star::beans::XPropertiesChangeListener Listener );
+ [in] com::sun::star::beans::XPropertiesChangeListener xListener );
/** fires a sequence of PropertyChangeEvents to the specified
listener.
- @param PropertyNames
+ @param aPropertyNames
specifies the sorted names of the properties.
- @param Listener
+ @param xListener
contains the listener for the property change events.
*/
- void firePropertiesChangeEvent( [in] sequence<string> PropertyNames,
- [in] com::sun::star::beans::XPropertiesChangeListener Listener );
+ void firePropertiesChangeEvent( [in] sequence<string> aPropertyNames,
+ [in] com::sun::star::beans::XPropertiesChangeListener xListener );
};
diff --git a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
index 4e970ad..30c4652 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
@@ -70,14 +70,14 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
the change events are fired. If it is a constrained property, you
must fire the vetoable event before you change the property value. </p>
- @param PropertyNames
+ @param aPropertyNames
specifies the names of the properties. All names must be unique.
This sequence must be alphabetically sorted.
@throws UnknownPropertyException
if one of the properties does not exist.
*/
- void setPropertiesToDefault( [in] sequence<string> PropertyNames )
+ void setPropertiesToDefault( [in] sequence<string> aPropertyNames )
raises( com::sun::star::beans::UnknownPropertyException );
/** @returns
@@ -87,7 +87,7 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
then the return type at the corresponding position in the
sequence returned is `void`. </p>
- @param PropertyNames
+ @param aPropertyNames
specifies the names of the properties. All names must be unique.
This sequence must be alphabetically sorted.
@@ -100,7 +100,7 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
com::sun::star::lang::WrappedTargetException.
*/
sequence<any> getPropertyDefaults(
- [in] sequence<string> PropertyNames )
+ [in] sequence<string> aPropertyNames )
raises( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException );
};
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfo.idl b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
index 7e3f37e..fb368b2 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
@@ -55,13 +55,13 @@ published interface XPropertySetInfo: com::sun::star::uno::XInterface
/** @returns
the property with the specified name from the object.
- @param Name
+ @param aName
specifies the name of the property.
@throws UnknownPropertyException
if the property does not exist.
*/
- com::sun::star::beans::Property getPropertyByName( [in] string Name )
+ com::sun::star::beans::Property getPropertyByName( [in] string aName )
raises( com::sun::star::beans::UnknownPropertyException );
diff --git a/udkapi/com/sun/star/beans/XPropertyState.idl b/udkapi/com/sun/star/beans/XPropertyState.idl
index 68f8d52..fa80916 100644
--- a/udkapi/com/sun/star/beans/XPropertyState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyState.idl
@@ -69,14 +69,14 @@ published interface XPropertyState: com::sun::star::uno::XInterface
<p>The order of the states is correlating to the order of the
given property names. </p>
- @param PropertyNames
+ @param aPropertyName
contains the sequence of property names.
@throws UnknownPropertyException
if one property does not exist.
*/
sequence<com::sun::star::beans::PropertyState> getPropertyStates(
- [in] sequence<string> PropertyNames )
+ [in] sequence<string> aPropertyName )
raises( com::sun::star::beans::UnknownPropertyException );
diff --git a/udkapi/com/sun/star/registry/XRegistryKey.idl b/udkapi/com/sun/star/registry/XRegistryKey.idl
index c39357c..a7bb78d 100644
--- a/udkapi/com/sun/star/registry/XRegistryKey.idl
+++ b/udkapi/com/sun/star/registry/XRegistryKey.idl
@@ -303,7 +303,7 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
/** deletes a key from the registry.
- @param KeyName
+ @param rKeyName
specifies the relative path from the current key to
the key which will be deleted.
@@ -311,7 +311,7 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
if the registry is not open, the registry is readonly,
the key does not exists or if the key is of type LINK.
*/
- void deleteKey( [in] string KeyName )
+ void deleteKey( [in] string rKeyName )
raises( com::sun::star::registry::InvalidRegistryException );
// DOCUMENTATION CHANGED FOR XRegistryKey::openKeys
@@ -364,7 +364,7 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
/** deletes a link from the registry.
- @param LinkName
+ @param rLinkName
specifies the relative path from the current key to
the link which will be deleted.
@@ -372,21 +372,21 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
if the registry is not open, the registry is readonly,
or if the link does not exist.
*/
- void deleteLink( [in] string LinkName )
+ void deleteLink( [in] string rLinkName )
raises( com::sun::star::registry::InvalidRegistryException );
// DOCUMENTATION CHANGED FOR XRegistryKey::getLinkTarget
/** @returns
the target (complete path of a key) of the link specified by rLinkName.
- @param LinkName
+ @param rLinkName
specifies the relative path from the current key to
the link which target will be returned.
@throws InvalidRegistryException
if the registry is not open or the link does not exists.
*/
- string getLinkTarget( [in] string LinkName )
+ string getLinkTarget( [in] string rLinkName )
raises( com::sun::star::registry::InvalidRegistryException );
// DOCUMENTATION CHANGED FOR XRegistryKey::getResolvedName
@@ -395,13 +395,13 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
If a link could not be resolved, the linktarget concatenated with the unresolved rest
of the name, will be returned.
- @param KeyName
+ @param aKeyName
specifies a relative path from the current key which will be resolved from all links.
@throws InvalidRegistryException
if the registry is not open or a recursion was detected.
*/
- string getResolvedName( [in] string KeyName )
+ string getResolvedName( [in] string aKeyName )
raises( com::sun::star::registry::InvalidRegistryException );
};
diff --git a/udkapi/com/sun/star/registry/XSimpleRegistry.idl b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
index 544170a..119046a 100644
--- a/udkapi/com/sun/star/registry/XSimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
@@ -46,7 +46,7 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
<p>If a local registry is already open, this function
will close the currently open registry.
- @param URL
+ @param rURL
specifies the complete URL to access the data source.
@param bReadOnly
@@ -60,7 +60,7 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
@throws InvalidRegistryException
if the registry does not exist.
*/
- void open( [in] string URL,
+ void open( [in] string rURL,
[in] boolean bReadOnly,
[in] boolean bCreate )
raises( com::sun::star::registry::InvalidRegistryException );
diff --git a/udkapi/com/sun/star/script/XDebugging.idl b/udkapi/com/sun/star/script/XDebugging.idl
index a220b7c..64cc747 100644
--- a/udkapi/com/sun/star/script/XDebugging.idl
+++ b/udkapi/com/sun/star/script/XDebugging.idl
@@ -51,12 +51,12 @@ published interface XDebugging: com::sun::star::uno::XInterface
@returns the value of the expression as string.
- @param CallStackPos Position in the call stack for which the expression
+ @param nCallStackPos Position in the call stack for which the expression
should be evaluated. 0 is the top/actual position in the call
in the call stack, 1 the next and so on.
*/
string eval( [in] string aSourceCode,
- [in] short CallStackPos );
+ [in] short nCallStackPos );
/** Returns the engine's stack trace of the current execute position. Line break is the delimiter.
*/
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
index be271da..cb58ab8 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
@@ -37,7 +37,7 @@ published interface XInvocationAdapterFactory2 : com::sun::star::uno::XInterface
@param Invocation
invocation interface being called on incoming adapter calls
- @param Types
+ @param aTypes
supported types of adapter
@returns
@@ -46,7 +46,7 @@ published interface XInvocationAdapterFactory2 : com::sun::star::uno::XInterface
*/
com::sun::star::uno::XInterface createAdapter(
[in] XInvocation Invocation,
- [in] sequence< type > Types );
+ [in] sequence< type > aTypes );
};
}; }; }; };
diff --git a/udkapi/com/sun/star/script/XLibraryAccess.idl b/udkapi/com/sun/star/script/XLibraryAccess.idl
index f007042..effbb32 100644
--- a/udkapi/com/sun/star/script/XLibraryAccess.idl
+++ b/udkapi/com/sun/star/script/XLibraryAccess.idl
@@ -61,12 +61,12 @@ published interface XLibraryAccess: com::sun::star::uno::XInterface
/** Get the hole compiled code of a module.
- @param ModuleName the full qualified name of a module.
+ @param aModuleName the full qualified name of a module.
(e.g., "UtilLibrary.ModuleDate")
@return an empty sequence, if this module is not found or the
code is not compiled.
*/
- sequence<byte> getModuleCode( [in] string ModuleName );
+ sequence<byte> getModuleCode( [in] string aModuleName );
/** get the source code of a function.
*/
diff --git a/udkapi/com/sun/star/uno/XAggregation.idl b/udkapi/com/sun/star/uno/XAggregation.idl
index c023f68..b7a81b9 100644
--- a/udkapi/com/sun/star/uno/XAggregation.idl
+++ b/udkapi/com/sun/star/uno/XAggregation.idl
@@ -72,10 +72,10 @@ published interface XAggregation: com::sun::star::uno::XInterface
XInterface::queryInterface()
have to be forwarded.
- @param Delegator
+ @param pDelegator
specifies the object which handles the calls to
XInterface::queryInterface().
- If <var>xDelegator</var> is NULL, the delegator is
+ If <var>pDelegator</var> is NULL, the delegator is
removed and thus the object becomes its own delegator and has
to handle calls to the method
XInterface::queryInterface()
@@ -83,7 +83,7 @@ published interface XAggregation: com::sun::star::uno::XInterface
@see XAggregation::queryAggregation
*/
- void setDelegator( [in] com::sun::star::uno::XInterface Delegator );
+ void setDelegator( [in] com::sun::star::uno::XInterface pDelegator );
/** is similar to XInterface::queryInterface(),
but it is to be processed directly without being forwarded to the
More information about the Libreoffice-commits
mailing list