From bcfcd0eb564e7d5d706f47dab30b074fd6233d97 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 31 May 2013 00:06:50 +0200 Subject: [PATCH] *api: fix up merge conflict damage Change-Id: I3a1281c756305f16d193210839ca6b826662698e --- offapi/com/sun/star/awt/ImageDrawMode.idl | 6 +- offapi/com/sun/star/awt/XGraphics2.idl | 6 +- offapi/com/sun/star/frame/XLoaderFactory.idl | 9 +- .../sun/star/frame/XStatusbarController.idl | 16 +- .../sun/star/frame/XUIControllerFactory.idl | 8 +- offapi/com/sun/star/text/ViewSettings.idl | 2 +- .../com/sun/star/text/XAutoTextContainer.idl | 19 +- offapi/com/sun/star/ucb/Content.idl | 204 ++++++++---------- .../com/sun/star/ui/UICategoryDescription.idl | 6 +- offapi/com/sun/star/ui/XStatusbarItem.idl | 24 +-- 10 files changed, 143 insertions(+), 157 deletions(-) diff --git a/offapi/com/sun/star/awt/ImageDrawMode.idl b/offapi/com/sun/star/awt/ImageDrawMode.idl index ae83384b7b42..1304582d1e62 100644 --- a/offapi/com/sun/star/awt/ImageDrawMode.idl +++ b/offapi/com/sun/star/awt/ImageDrawMode.idl @@ -22,7 +22,7 @@ module com { module sun { module star { module awt { /** defines modes how an image is drawn onto a device - @see XGraphics2::drawImage + @see com::sun::star::awt::XGraphics2::drawImage() @since LibreOffice 4.1 */ constants ImageDrawMode @@ -36,12 +36,12 @@ constants ImageDrawMode const short DISABLE = 0x0001; /** the image is drawn as being highlighted. - See XStyleSettings::HighlightColor. + See com::sun::star::awt::XStyleSettings::HighlightColor. */ const short HIGHLIGHT = 0x0002; /** the image is drawn as being deactivated. - See XStyleSettings::DeactiveColor. + See com::sun::star::awt::XStyleSettings::DeactiveColor. */ const short DEACTIVE = 0x0004; diff --git a/offapi/com/sun/star/awt/XGraphics2.idl b/offapi/com/sun/star/awt/XGraphics2.idl index b4acf557078d..7460bf29b456 100644 --- a/offapi/com/sun/star/awt/XGraphics2.idl +++ b/offapi/com/sun/star/awt/XGraphics2.idl @@ -36,7 +36,7 @@ published interface XGraphics2: com::sun::star::awt::XGraphics void clear( [in] Rectangle aRect ); - /** draws a XGraphic + /** draws a com::sun::star::graphic::XGraphic in the output device.

Note that some devices may not support this operation.

@@ -57,10 +57,10 @@ published interface XGraphics2: com::sun::star::awt::XGraphics @param nStyle the style used to draw the image. - See ImageDrawMode. + See com::sun::star::awt::ImageDrawMode. @param aGraphic - the XGraphic + the com::sun::star::graphic::XGraphic to be drawn onto the device */ void drawImage( [in] long nX, diff --git a/offapi/com/sun/star/frame/XLoaderFactory.idl b/offapi/com/sun/star/frame/XLoaderFactory.idl index 31248418e029..ac6f61490cf9 100644 --- a/offapi/com/sun/star/frame/XLoaderFactory.idl +++ b/offapi/com/sun/star/frame/XLoaderFactory.idl @@ -37,8 +37,8 @@ published interface XLoaderFactory /** interface to create loader objects by using his internal name

- Returned objects must support the service specification of a FrameLoader - or SynchronousFrameLoader. (Note: last one will be preferred if both ones + Returned objects must support the service specification of a FrameLoader + or SynchronousFrameLoader. (Note: last one will be preferred if both are available) They can be created by using of his internal name, which must be unambiguous everytime, only. To get this name use further specified interfaces of this factory for access on @@ -50,8 +50,9 @@ published interface XLoaderFactory /** provides access to the whole frame loader configuration

This interface supports an access to the internal configuration of all accessible loader objects. - The return value of XNameAccess::getByName() - is a property sequence packed in an any.

+ The return value of com::sun::star::container::XNameAccess::getByName() + is a property sequence packed in an any. +

diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl index 313dbe708a7b..760ee69b5036 100644 --- a/offapi/com/sun/star/frame/XStatusbarController.idl +++ b/offapi/com/sun/star/frame/XStatusbarController.idl @@ -60,28 +60,28 @@ interface XStatusbarController

A status bar controller is initialized with five additional arguments provided as a sequence of - PropertyValue:

+ com::sun::star::beans::PropertyValue:

*/ @@ -91,7 +91,7 @@ interface XStatusbarController changed.

The status bar controller implementation should register itself as a - listener when its XUpdatable + listener when its com::sun::star::util::XUpdatable interface has been called.

*/ interface com::sun::star::frame::XStatusListener; @@ -157,7 +157,7 @@ interface XStatusbarController @param nCommand describes which command has been invoked. -
See Command for +
See com::sun::star::awt::Command for possible values. @param bMouseEvent diff --git a/offapi/com/sun/star/frame/XUIControllerFactory.idl b/offapi/com/sun/star/frame/XUIControllerFactory.idl index 551a1a7a425d..cdae7b5ef8fc 100644 --- a/offapi/com/sun/star/frame/XUIControllerFactory.idl +++ b/offapi/com/sun/star/frame/XUIControllerFactory.idl @@ -42,20 +42,20 @@ interface XUIControllerFactory /** this interface provides functions to create new instances of a registered UI controller.

- Use XMultiComponentFactory::createInstanceWithArgumentsAndContext() to create + Use com::sun::star::lang::XMultiComponentFactory::createInstanceWithArgumentsAndContext() to create a new UI controller instance. Use the CommandURL as the service specifier. This call supports the following arguments provided as com::sun::star::beans::PropertyValue:

diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl index e2f5db497c09..4b626a9d5161 100644 --- a/offapi/com/sun/star/text/ViewSettings.idl +++ b/offapi/com/sun/star/text/ViewSettings.idl @@ -248,7 +248,7 @@ published service ViewSettings */ [optional, property] long VerticalRulerMetric; //------------------------------------------------------------------------- - /** If this property is , tips for document content are shown, + /** If this property is `TRUE`, tips for document content are shown, typically in a help balloon when the mouse is over the content. @since LibreOffice 4.1 diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl index 06fd171e2201..a44fba34c54d 100644 --- a/offapi/com/sun/star/text/XAutoTextContainer.idl +++ b/offapi/com/sun/star/text/XAutoTextContainer.idl @@ -27,14 +27,14 @@ module com { module sun { module star { module text { -/** handles blocks of AutoTextEntry. +/** handles blocks of AutoTextEntry. @see AutoTextContainer */ published interface XAutoTextContainer: com::sun::star::container::XNameAccess { /** creates a new AutoText group. - @param aGroupName the name of the AutoTextContainer + @param aGroupName the name of the AutoTextContainer

The name must follow the pattern groupname*pathid, where:

@@ -46,7 +46,7 @@ published interface XAutoTextContainer: com::sun::star::container::XNameAccess
  • pathid is a number (0 or 1) identifying the directory where the AutoText file is stored. Paths are stored in the Office configuration and accessed through - PathSettings::AutoText. + com::sun::star::util::PathSettings::AutoText.
    • 0 indicates the path of the Office Basis layer
    • 1 indicates the path of the user directory
      • @@ -54,15 +54,15 @@ published interface XAutoTextContainer: com::sun::star::container::XNameAccess
    If only groupname is specified, the path defaults to 0, the - Office Basis layer.
    Note that in some systems the user may lack of + Office Basis layer.
    Note that in some systems the user may lack of write access to the Office Basis directory. - @example + Example:
      -
    • standard*0
      the "standard" AutoTextGroup in the Office Basis layer
      • -
    • template
      the "template" AutoTextGroup in the Office Basis layer
      • -
    • mytexts*1
      the "mytexts" AutoTextGroup in the user directory
      • +
    • standard*0
      the "standard" AutoTextGroup in the Office Basis layer
      • +
    • template
      the "template" AutoTextGroup in the Office Basis layer
      • +
    • mytexts*1
      the "mytexts" AutoTextGroup in the user directory
    */ @@ -71,7 +71,8 @@ published interface XAutoTextContainer: com::sun::star::container::XNameAccess com::sun::star::container::ElementExistException ); /** deletes the specified AutoText group. - @param aGroupName see the documentation for XAutoTextContainer::insertNewByName() + @param aGroupName + see the documentation for XAutoTextContainer::insertNewByName() */ void removeByName( [in] string aGroupName ) raises( com::sun::star::container::NoSuchElementException ); diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl index 4daa1673de7d..cb55c0ff48e5 100644 --- a/offapi/com/sun/star/ucb/Content.idl +++ b/offapi/com/sun/star/ucb/Content.idl @@ -82,18 +82,15 @@ published service Content

    Mandatory commands

    • Types
    - - - - + - + - - + + - + -
    Command Name Return Type Parameters Description
    getCommandInfoXCommandInfoXCommandInfo void This command obtains an interface which allows to query information on commands supported by a content. @@ -101,7 +98,7 @@ published service Content
    getPropertySetInfoXPropertySetInfocom::sun::star::beans::XPropertySetInfo void This command obtains an interface which allows to query information on properties supported by a content. @@ -109,8 +106,8 @@ published service Content
    getPropertyValuesXRowsequence< Property > aPropscom::sun::star::sdbc::XRowsequence< com::sun::star::beans::Property > aProps This command obtains property values from the content.
    Note: The execution will not be aborted, if there @@ -123,7 +120,7 @@ published service Content
    setPropertyValues sequence< any >sequence< PropertyValue > aValuessequence< com::sun::star::beans::PropertyValue > aValues This command sets property values of the content.

    Note that setPropertyValues does not throw an exception in the case that one or more of the requested property values cannot be set. @@ -133,131 +130,127 @@ published service Content of elements like the number of properties to set. Every sequence element contains the status for a property. The first sequence elements corresponds to the first element in the sequence of - PropertyValues passed as + com::sun::star::beans::PropertyValue passed as command argument, and so on. The exceptions will never be passed to - an InteractionHandler.

    + an com::sun::star::task::InteractionHandler.

    Every element in the returned sequence is an any containing:

    • No value indicates, that the property value was set successfully.
      • -
    • UnknownPropertyException +
    • com::sun::star::beans::UnknownPropertyException indicates, that the property is not known to the content implementation.
      • -
    • IllegalTypeException +
    • com::sun::star::beans::IllegalTypeException indicates, that the data type of the property value is not acceptable.
      • -
    • IllegalAccessException +
    • com::sun::star::lang::IllegalAccessException indicates, that the property is constant - (PropertyAttribute::READONLY + (com::sun::star::beans::PropertyAttribute::READONLY is set).
      • -
    • IllegalArgumentException +
    • com::sun::star::lang::IllegalArgumentException indicates, that the property value is not acceptable. For instance, setting an empty title may be illegal.
      • -
    • Any other execption derived from Exception +
    • Any other execption derived from com::sun::star::uno::Exception indicates, that the value was not set successfully. For example, - this can be a InteractiveAugmentedIOException - transporting the error code IOErrorCode::ACCESS_DENIED.
      • + this can be a InteractiveAugmentedIOException + transporting the error code IOErrorCode::ACCESS_DENIED.

    If the value to set is equal to the current value, no exception must be added to the returned sequence

    Optional commands

    - - - - - + + - - + - - + + - + - + - + @@ -337,15 +330,15 @@ published service Content @@ -360,60 +353,60 @@ published service Content - - + + - + @@ -443,33 +436,29 @@ published service Content -
    Command Name Return Type Parameters Description
    openXDynamicResultSetOpenCommandArgument2 aOpenCommandArgXDynamicResultSetOpenCommandArgument2 aOpenCommandArg For folder objects, this command will return an - implementation of service DynamicResultSet. -

    The OpenCommandArgument2 members must be + implementation of service DynamicResultSet. +

    The OpenCommandArgument2 members must be filled as follows:

      -
    • OpenCommandArgument::Mode: - OpenMode::ALL or - OpenMode::FOLDERS or - OpenMode::DOCUMENTS. +
    • com::sun::star::ucb::OpenCommandArgument::Mode: + com::sun::star::ucb::OpenMode::ALL or + com::sun::star::ucb::OpenMode::FOLDERS or + com::sun::star::ucb::OpenMode::DOCUMENTS. The implementation of the open command MUST support all these modes!
      • -
    • OpenCommandArgument::Priority: +
    • com::sun::star::ucb::OpenCommandArgument::Priority: can be set, but implementation may ignore the value
      • -
    • OpenCommandArgument::Sink: +
    • com::sun::star::ucb::OpenCommandArgument::Sink: empty( ignored )
      • -
    • OpenCommandArgument::Properties: +
    • com::sun::star::ucb::OpenCommandArgument::Properties: The properties for which the result set shall contain the property values. The order of the sequence is the same as the order of result set columns. First element of sequence will be row number one, second will be row number two, ...
      • -
    • OpenCommandArgument2::SortingInfo: +
    • com::sun::star::ucb::OpenCommandArgument2::SortingInfo: contains sort criteria, if result set shall be sorted, otherwise it can be left empty.
    The exceution must be aborted by the implementation of this command - (by throwing a CommandAbortedException), if an + (by throwing a CommandAbortedException), if an unsupported mode is requested.
    open voidOpenCommandArgument2 aOpenCommandArgFor non-folder objects, the OpenCommandArgument2 + OpenCommandArgument2 aOpenCommandArgFor non-folder objects, the OpenCommandArgument2 struct will be prefilled with a data sink object, which will be filled with the content data. -

    The OpenCommandArgument2 members must be +

    The OpenCommandArgument2 members must be filled as follows:

      -
    • OpenCommandArgument::Mode: - OpenMode::DOCUMENT or - OpenMode::DOCUMENT_SHARE_DENY_NONE or - OpenMode::DOCUMENT_SHARE_DENY_WRITE. +
    • com::sun::star::ucb::OpenCommandArgument::Mode: + com::sun::star::ucb::OpenMode::DOCUMENT or + com::sun::star::ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE or + com::sun::star::ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE. Support for DOCUMENT is mandatory, all others are optional.
      • -
    • OpenCommandArgument::Priority: +
    • com::sun::star::ucb">OpenCommandArgument::Priority: can be set, but implementation may ignore the value
      • -
    • OpenCommandArgument::Sink: +
    • com::sun::star::ucb::OpenCommandArgument::Sink: a sink, where the implementation can put the document data into.
      • -
    • OpenCommandArgument::Properties: empty ( ignored )
      • -
    • OpenCommandArgument2::SortingInfo: empty ( ignored )
      • +
    • com::sun::star::ucb::OpenCommandArgument::Properties: empty ( ignored )
      • +
    • com::sun::star::ucb">OpenCommandArgument2::SortingInfo: empty ( ignored )

    The exceution must be aborted by the implementation of this command - (by throwing a CommandAbortedException), if an + (by throwing a CommandAbortedException), if an unsupported mode is requested.
    createNewContentXContentContentInfo contentinfoXContentContentInfo contentinfo This command creates a new non-persistent content of a given type. -

    This command must be supported by every Content +

    This command must be supported by every Content that supports the property "CreatableContentsInfo", if the returned property value contains a non-empty sequence of creatable types.

    Note: This command is part of the replacement for the deprecated - interface XContentCreator. + interface XContentCreator.

    Creation of a new persistent content:

      @@ -273,13 +266,13 @@ published service Content
    insert voidInsertCommandArgument aInsertCommandArgInsertCommandArgument aInsertCommandArg
    1. This command inserts a new content. It commits the process of creating a new content via executing the command "createNewContent" - and initializing it via setting properties, afterwards.
      + and initializing it via setting properties, afterwards.
      The command is not called on the content which created the new content, because the new object already knows where it is to be inserted (i.e. Calling createNewContent with the content type for a @@ -288,10 +281,10 @@ published service Content posting the article to the appropriate News Group). Not calling "insert" for the new content, i.e. because the user cancels writing a new message, simply discards the new object. No extra call to - "delete" is necessary.
      + "delete" is necessary.
      On successful completion of this command, the parent of the inserted content must propagate the change by notifying a - ContentEvent - ContentAction::INSERTED. + ContentEvent - ContentAction::INSERTED.
    2. Additionally this command can be called at any time to overwrite @@ -303,19 +296,19 @@ published service Content
    update voidOpenCommandArgument2 aOpenCommandArgOpenCommandArgument2 aOpenCommandArg This command triggers an update operation on a content. For example, when "updating" a POP3-Inbox, the content for that box will get and store all new objects on the appropriate server. The inserted contents will be notified by calling - XContentEventListener::contentEvent. + XContentEventListener::contentEvent().
    synchronize voidOpenCommandArgument2 aOpenCommandArgOpenCommandArgument2 aOpenCommandArg This command triggers a synchronization operation between locally cached data and remote server's data. For example, when @@ -323,7 +316,7 @@ published service Content store all new objects and destroy all cached data for objects no longer existing on the server. The inserted/deleted contents will be notified by calling - XContent::contentEvent. + XContent::contentEvent().
    void boolean bDeletePhysically - This command deletes an object. If is passed as parameter, + This command deletes an object. If `TRUE` is passed as parameter, the object will be destroyed physically. Otherwise it will be put into trash can, if such a service is available and the object to be deleted supports the command "undelete". On successful completion of this command, the deleted content - must propagate its deletion by notifying a ContentEvent - - ContentAction::DELETED. Additionally, the contents - parent must notify a ContentEvent - - ContentAction::REMOVED + must propagate its deletion by notifying a ContentEvent + - ContentAction::DELETED. Additionally, the contents + parent must notify a ContentEvent + - ContentAction::REMOVED
    searchXDynamicResultSetSearchCommandArgument aSearchCommandArgXDynamicResultSetSearchCommandArgument aSearchCommandArg This command searches for subcontents of a content matching the given search criteria. The command will return an implemenation - of service DynamicResultSet. + of service DynamicResultSet.
    transfer voidTransferInfo aTransferInfoTransferInfo aTransferInfo
    Important note: A client that wants to transfer data should not execute this command, but it should execute the command - "globalTransfer" at the UniversalContentBroker. + "globalTransfer" at the UniversalContentBroker. This command is able to transfer all kind of content supported by that UCB.
    This command transfers (copies/moves) an object from one location to another. It must be executed at the folder content representing - the destination of the transfer operation.
    + the destination of the transfer operation.
    Note that the implementation need not be able to handle - any type of contents.
    + any type of contents.
    Generally, there are good chances that a transfer of a content will succeed, if source and target folder have the same URL scheme. - But there is no guaranty for that.
    + But there is no guaranty for that.
    For instance, moving a message from a folder on IMAP server A to a folder on IMAP server B may fail, because the transfer command can't be implemented efficiently for this scenario, because it is not directly supported by the IMAP protocol. On the other hand, moving a message from one folder to another folder on the same IMAP server should work, because it can - be implemeted efficiently.
    + be implemeted efficiently.
    If an implementation is not able to handle a given source URL, it should indicate this by issuing a - InteractiveBadTransferURLException interaction request.
    + InteractiveBadTransferURLException interaction request.
    Source and target folder may be the same when doing a move operation. -
    +
    Transfers without the transfer command can be done as follows:
      -
    1. Create a new content at the target folder
      +
    2. Create a new content at the target folder
      targetContent = target.execute( "createNewContent", type )
      3. -
    3. Transfer data from source to target content
      +
    4. Transfer data from source to target content
      props = sourceContent.execute( "getPropertyValues", ... ) dataStream = sourceContent.execute( "open", ... ) targetContent.execute( "setPropertyValues", props )
      5. -
    5. Insert ( commit ) the new content
      +
    6. Insert ( commit ) the new content
      targetContent.execute( "insert", dataStream )
      7. -
    7. For move operations only: destroy the source content
      +
    8. For move operations only: destroy the source content
      sourceContent.execute( "delete", ... )
    @@ -429,11 +422,11 @@ published service Content This command obtains an exlusive write lock for the resource. The lock is active until command "unlock" is executed, or the OOo session that obtained the lock ends, or until the lock is released by - a third party (e.g. a system administrator).
    + a third party (e.g. a system administrator).
    Exceptions:
      -
    • InteractiveLockingLockedException
      • -
    • InteractiveLockingLockExpiredException
      • +
    • InteractiveLockingLockedException
      • +
    • InteractiveLockingLockExpiredException
    void This command removes a lock obtained by executing the command "lock" - from the resource.
    + from the resource.

    Exceptions:

      -
    • InteractiveLockingLockedException
      • -
    • InteractiveLockingLockExpiredException
      • +
    • InteractiveLockingLockedException
      • +
    • InteractiveLockingLockExpiredException

    -

    Note that InteractiveLockingLockExpiredException might +

    Note that InteractiveLockingLockExpiredException might be raised by any command that requires a previously obtained lock.

    Properties

    Mandatory properties

    - - - @@ -502,20 +491,16 @@ published service Content -
    Name Type Description
    ContentType stringstring contains the title of an object (e.g. the subject of a message).

    Optional properties

    - - - @@ -536,12 +521,12 @@ published service Content - + - + - + @@ -575,7 +560,7 @@ published service Content - + - + @@ -640,7 +625,7 @@ published service Content @@ -707,7 +692,7 @@ published service Content - + @@ -717,7 +702,7 @@ published service Content - + @@ -765,7 +750,7 @@ published service Content - + @@ -815,16 +800,15 @@ published service Content - + -
    Name Type Description
    AutoUpdateInterval longConnectionMode short contains the current connection mode for the object. - (see ConnectionMode) + (see ConnectionMode)
    CreatableContentsInfosequence ContentInfosequence ContentInfo contains the types of Contents a Content object can create via command "createNewContent". @@ -549,18 +534,18 @@ published service Content Content must also support command "createNewContent".

    Note: This property is part of the replacement for the deprecated - interface XContentCreator. + interface XContentCreator.
    DateCreatedDateTimecom::sun::star::util::DateTime contains the date and time the object was created.
    DateModifiedDateTimecom::sun::star::util::DateTime contains the date and time the object was last modified.
    DocumentHeadersequence< DocumentHeaderField > sequence< DocumentHeaderField > contains a sequence of documemt header fields (i.e. header fields of a MIME-message, or the document info of an office document ). For some standard header fields there @@ -584,7 +569,7 @@ published service Content
    DocumentStoreModeDocumentStoreModeDocumentStoreMode contains information about the way a folder stores the contents of (remote) documents. UpdateOnOpen boolean indicates whether (sub)contents shall be automatically updated - everytime a (folder) content is opened.
    This property may be + everytime a (folder) content is opened.
    This property may be used to control whether a folder content should read data only from local cache when it is opened, or whether it should connect to a server to obtain latest data.
    PriorityPriorityPriority contains a priority (i.e. of a message).
    RulesRuleSetRuleSet contains the rules set for a content.
    SynchronizePolicySynchronizePolicySynchronizePolicy contains the policy to use when synchronizing two objects.
    VerificationModeVerificationMode VerificationMode describes a verification policy.
    */ interface com::sun::star::ucb::XCommandProcessor; - /** is an enhanced version of XCommandProcessor that has an + /** is an enhanced version of XCommandProcessor that has an additional method for releasing command identifiers obtained via XCommandProcessor::createCommandIdentifier() to avoid resource leaks. For a detailed description of the problem refer to @@ -874,8 +858,8 @@ published service Content @deprecated

    This interface is deprecated, because a - ContentProvider might need a - XCommandEnvironment to perform the tasks of adding and + ContentProvider might need a + XCommandEnvironment to perform the tasks of adding and removing properties. New implementations should implement the respective commands "addProperty" and "removeProperty" instead. */ diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl index e058268c7fab..6e59799bf683 100644 --- a/offapi/com/sun/star/ui/UICategoryDescription.idl +++ b/offapi/com/sun/star/ui/UICategoryDescription.idl @@ -41,11 +41,11 @@ module com { module sun { module star { module ui {

    To access the user interface command categories of a module, a unique module specifier must be provided to - XNameAccess::getByName() + com::sun::star::container::XNameAccess::getByName() function. The module specifier can be retrieved from the - ModuleManager + com::sun::star::frame::ModuleManager service. The interface provides references to - ModuleUICommandDescription. + com::sun:star::ui::ModuleUICommandDescription.

    @see com::sun::star::frame::ModuleManager diff --git a/offapi/com/sun/star/ui/XStatusbarItem.idl b/offapi/com/sun/star/ui/XStatusbarItem.idl index 5bb679193a64..9080b95715a2 100644 --- a/offapi/com/sun/star/ui/XStatusbarItem.idl +++ b/offapi/com/sun/star/ui/XStatusbarItem.idl @@ -25,7 +25,7 @@ module com { module sun { module star { module ui { /** Represents an item in a status bar - @see XStatusbarController + @see com::sun::star::frame::XStatusbarController @since LibreOffice 4.1 */ @@ -49,23 +49,23 @@ interface XStatusbarItem - @see ItemStyle + @see com::sun::star::ui::ItemStyle */ [attribute, readonly] unsigned short Style; @@ -75,7 +75,7 @@ interface XStatusbarItem /** the rectangle on the status bar device onto which the item is drawn - @see XStatusbarController::paint() + @see com::sun::star::frame::XStatusbarController::paint() */ [attribute, readonly] com::sun::star::awt::Rectangle ItemRect; @@ -101,7 +101,7 @@ interface XStatusbarItem /** forces repainting the item onto the status bar device - @see XStatusbarController::paint() + @see com::sun::star::frame::XStatusbarController::paint() */ void repaint(); };