You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [18/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenuDirection.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenuDirection.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenuDirection.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenuDirection.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,82 +7,50 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_awt_PopupMenuDirection_idl__
+#define __com_sun_star_awt_PopupMenuDirection_idl__
-#ifndef __com_sun_star_awt_PopupMenuDirection_idl__
-#define __com_sun_star_awt_PopupMenuDirection_idl__
-
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
-//=============================================================================
-
-/** These values are used to specify the direction in which
- a popup menu will grow.
-
- <p>They may be expanded in future versions.</p>
+module com { module sun { module star { module awt {
+
+/** These values are used to specify the direction in which
+ a popup menu will grow.
*/
published constants PopupMenuDirection
-{
- //-------------------------------------------------------------------------
-
- /** @deprecated
- */
- const short DEFAULT = 0;
-
- //-------------------------------------------------------------------------
-
- /** @deprecated
- */
- const short DOWN = 1;
-
- //-------------------------------------------------------------------------
-
- /** opens on execute in a default direction.
- */
- const short EXECUTE_DEFAULT = 0;
-
- //-------------------------------------------------------------------------
-
- /** opens on execute downwards.
- */
- const short EXECUTE_DOWN = 1;
-
- //-------------------------------------------------------------------------
-
- /** opens on execute upwards.
- */
- const short EXECUTE_UP = 2;
-
- //-------------------------------------------------------------------------
-
- /** opens on execute to the left.
- */
- const short EXECUTE_LEFT = 4;
-
- //-------------------------------------------------------------------------
-
- /** opens on execute to the right.
- */
- const short EXECUTE_RIGHT = 8;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{
+ /** opens on execute in a default direction.
+ */
+ const short EXECUTE_DEFAULT = 0;
+
+ /** opens on execute downwards.
+ */
+ const short EXECUTE_DOWN = 1;
+
+ /** opens on execute upwards.
+ */
+ const short EXECUTE_UP = 2;
+
+ /** opens on execute to the left.
+ */
+ const short EXECUTE_LEFT = 4;
+
+ /** opens on execute to the right.
+ */
+ const short EXECUTE_RIGHT = 8;
+
+};
+
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/WindowDescriptor.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/WindowDescriptor.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/WindowDescriptor.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/WindowDescriptor.idl Fri Feb 1 08:46:00 2013
@@ -106,10 +106,8 @@ published struct WindowDescriptor
<li>radiobutton</li>
<li>scrollbar</li>
<li>scrollbarbox</li>
- <li>simpleanimation</li>
<li>spinbutton</li>
<li>spinfield</li>
- <li>throbber</li>
<li>splitter</li>
<li>splitwindow</li>
<li>statusbar</li>
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenu.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenu.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenu.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,132 +7,294 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_awt_XMenu_idl__
+#define __com_sun_star_awt_XMenu_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/awt/MenuItemType.idl>
+
+module com { module sun { module star { module awt {
+
+published interface XPopupMenu;
+published interface XMenuListener;
-#ifndef __com_sun_star_awt_XMenu_idl__
-#define __com_sun_star_awt_XMenu_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
- published interface XPopupMenu;
- published interface XMenuListener;
-
-//=============================================================================
-
/** specifies a simple menu.
*/
published interface XMenu: com::sun::star::uno::XInterface
-{
- //-------------------------------------------------------------------------
-
- /** adds the specified menu listener to receive events from this menu.
- */
- [oneway] void addMenuListener( [in] XMenuListener xListener );
-
- //-------------------------------------------------------------------------
-
- /** removes the specified menu listener so that it no longer
- receives events from this menu.
- */
- [oneway] void removeMenuListener( [in] XMenuListener xListener );
-
- //-------------------------------------------------------------------------
-
- /** inserts an item into the menu.
-
- <p>The item is appended if the position is greater than or equal to
- <code>getItemCount()</code> or if it is negative.</p>
- */
- [oneway] void insertItem( [in] short nItemId,
- [in] string aText,
- [in] short nItemStyle,
- [in] short nPos );
-
- //-------------------------------------------------------------------------
-
- /** removes one or more items from the menu.
- */
- [oneway] void removeItem( [in] short nPos,
- [in] short nCount );
-
- //-------------------------------------------------------------------------
-
- /** returns the number of items in the menu.
- */
- short getItemCount();
-
- //-------------------------------------------------------------------------
-
- /** returns the id of the item at the specified position.
- */
- short getItemId( [in] short nPos );
-
- //-------------------------------------------------------------------------
-
- /** returns the position of the item with the specified id.
- */
- short getItemPos( [in] short nId );
-
- //-------------------------------------------------------------------------
-
- /** enables or disables the menu item.
- */
- [oneway] void enableItem( [in] short nItemId,
- [in] boolean bEnable );
-
- //-------------------------------------------------------------------------
-
- /** returns the state of the menu item.
- */
- boolean isItemEnabled( [in] short nItemId );
-
- //-------------------------------------------------------------------------
-
- /** sets the text for the menu item.
- */
- [oneway] void setItemText( [in] short nItemId,
- [in] string aText );
-
- //-------------------------------------------------------------------------
-
- /** returns the string for the given item id.
- */
- string getItemText( [in] short nItemId );
-
- //-------------------------------------------------------------------------
-
- /** sets the popup menu for a specified menu item.
- */
- [oneway] void setPopupMenu( [in] short nItemId,
- [in] XPopupMenu aPopupMenu );
-
- //-------------------------------------------------------------------------
-
- /** returns the popup menu from the menu item.
- */
- XPopupMenu getPopupMenu( [in] short nItemId );
-
-};
-
-
-}; }; }; };
-
-#endif
+{
+ /** adds the specified menu listener to receive events from this menu.
+
+ @param xListener
+ the <type>XMenuListener</type> to be added.
+ */
+ [oneway] void addMenuListener( [in] XMenuListener xListener );
+
+ /** removes the specified menu listener so that it no longer
+ receives events from this menu.
+
+ @param xListener
+ the <type>XMenuListener</type> to be removed.
+ */
+ [oneway] void removeMenuListener( [in] XMenuListener xListener );
+
+ /** inserts an item into the menu.
+ <p>The item is appended if the position is greater than or equal to
+ <member>getItemCount()</member> or if it is negative.</p>
+
+ @param nItemId
+ specifies the ID of the menu item to be insterted.
+
+ @param aText
+ specifies the label of the menu item.
+
+ @param nItemStyle
+ specifies the style of the menu item, as defined in
+ <type>MenuItemStyle</type>.
+
+ @param nItemPos
+ specifies the position where the menu item will be insterted.
+ */
+ [oneway] void insertItem( [in] short nItemId,
+ [in] string aText,
+ [in] short nItemStyle,
+ [in] short nItemPos );
+
+ /** removes one or more items from the menu.
+
+ @param nItemPos
+ specifies the position of the (first) menu item to be removed.
+
+ @param nCount
+ specifies the number of menu items to remove.
+ */
+ [oneway] void removeItem( [in] short nItemPos,
+ [in] short nCount );
+
+ /** removes all items from the menu.
+ */
+ void clear();
+
+ /** returns the number of items in the menu.
+
+ @return
+ the number of items in this <type>XMenu</type>.
+ */
+ short getItemCount();
+
+ /** returns the ID of the item at the specified position.
+
+ @param nItemPos
+ specifies the position of the menu item for which the item ID is queried.
+
+ @return
+ the ID of the menu item at the given position.
+ */
+ short getItemId( [in] short nItemPos );
+
+ /** returns the position of the item with the specified ID.
+
+ @param nItemId
+ specifies the ID of the menu item for which the item position is queried.
+
+ @return
+ the position of the menu item with the specified ID.
+ */
+ short getItemPos( [in] short nItemId );
+
+ /** retrieves the type of the menu item.
+
+ @param nItemPos
+ specifies the position of the menu item for which the item type is queried.
+
+ @return
+ a <type>MenuItemType</type> indicating the item type.
+ */
+ ::com::sun::star::awt::MenuItemType getItemType( [in] short nItemPos );
+
+ /** enables or disables the menu item.
+
+ @param nItemId
+ specifies the menu item ID.
+
+ @param bEnable
+ specifies whether the menu item should be enabled (<TRUE/>) or
+ disabled (<FALSE/>).
+ */
+ [oneway] void enableItem( [in] short nItemId,
+ [in] boolean bEnable );
+
+ /** returns the state of the menu item.
+
+ @param nItemId
+ specifies the menu item ID.
+
+ @return
+ <TRUE/> if the item is enabled, <FALSE/> otherwise.
+ */
+ boolean isItemEnabled( [in] short nItemId );
+
+ /** specifies whether disabled menu entries should be hidden, or not.
+
+ @param bHide
+ if <TRUE/>, disabled menu entries are hidden.
+ */
+ void hideDisabledEntries( [in] boolean bHide );
+
+ /** specifies whether mnemonics are automatically assigned to menu items, or not.
+
+ @param bEnable
+ if <TRUE/>, mnemonics are automatically assigned to menu items.
+ */
+ void enableAutoMnemonics( [in] boolean bEnable );
+
+ /** sets the text for the menu item.
+
+ @param nItemId
+ specifies the ID of the menu item.
+
+ @param aText
+ specifies the label of the menu item.
+ */
+ [oneway] void setItemText( [in] short nItemId,
+ [in] string aText );
+
+ /** returns the string for the given item id.
+
+ @param nItemId
+ specifies the ID of the menu item.
+
+ @return
+ the label of the menu item.
+ */
+ string getItemText( [in] short nItemId );
+
+ /** sets the command string for the menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the command should be set.
+
+ @param aCommand
+ specifies the command for the menu item.
+ */
+ void setCommand( [in] short nItemId,
+ [in] string aCommand );
+
+ /** retrieves the command string for the menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the command URL should be set.
+
+ @return
+ the command of the menu item.
+ */
+ string getCommand( [in] short nItemId );
+
+ /** sets the help command string for the menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the help command URL be set.
+
+ @param aCommand
+ specifies the help command for the menu item.
+ */
+ void setHelpCommand( [in] short nItemId,
+ [in] string aCommand );
+
+ /** retrieves the help command string for the menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the help command should be set.
+
+ @return
+ the help command of the menu item.
+ */
+ string getHelpCommand( [in] short nItemId );
+
+ /** sets the help text for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the help text should be set.
+
+ @param sHelpText
+ specifies the help text for the menu item.
+ */
+ void setHelpText( [in] short nItemId,
+ [in] string sHelpText );
+
+ /** retrieves the help text for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the help text should be retrieved.
+
+ @return
+ a string with the help text.
+ */
+ string getHelpText( [in] short nItemId );
+
+ /** sets the tip help text for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the tip help text should be set.
+
+ @param sTipHelpText
+ specifies the tip help text for the menu item.
+ */
+ void setTipHelpText( [in] short nItemId,
+ [in] string sTipHelpText );
+
+ /** retrieves the tip help text for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the tip help text should be retrieved.
+
+ @return
+ a string with the tip help text.
+ */
+ string getTipHelpText( [in] short nItemId );
+
+ /** checks whether an <type>XMenu</type> is an <type>XPopupMenu</type>.
+
+ @return
+ <TRUE/> if the menu is a <type>PopupMenu</type>,
+ <FALSE/> if it is a <type>MenuBar</type>.
+ */
+ boolean isPopupMenu();
+
+ /** sets the popup menu for a specified menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the <type>XPopupMenu</type> should be set.
+
+ @param aPopupMenu
+ specifies a <type>XPopupMenu</type>.
+ */
+ [oneway] void setPopupMenu( [in] short nItemId,
+ [in] XPopupMenu aPopupMenu );
+
+ /** returns the popup menu from the menu item.
+
+ @param nItemId
+ specifies the menu item ID for which the <type>XPopupMenu</type> should be retrieved.
+
+ @return
+ a <type>XPopupMenu</type>.
+ */
+ XPopupMenu getPopupMenu( [in] short nItemId );
+
+};
+
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuBar.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuBar.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuBar.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuBar.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,41 +7,31 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_awt_XMenuBar_idl__
+#define __com_sun_star_awt_XMenuBar_idl__
+
+#include <com/sun/star/awt/XMenu.idl>
+
+module com { module sun { module star { module awt {
-#ifndef __com_sun_star_awt_XMenuBar_idl__
-#define __com_sun_star_awt_XMenuBar_idl__
-
-#ifndef __com_sun_star_awt_XMenu_idl__
-#include <com/sun/star/awt/XMenu.idl>
-#endif
-
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
-//=============================================================================
-
/** identifies a menu bar.
*/
-published interface XMenuBar: com::sun::star::awt::XMenu
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+published interface XMenuBar: XMenu
+{
+};
+
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuListener.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuListener.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMenuListener.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,69 +7,49 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#ifndef __com_sun_star_awt_XMenuListener_idl__
-#define __com_sun_star_awt_XMenuListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuEvent_idl__
-#include <com/sun/star/awt/MenuEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMenuListener_idl__
+#define __com_sun_star_awt_XMenuListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/awt/MenuEvent.idl>
+
+module com { module sun { module star { module awt {
+
/** makes it possible to receive menu events on a window.
*/
published interface XMenuListener: com::sun::star::lang::XEventListener
-{
- //-------------------------------------------------------------------------
-
- /** is invoked when a menu item is highlighted.
- */
- [oneway] void highlight( [in] com::sun::star::awt::MenuEvent rEvent );
-
- //-------------------------------------------------------------------------
-
- /** is invoked when a menu item is selected.
- */
- [oneway] void select( [in] com::sun::star::awt::MenuEvent rEvent );
-
- //-------------------------------------------------------------------------
-
- /** is invoked when a menu is activated.
- */
- [oneway] void activate( [in] com::sun::star::awt::MenuEvent rEvent );
-
- //-------------------------------------------------------------------------
-
- /** is invoked when a menu is deactivated.
- */
- [oneway] void deactivate( [in] com::sun::star::awt::MenuEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{
+ /** is invoked when a menu item is highlighted.
+ */
+ [oneway] void itemHighlighted( [in] MenuEvent aEvent );
+
+ /** is invoked when a menu item is selected.
+ */
+ [oneway] void itemSelected( [in] MenuEvent aEvent );
+
+ /** is invoked when a menu is activated.
+ */
+ [oneway] void itemActivated( [in] MenuEvent aEvent );
+
+ /** is invoked when a menu is deactivated.
+ */
+ [oneway] void itemDeactivated( [in] MenuEvent aEvent );
+
+};
+
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBox.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBox.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBox.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBox.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,73 +7,45 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_awt_XMessageBox_idl__
+#define __com_sun_star_awt_XMessageBox_idl__
-#ifndef __com_sun_star_awt_XMessageBox_idl__
-#define __com_sun_star_awt_XMessageBox_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
-//=============================================================================
-
-/** gives access to a message box.
+#include <com/sun/star/uno/XInterface.idl>
- @deprecated
- */
-published interface XMessageBox: com::sun::star::uno::XInterface
-{
- //-------------------------------------------------------------------------
+module com { module sun { module star { module awt {
- /** sets the caption text.
+/** gives access to a message box.
+ */
+published interface XMessageBox
+{
+ /** the caption text.
*/
- [oneway] void setCaptionText( [in] string aText );
-
- //-------------------------------------------------------------------------
+ [attribute] string CaptionText;
- /** returns the caption text.
+ /** the message text.
*/
- string getCaptionText();
-
- //-------------------------------------------------------------------------
+ [attribute] string MessageText;
- /** sets the message text.
- */
- [oneway] void setMessageText( [in] string aText );
-
- //-------------------------------------------------------------------------
+ /** shows the message box.
- /** returns the message text.
+ @return
+ one of <type>MessageBoxResults</type>.
*/
- string getMessageText();
-
- //-------------------------------------------------------------------------
+ short execute();
+};
- /** shows the message box.
- */
- short execute();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBoxFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBoxFactory.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBoxFactory.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XMessageBoxFactory.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,98 +7,68 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
#define __com_sun_star_awt_XMessageBoxFactory_idl__
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBox_idl__
+#include <com/sun/star/awt/XWindowPeer.idl>
#include <com/sun/star/awt/XMessageBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__
#include <com/sun/star/awt/MessageBoxButtons.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-
-//=============================================================================
+#include <com/sun/star/awt/MessageBoxType.idl>
module com { module sun { module star { module awt {
-
-//=============================================================================
/** specifies a factory interface for creating message boxes.
*/
published interface XMessageBoxFactory : com::sun::star::uno::XInterface
{
- //-------------------------------------------------------------------------
-
- /** creates a message box.
-
- @returns
- the created message box or a null reference if it cannot be
- created.
-
- @param aParent
- a valid XWindowPeer reference which is used as a parent. This parameter
- must not be null.
-
- @param aPosSize
- a rectangle which defines the position and size of the message
- box in pixel.
-
+ /** creates a message box.
+
+ @returns
+ the created message box or a null reference if it cannot be
+ created.
+
+ @param aParent
+ a valid XWindowPeer reference which is used as a parent.
+
+ <p>This parameter must not be null.</p>
+
@param aType
- a string which determines the message box type.
- The following strings are defined.
- <ul>
- <li><b>infobox</b>A message box to inform the user about a certain event.
- <b>Attention:</b><br/>This type of message box ignores the argument
- aButton because a info box always shows a OK button.
- </li>
- <li><b>warningbox</b>A message to warn the user about a certain problem.</li>
- <li><b>errorbox</b>A message box to provide an error message to the user.</li>
- <li><b>querybox</b>A message box to query information from the user.</li>
- <li><b>messbox</b>A normal message box.</li>
- </ul>
+ the message box type.
@param aButtons
- specifies which buttons should be available on the
- message box. A combination of
- <type scope="com::sun::star::awt">MessageBoxButtons</type>. An <b>infobox</b>
- ignores this paramter and always use button "OK".
-
- @param aTitle
- specifies the title of the message box.
+ specifies which buttons should be available on the message box.
+
+ <p>A combination of <type>MessageBoxButtons</type>.</p>
+ <p>A <member scope="com::sun::star::awt">MessageBoxType::INFOBOX</member>
+ ignores this paramter, instead it uses a
+ <member scope="com::sun::star::awt">MessageBoxButtons::BUTTONS_OK</member>.</p>
+
+ @param aTitle
+ specifies the title of the message box.
@param aMessage
- specifies text which will be shown by the message box.
- Line-breaks must be added using 'CR' or 'CR+LF'.
- */
- XMessageBox createMessageBox( [in] com::sun::star::awt::XWindowPeer aParent, [in] com::sun::star::awt::Rectangle aPosSize, [in] string aType, [in] long aButtons, [in] string aTitle, [in] string aMessage );
+ specifies text which will be shown by the message box.
+ Line-breaks must be added using 'CR' or 'CR+LF'.
+ */
+ XMessageBox createMessageBox( [in] com::sun::star::awt::XWindowPeer aParent,
+ [in] MessageBoxType eType,
+ [in] long nButtons,
+ [in] string sTitle,
+ [in] string sMessage );
};
-//=============================================================================
-
}; }; }; };
#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/XPopupMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/XPopupMenu.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/XPopupMenu.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/XPopupMenu.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,86 +7,179 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_awt_XPopupMenu_idl__
+#define __com_sun_star_awt_XPopupMenu_idl__
+
+#include <com/sun/star/awt/KeyEvent.idl>
+#include <com/sun/star/awt/Point.idl>
+#include <com/sun/star/awt/XMenu.idl>
+#include <com/sun/star/graphic/XGraphic.idl>
+
+module com { module sun { module star { module awt {
+
+published interface XWindowPeer;
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
-#define __com_sun_star_awt_XPopupMenu_idl__
-
-#ifndef __com_sun_star_awt_XMenu_idl__
-#include <com/sun/star/awt/XMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-//=============================================================================
-
- module com { module sun { module star { module awt {
-
- published interface XWindowPeer;
-
-//=============================================================================
-
/** controls a popup menu.
*/
published interface XPopupMenu: XMenu
-{
- //-------------------------------------------------------------------------
-
- /** inserts a separator at the specified position.
- */
- [oneway] void insertSeparator( [in] short nPos );
-
- //-------------------------------------------------------------------------
-
- /** sets the menu default item.
- */
- [oneway] void setDefaultItem( [in] short nItemId );
-
- //-------------------------------------------------------------------------
-
- /** returns the menu default item.
- */
- short getDefaultItem();
-
- //-------------------------------------------------------------------------
-
- /** sets the state of the item to be checked or unchecked.
- */
- [oneway] void checkItem( [in] short nItemId,
- [in] boolean bCheck );
-
- //-------------------------------------------------------------------------
-
- /** returns whether the item is checked or unchecked.
- */
- boolean isItemChecked( [in] short nItemId );
-
- //-------------------------------------------------------------------------
-
- /** executes the popup menu and returns the selected item
- or <code>0</code>, if cancelled.
- */
- short execute( [in] XWindowPeer Parent,
- [in] Rectangle Area,
- [in] short Direction );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{
+ /** inserts a separator at the specified position.
+
+ @param nItemPos
+ specifies the position where the menu separator will be insterted.
+ */
+ [oneway] void insertSeparator( [in] short nItemPos );
+
+ /** sets the menu default item.
+
+ @param nItemId
+ specifies the menu item identifier.
+ */
+ [oneway] void setDefaultItem( [in] short nItemId );
+
+ /** returns the menu default item.
+
+ @return
+ the ID of the default item.
+ */
+ short getDefaultItem();
+
+ /** sets the state of the item to be checked or unchecked.
+
+ @param nItemId
+ specifies the menu item identifier.
+
+ @param bCheck
+ specifies if the item is checked (<TRUE/>) or unchecked (<FALSE/>).
+ */
+ [oneway] void checkItem( [in] short nItemId,
+ [in] boolean bCheck );
+
+ /** returns whether the item is checked or unchecked.
+
+ @param nItemId
+ specifies the menu item identifier.
+
+ @return
+ <TRUE/> if the item is checked, <FALSE/> otherwise.
+ */
+ boolean isItemChecked( [in] short nItemId );
+
+ /** executes the popup menu and returns the selected item
+ or <code>0</code>, if cancelled.
+
+ @param Parent
+ the parent window.
+
+ @param Position
+ the coordinates where the popup menu should be executed.
+
+ @param Direction
+ the direction in which a popup menu will grow, as specified
+ by one of the <type>PopupMenuDirection</type> constants.
+
+ @return
+ returns the selected item or <code>0</code>, if cancelled.
+ */
+ short execute( [in] XWindowPeer Parent,
+ [in] Point Position,
+ [in] short Direction );
+
+ /** queries if the <type>PopupMenu</type> is being.
+
+ <p>Returns <TRUE/> only if the <type>PopupMenu</type> is being executed
+ as a result of invoking <member >XPopupMenu::execute()</member>; that is,
+ for a <type>PopupMenu</type> activated by a <type>MenuBar</type> item,
+ this methods returns <FALSE/>.</p>
+
+ @return
+ <TRUE/> if the <type>PopupMenu</type> is being executed,
+ <FALSE/> otherwise.
+
+ @see <member >XPopupMenu::execute()</member>
+ */
+ boolean isInExecute();
+
+ /** ends the execution of the <type>PopupMenu</type>.
+ <p><member scope="com::sun::star::awt">XPopupMenu::execute()</member>
+ will then return 0.</p>
+
+ @see <member scope="com::sun::star::awt">XPopupMenu::execute()</member>
+ */
+ void endExecute();
+
+ /** sets the <type>KeyEvent</type> for the menu item.
+
+ <p>The <type>KeyEvent</type> is <b>only</b> used as a container to transport
+ the shortcut information, this methods only draws the text corresponding to
+ this keyboard shortcut. The client code is responsible for listening to
+ keyboard events (typicaly done via <type>XUserInputInterception</type>),
+ and dispatch the respective command.</p>
+
+ @param nItemId
+ specifies the menu item identifier for which the <type>KeyEvent</type> should be set.
+
+ @param aKeyEvent
+ specifies the <type>KeyEvent</type> for the menu item.
+ */
+ void setAcceleratorKeyEvent( [in] short nItemId,
+ [in] KeyEvent aKeyEvent );
+
+ /** retrieves the <type>KeyEvent</type> for the menu item.
+
+ <p>The <type>KeyEvent</type> is <b>only</b> used as a container to transport
+ the shortcut information, so that in this case
+ <member scope="::com::sun::star::lang::">EventObject::Source</member> is <NULL/>.</p>
+
+ @param nItemId
+ specifies the menu item identifier for which the <type>KeyEvent</type> should be retrieved.
+
+ @return
+ the <type>KeyEvent</type> struct assigned to the requested menu item.
+ */
+ KeyEvent getAcceleratorKeyEvent( [in] short nItemId );
+
+ /** sets the image for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the image should be set.
+
+ @param xGraphic
+ specifies the image for the menu item.
+
+ @param bScale
+ if <TRUE/>, the image will be scaled to the standard size used internally by
+ the implementation.
+ */
+ void setItemImage( [in] short nItemId,
+ [in] ::com::sun::star::graphic::XGraphic xGraphic,
+ [in] boolean bScale );
+
+ /** retrieves the image for the menu item.
+
+ @param nItemId
+ specifies the menu item identifier for which the image should be retrieved.
+
+ @return
+ a <type scope="::com::sun::star::graphic::">XGraphic</type> reference
+ to the current image for the requested menu item.
+ */
+ ::com::sun::star::graphic::XGraphic getItemImage( [in] short nItemId );
+
+};
+
+}; }; }; };
+
+#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/makefile.mk (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/makefile.mk Fri Feb 1 08:46:00 2013
@@ -117,7 +117,8 @@ IDLFILES=\
MenuEvent.idl\
MenuItemStyle.idl\
MessageBoxButtons.idl\
- MessageBoxCommand.idl\
+ MessageBoxResults.idl\
+ MessageBoxType.idl\
MouseButton.idl\
MouseEvent.idl\
MouseWheelBehavior.idl\
@@ -191,12 +192,8 @@ IDLFILES=\
UnoControlRoadmapModel.idl\
UnoControlScrollBar.idl\
UnoControlScrollBarModel.idl\
- UnoControlSimpleAnimation.idl\
- UnoControlSimpleAnimationModel.idl\
UnoControlSpinButton.idl\
UnoControlSpinButtonModel.idl\
- UnoControlThrobber.idl\
- UnoControlThrobberModel.idl\
UnoControlTimeField.idl\
UnoControlTimeFieldModel.idl\
VclContainerEvent.idl\
@@ -288,9 +285,7 @@ IDLFILES=\
XSystemDependentMenuPeer.idl\
XSystemDependentWindowPeer.idl\
SystemDependentXWindow.idl\
- XSimpleAnimation.idl\
XSimpleTabController.idl\
- XThrobber.idl\
XTabController.idl\
XTabControllerModel.idl\
XTabListener.idl\
@@ -318,7 +313,6 @@ IDLFILES=\
XWindowListener.idl\
XWindowListener2.idl\
XWindowPeer.idl\
- XMenuExtended.idl\
MaxChildrenException.idl\
XDialog2.idl\
XLayoutContainer.idl\
@@ -327,10 +321,6 @@ IDLFILES=\
XLayoutRoot.idl\
XLayoutUnit.idl \
MenuItemType.idl \
- MenuLogo.idl \
- XMenuExtended2.idl \
- XMenuBarExtended.idl \
- XPopupMenuExtended.idl \
XItemList.idl \
XItemListListener.idl \
ItemListEvent.idl \
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecute.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecute.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecute.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecute.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,66 +7,37 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecute_idl__
#define __com_sun_star_system_SystemShellExecute_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
-#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-//=============================================================================
+#include <com/sun/star/system/XSystemShellExecute.idl>
module com { module sun { module star { module system {
-//=============================================================================
-
- published interface XSystemShellExecute;
-
-//=============================================================================
-/** Specifies a system executer service. Such a service makes it possible
- to execute an arbitrary system command.
+published interface XSystemShellExecute;
- @see com::sun::star::system::XSystemShellExecute
+/** Specifies a system executer service. Such a service makes it possible
+ to execute an arbitrary system command.
*/
-
-published service SystemShellExecute
+published service SystemShellExecute : XSystemShellExecute
{
- //-------------------------------------------------------------------------
- /** Provides access to a <type>XSystemShellExecute</type> interface.
- */
- interface XSystemShellExecute;
-
- //-------------------------------------------------------------------------
- /** Service should always support this interface.
- */
- interface com::sun::star::lang::XServiceInfo;
-
- //-------------------------------------------------------------------------
- /** Service should always support this interface.
- */
- interface com::sun::star::lang::XTypeProvider;
+ /** service constructor
+ */
+ create();
};
-//=============================================================================
-
}; }; }; };
#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteException.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteException.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteException.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,52 +7,40 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#define __com_sun_star_system_SystemShellExecuteException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
module com { module sun { module star { module system {
-//=============================================================================
-/** May be thrown in cases of errors executing a command using the <type>SystemShellExecute</type> service.
- <member scope="com::sun::star::uno">Exception::Message</member> may contain a
- system error message, but it is not mandatory.
- The member PosixError specifies a POSIX conforming error code or -1 for
- unknown errors.
+/** May be thrown in cases of errors executing a command using the
+ <type>SystemShellExecute</type> service.
+
+ <p><member scope="com::sun::star::uno">Exception::Message</member> may
+ contain a system error message, but it is not mandatory.</p>
+ <p>The member <member>PosixError</member> specifies a POSIX conforming error
+ code or -1 for unknown errors.</p>
*/
published exception SystemShellExecuteException: com::sun::star::uno::Exception
{
- //=========================================================================
- /** A Posix conforming error code or -1 for unknown errors.
- */
- long PosixError;
+ /** A Posix conforming error code or -1 for unknown errors.
+ */
+ long PosixError;
};
-//=============================================================================
-
}; }; }; };
-/*=============================================================================
-
-
-=============================================================================*/
#endif
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,45 +7,36 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecuteFlags_idl__
#define __com_sun_star_system_SystemShellExecuteFlags_idl__
-
module com { module sun { module star { module system {
-//=============================================================================
-/** Different settings for the <type>SystemShellExecute</type> service.
+/** Different settings for the <type>SystemShellExecute</type> service.
*/
-
published constants SystemShellExecuteFlags
{
- //---------------------------------------------------------------------
- /** Uses the default settings for executing commands.
- */
- const long DEFAULTS = 0;
-
- //---------------------------------------------------------------------
- /** Prevents the display of system error message boxes if the
- method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
- */
- const long NO_SYSTEM_ERROR_MESSAGE = 1;
-};
-
-//=============================================================================
+ /** Uses the default settings for executing commands.
+ */
+ const long DEFAULTS = 0;
+
+ /** Prevents the display of system error message boxes if the
+ method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
+ */
+ const long NO_SYSTEM_ERROR_MESSAGE = 1;
+};
}; }; }; };
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/system/XSystemShellExecute.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/system/XSystemShellExecute.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/system/XSystemShellExecute.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/system/XSystemShellExecute.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,84 +7,63 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_XSystemShellExecute_idl__
#define __com_sun_star_system_XSystemShellExecute_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#include <com/sun/star/system/SystemShellExecuteException.idl>
-#endif
-
-//=============================================================================
module com { module sun { module star { module system {
-//=============================================================================
/** Specifies an interface for executing a system command.
*/
-
-
-published interface XSystemShellExecute: com::sun::star::uno::XInterface
+published interface XSystemShellExecute
{
- //-------------------------------------------------------------------------
- /** Executes an abitrary system command.
-
- @param aCommand
- Specifies the command to execute. This may be an executable file or a
- document which is registered with an application on a specific platform,
- so that the platform knows what application to launch for that document.
- If the command specifies a path to an executable, etc, this has to be
- a system specific path.
-
- @param aParameter
- Specifies a list of space separated parameters. The method does not
- validate the given parameters, but only passes it as a parameter to the
- specified command.
-
- @param nFlags
- Specifies different flags to control the execution of this method, for example,
- avoid showing system error messages, in case of failures, etc.
-
- @throws com::sun::star::lang::IllegalArgumentException
- when the specified flags are wrong or exclude each other.
-.
- @throws com::sun::star::sys::SystemExecuteException
- in the case of errors when trying to executed the specified command.
-
- @see com::sun::star::system::SystemShellExecuteFlags
- */
- void execute( [in] string aCommand, [in] string aParameter, [in] long nFlags )
- raises( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException );
-};
+ /** Executes an abitrary system command.
-//=============================================================================
+ @param aCommand
+ Specifies the command to execute.
+ <p>This may be an executable file or a document which is registered with
+ an application on a specific platform, so that the platform knows what
+ application to launch for that document.</p>
+ <p>If the command specifies a path to an executable, etc, this has to be
+ a system specific path.</p>
+
+ @param aParameter
+ Specifies a list of space separated parameters.
+ <p>The method does not validate the given parameters, but only passes it
+ as a parameter to the specified command.</p>
+
+ @param nFlags
+ A combination of <type>SystemShellExecuteFlags</type> specifying different
+ flags to control the execution of this method.
+
+ @throws com::sun::star::lang::IllegalArgumentException
+ when the specified flags are wrong or exclude each other.
+
+ @throws com::sun::star::sys::SystemExecuteException
+ in the case of errors when trying to executed the specified command.
+ */
+ void execute( [in] string sCommand,
+ [in] string sParameter,
+ [in] long nFlags )
+ raises( ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::system::SystemShellExecuteException );
+};
}; }; }; };
#endif
-
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/system/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/system/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/system/makefile.mk (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/system/makefile.mk Fri Feb 1 08:46:00 2013
@@ -34,21 +34,15 @@ PACKAGE=com$/sun$/star$/system
# ------------------------------------------------------------------------
IDLFILES=\
+ MailClientFlags.idl\
+ SystemMailProvider.idl\
SystemShellExecute.idl\
SystemShellExecuteException.idl\
SystemShellExecuteFlags.idl\
+ XMailClient.idl\
+ XMailMessage.idl\
+ XSystemMailProvider.idl\
XSystemShellExecute.idl\
- SimpleMailClientFlags.idl\
- XSimpleMailMessage.idl\
- XSimpleMailMessage2.idl\
- XSimpleMailClient.idl\
- XSimpleMailClientSupplier.idl\
- SimpleCommandMail.idl \
- SimpleSystemMail.idl\
- ProxySettings.idl\
- SOffice52ProxySettings.idl\
- SystemProxySettings.idl\
- XProxySettings.idl
# ------------------------------------------------------------------
Modified: openoffice/branches/ia2/main/offapi/com/sun/star/text/ViewSettings.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/text/ViewSettings.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/text/ViewSettings.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/text/ViewSettings.idl Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,260 +7,172 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#ifndef __com_sun_star_text_ViewSettings_idl__
#define __com_sun_star_text_ViewSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_DocumentZoomType_idl__
#include <com/sun/star/view/DocumentZoomType.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
- module com { module sun { module star { module text {
-//=============================================================================
+module com { module sun { module star { module text {
// DocMerge from xml: service com::sun::star::text::ViewSettings
/** provides access to the settings of the controller of a text document.
*/
published service ViewSettings
{
- // DocMerge: empty anyway
- interface com::sun::star::beans::XPropertySet;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowAnnotations
- /** If this property is <TRUE/>, annotations (notes) are visible.
- */
- [property] boolean ShowAnnotations;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowBreaks
- /** If this property is <TRUE/>, paragraph line breaks are visible.
- */
- [property] boolean ShowBreaks;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFieldCommandsShowDrawings
- /** If this property is <TRUE/>, shapes are visible.
- */
- [property] boolean ShowDrawings;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFieldCommands
- /** If this property is <TRUE/>, text fields are shown with their commands; otherwise
- the content is visible.
- */
- [property] boolean ShowFieldCommands;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFootnoteBackground
- /** If this property is <TRUE/>, footnotes symbols are displayed with gray background.
- */
- [property] boolean ShowFootnoteBackground;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowGraphics
- /** If this property is <TRUE/>, graphic objects are visible.
- */
- [property] boolean ShowGraphics;
+ interface com::sun::star::beans::XPropertySet;
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowHiddenParagraphs
- /** If this property is <TRUE/>, hidden paragraghs are displayed.
- */
- [property] boolean ShowHiddenParagraphs;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowHiddenText
- /** If this property is <TRUE/>, hidden text is displayed.
- */
- [property] boolean ShowHiddenText;
-
- //-------------------------------------------------------------------------
-
- /** ShowHoriRuler and ShowVertRuler determine whether a ruler is visible.
- */
- [property] boolean ShowRulers;
-
- //-------------------------------------------------------------------------
-
- /** If this property is <TRUE/> and the property ShowRulers is <TRUE/>,
- the horizontal ruler is displayed.
- */
- [property] boolean ShowHoriRuler;
-
- //-------------------------------------------------------------------------
-
- /** If this property is <TRUE/> and the property ShowRulers is <TRUE/>,
- the horizontal scroll bar is displayed.
- */
- [property] boolean ShowHoriScrollBar;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowIndexMarkBackground
- /** If this property is <TRUE/>, index marks are displayed with gray background.
- */
- [property] boolean ShowIndexMarkBackground;
-
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, annotations (notes) are visible.
+ */
+ [property] boolean ShowAnnotations;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowParaBreaks
- /** If this property is <TRUE/>, paragraph breaks are visible.
- */
- [property] boolean ShowParaBreaks;
+ /** If this property is <TRUE/>, paragraph line breaks are visible.
+ */
+ [property] boolean ShowBreaks;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, shapes are visible.
+ */
+ [property] boolean ShowDrawings;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowProtectedSpaces
- /** If this property is <TRUE/>, protected spaces (hard spaces) are displayed with gray
- background.
- */
- [property] boolean ShowProtectedSpaces;
+ /** If this property is <TRUE/>, text fields are shown with their commands; otherwise
+ the content is visible.
+ */
+ [property] boolean ShowFieldCommands;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, footnotes symbols are displayed with gray background.
+ */
+ [property] boolean ShowFootnoteBackground;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowSoftHyphens
- /** If this property is <TRUE/>, soft hyphens are displayed with gray background.
- */
- [property] boolean ShowSoftHyphens;
+ /** If this property is <TRUE/>, graphic objects are visible.
+ */
+ [property] boolean ShowGraphics;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, hidden paragraghs are displayed.
+ */
+ [property] boolean ShowHiddenParagraphs;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowSpaces
- /** If this property is <TRUE/>, spaces are displayed with dots.
- */
- [property] boolean ShowSpaces;
+ /** If this property is <TRUE/>, hidden text is displayed.
+ */
+ [property] boolean ShowHiddenText;
- //-------------------------------------------------------------------------
+ /** ShowHoriRuler and ShowVertRuler determine whether a ruler is visible.
+ */
+ [property] boolean ShowRulers;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTableBoundaries
- /** If this property is <TRUE/>, table boundaries are displayed.
- */
- [property] boolean ShowTableBoundaries;
+ /** If this property is <TRUE/> and the property ShowRulers is <TRUE/>,
+ the horizontal ruler is displayed.
+ */
+ [property] boolean ShowHoriRuler;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/> and the property ShowRulers is <TRUE/>,
+ the horizontal scroll bar is displayed.
+ */
+ [property] boolean ShowHoriScrollBar;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTables
- /** If this property is <TRUE/>, tables are visible.
- */
- [property] boolean ShowTables;
+ /** If this property is <TRUE/>, index marks are displayed with gray background.
+ */
+ [property] boolean ShowIndexMarkBackground;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, paragraph breaks are visible.
+ */
+ [property] boolean ShowParaBreaks;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTabstops
- /** If this property is <TRUE/>, tab stops are visible.
- */
- [property] boolean ShowTabstops;
+ /** If this property is <TRUE/>, protected spaces (hard spaces) are displayed with gray
+ background.
+ */
+ [property] boolean ShowProtectedSpaces;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, soft hyphens are displayed with gray background.
+ */
+ [property] boolean ShowSoftHyphens;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTextBoundaries
- /** If this property is <TRUE/>, text boundaries are displayed.
- */
- [property] boolean ShowTextBoundaries;
+ /** If this property is <TRUE/>, spaces are displayed with dots.
+ */
+ [property] boolean ShowSpaces;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, table boundaries are displayed.
+ */
+ [property] boolean ShowTableBoundaries;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTextFieldBackground
- /** If this property is <TRUE/>, text fields are displayed with gray background.
- */
- [property] boolean ShowTextFieldBackground;
+ /** If this property is <TRUE/>, tables are visible.
+ */
+ [property] boolean ShowTables;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, tab stops are visible.
+ */
+ [property] boolean ShowTabstops;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowVertRuler
- /** If this property is <TRUE/>, the vertical ruler is displayed.
- */
- [property] boolean ShowVertRuler;
+ /** If this property is <TRUE/>, text boundaries are displayed.
+ */
+ [property] boolean ShowTextBoundaries;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, text fields are displayed with gray background.
+ */
+ [property] boolean ShowTextFieldBackground;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowVertScrollBar
- /** If this property is <TRUE/>, the vertical scroll bar is displayed.
- */
- [property] boolean ShowVertScrollBar;
+ /** If this property is <TRUE/>, the vertical ruler is displayed.
+ */
+ [property] boolean ShowVertRuler;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, the vertical scroll bar is displayed.
+ */
+ [property] boolean ShowVertScrollBar;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::SmoothScrolling
- /** If this property is <TRUE/>, smooth scrolling is active.
- */
- [property] boolean SmoothScrolling;
+ /** If this property is <TRUE/>, smooth scrolling is active.
+ */
+ [property] boolean SmoothScrolling;
- //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, handles of drawing objects are visible.
+ */
+ [property] boolean SolidMarkHandles;
- // DocMerge from xml: property com::sun::star::text::ViewSettings::SolidMarkHandles
- /** If this property is <TRUE/>, handles of drawing objects are visible.
- */
- [property] boolean SolidMarkHandles;
- //-------------------------------------------------------------------------
/** If this property is <TRUE/>, the vertical ruler is aligned to the right side
of the view and the vertical scrollbar is on the left.
- */
+ */
[property] boolean IsVertRulerRightAligned;
- //-------------------------------------------------------------------------
/** If this property is <TRUE/> the document will be displayed as if it
were a HTML document.
- */
+ */
[property] boolean ShowOnlineLayout;
- //-------------------------------------------------------------------------
/** This property defines the zoom type for the document.
@see com::sun::star::view::DocumentZoomType
*/
[property] short ZoomType;
- //-------------------------------------------------------------------------
/** Defines the zoom value to use.
Valid only if the ZoomType is set to
<member scope="com::sun::star::view::DocumentZoomType">BY_VALUE</member>.
- */
+ */
[property] short ZoomValue;
- //-------------------------------------------------------------------------
+
/** If this property is <TRUE/> hyperlinks in the document are executed (loaded) on
mouse click. Otherwise they are handled like normal text.
*/
[optional, property] boolean IsExecuteHyperlinks;
- //-------------------------------------------------------------------------
/** Specifies whether to display the grid or not
@since OOo 2.0
*/
[optional, property] boolean IsRasterVisible;
- //-------------------------------------------------------------------------
/** Specifies whether to move frames, drawing elements, and form
functions only between grid points.
@@ -268,7 +180,6 @@ published service ViewSettings
*/
[optional, property] boolean IsSnapToRaster;
- //-------------------------------------------------------------------------
/** Specifies the number of intervals between grid points on the X-axis.
<p>The value must be greater or equal to 0, and the application
@@ -280,7 +191,6 @@ published service ViewSettings
*/
[optional, property] long RasterSubdivisionX;
- //-------------------------------------------------------------------------
/** Specifies the number of intervals between grid points on the Y-axis.
<p>The value must be greater or equal to 0, and the application
@@ -292,7 +202,6 @@ published service ViewSettings
*/
[optional, property] long RasterSubdivisionY;
- //-------------------------------------------------------------------------
/** Defines the unit of measure for the spacing between grid points
on the X-axis.
@@ -305,7 +214,6 @@ published service ViewSettings
*/
[optional, property] long RasterResolutionX;
- //-------------------------------------------------------------------------
/** Defines the unit of measure for the spacing between grid points
on the Y-axis.
@@ -318,13 +226,12 @@ published service ViewSettings
*/
[optional, property] long RasterResolutionY;
- //-------------------------------------------------------------------------
/** If this property is <TRUE/>, hidden characters are displayed
@since OOo 3.0
*/
[optional, property] boolean ShowHiddenCharacters;
- //-------------------------------------------------------------------------
+
/** If this property is <TRUE/>, the settings of nonprinting characters are applied.
<p>This option controls the use of the settings ShowHiddenCharacters,
@@ -333,7 +240,7 @@ published service ViewSettings
@since OOo 3.0
*/
[optional, property] boolean ShowNonprintingCharacters;
- //-------------------------------------------------------------------------
+
/** metric unit of the horizontal ruler
<p>Uses values <type scope="com::sun::star::awt">FieldUnit</type></p>
@@ -341,7 +248,7 @@ published service ViewSettings
@since OOo 3.1
*/
[optional, property] long HorizontalRulerMetric;
- //-------------------------------------------------------------------------
+
/** metric unit of the vertical ruler
<p>Uses values from <type scope="com::sun::star::awt">FieldUnit</type></p>
@@ -349,16 +256,21 @@ published service ViewSettings
@since OOo 3.1
*/
[optional, property] long VerticalRulerMetric;
- //-------------------------------------------------------------------------
+
/** If this property is <TRUE/>, tips for document content are shown,
typically in a help balloon when the mouse is over the content.
- @since Apache OpenOffice 3.5
+ @since Apache OpenOffice 4.0
*/
[optional, property] boolean ShowContentTips;
-};
-//=============================================================================
+ /** If this property is <TRUE/>, and the scroll bar is shown, a tool tip
+ is displayed while scrolling.
+
+ @since Apache OpenOffice 4.0
+ */
+ [optional, property] boolean ShowScrollBarTips;
+};
}; }; }; };
Modified: openoffice/branches/ia2/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/type_reference/typelibrary_history.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/type_reference/typelibrary_history.txt (original)
+++ openoffice/branches/ia2/main/offapi/type_reference/typelibrary_history.txt Fri Feb 1 08:46:00 2013
@@ -192,3 +192,9 @@
06/12/2012 (arielch): TaskID=121442
Extend css::awt::XGraphics for StatusbarController implementation
+
+19/12/2012 (arielch): TaskID=121513
+ Remove deprecated AWT Throbber API
+
+19/12/2012 (arielch): TaskID=121514
+ Remove deprecated AWT UnoControlSimpleAnimation API
Modified: openoffice/branches/ia2/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/type_reference/types.rdb?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu (original)
+++ openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu Fri Feb 1 08:46:00 2013
@@ -24,26 +24,6 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"
oor:name="ExtensionDependencies" oor:package="org.openoffice.Office">
<node oor:name="Extensions">
- <node oor:name="com.oracle.Office.Connector.Professional" oor:op="replace">
- <prop oor:name="Versions">
- <value>
- <it>1.0.0</it>
- </value>
- </prop>
- <prop oor:name="Dependencies">
- <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.3" value="3.3"/></d:dependencies></value>
- </prop>
- </node>
- <node oor:name="org.openoffice.bi.OracleBIConnector" oor:op="replace">
- <prop oor:name="Versions">
- <value>
- <it>1.0</it>
- </value>
- </prop>
- <prop oor:name="Dependencies">
- <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.3" value="3.3"/></d:dependencies></value>
- </prop>
- </node>
<node oor:name="com.sun.PresenterScreen-linux_x86" oor:op="replace">
<prop oor:name="Versions">
<value>
@@ -123,4 +103,4 @@
</prop>
</node>
</node>
-</oor:component-data>
\ No newline at end of file
+</oor:component-data>
Modified: openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Setup.xcu (original)
+++ openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Setup.xcu Fri Feb 1 08:46:00 2013
@@ -41,10 +41,10 @@
<value >${PRODUCTEXTENSION}</value>
</prop>
<prop oor:name="ooXMLFileFormatVersion" install:module="brand">
- <value >${FILEFORMATVERSION}</value>
+ <value >${OOOXMLFILEFORMATVERSION}</value>
</prop>
<prop oor:name="ooXMLFileFormatName" install:module="brand">
- <value >${FILEFORMATNAME}</value>
+ <value >${OOOXMLFILEFORMATNAME}</value>
</prop>
<prop oor:name="ooOpenSourceContext" install:module="brand">
<value >${OPENSOURCE}</value>
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs Fri Feb 1 08:46:00 2013
@@ -157,6 +157,22 @@
</info>
</set>
</group>
+ <group oor:name="ToolBar">
+ <info>
+ <desc>Contains the structure of a toolbar.</desc>
+ </info>
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>A localized string used as the toolbar title.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <set oor:name="ToolBarItems" oor:node-type="ToolBarItem">
+ <info>
+ <desc>Contains a list of sets of toolbar items that are part of add-on toolbars.</desc>
+ </info>
+ </set>
+ </group>
<group oor:name="ToolBarItem">
<info>
<desc>Describes a toolbar item representing a function of of an external component. The name must be unique and should be written using a package-scheme like org.openoffice.external.applicationexecuter to minimize name clashes.</desc>
@@ -400,10 +416,10 @@
<desc>Contains a list of menu merging instructions of different add-ons.</desc>
</info>
</set>
- <set oor:name="OfficeToolBar" oor:node-type="ToolBarItems">
- <info>
- <desc>Contains a list of sets of toolbar items that are part of add-on toolbars.</desc>
- </info>
+ <set oor:name="OfficeToolBar" oor:node-type="ToolBar">
+ <info>
+ <desc>Contains a lists of addon toolbars.</desc>
+ </info>
</set>
<set oor:name="OfficeToolbarMerging" oor:node-type="MergeToolBarItems">
<info>
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs Fri Feb 1 08:46:00 2013
@@ -333,7 +333,7 @@
<!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines -->
<info>
<author>NN</author>
- <desc>Specifies whether control points are displayed as simple squares without 3D effect.</desc>
+ <desc>Specifies whether control points are displayed simple or enhanced.</desc>
<label>Simple control points</label>
</info>
<value>false</value>
@@ -347,7 +347,7 @@
<desc>Specifies whether control points are displayed as larger than the default size.</desc>
<label>Large control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs Fri Feb 1 08:46:00 2013
@@ -322,7 +322,7 @@
<desc>Indicates whether a double-click on an object activates the rotation mode.</desc>
<label>Rotation Mode after clicking object</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Preview" oor:type="xs:double">
<!-- OldPath: Draw/Other -->
@@ -366,7 +366,7 @@
<!-- UIHints: Optionbar -->
<info>
<author>AF</author>
- <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
+ <desc>Indicates whether to show simple (true) or enhanced handles (false).</desc>
<label>Simple Handles</label>
</info>
<value>true</value>
@@ -380,7 +380,7 @@
<desc>Indicates whether to show big (true) or small (false) handles.</desc>
<label>Big Handles</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
<!-- OldPath: Draw/Other -->
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs Fri Feb 1 08:46:00 2013
@@ -409,10 +409,10 @@
<!-- OldLocation: soffice.cfg -->
<!-- UIHints: Optionbar -->
<info>
- <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
+ <desc>Indicates whether to show simple (true) or enhanced handles (false).</desc>
<label>Simple Handles</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<!-- OldPath: Impress/Other -->