You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [23/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/offapi/com/sun/star/text/ViewSettings.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/text/ViewSettings.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/text/ViewSettings.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/text/ViewSettings.idl Sun Feb 3 13:23:59 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/l10n/main/offapi/com/sun/star/ui/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/ui/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/ui/makefile.mk (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/ui/makefile.mk Sun Feb 3 13:23:59 2013
@@ -70,6 +70,7 @@ IDLFILES=\
XImageManager.idl \
XModuleUIConfigurationManager.idl \
XModuleUIConfigurationManagerSupplier.idl \
+ XStatusbarItem.idl \
XUIConfiguration.idl \
XUIConfigurationListener.idl \
XUIConfigurationManager.idl \
Modified: openoffice/branches/l10n/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/type_reference/typelibrary_history.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/type_reference/typelibrary_history.txt (original)
+++ openoffice/branches/l10n/main/offapi/type_reference/typelibrary_history.txt Sun Feb 3 13:23:59 2013
@@ -189,3 +189,12 @@
06/11/2012 (JSC): TaskID=119944
Update reference type library to 3.4 version
+
+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/l10n/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/type_reference/types.rdb?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu (original)
+++ openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu Sun Feb 3 13:23:59 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/l10n/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu (original)
+++ openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu Sun Feb 3 13:23:59 2013
@@ -459,28 +459,6 @@
</prop>
</node>
<node oor:name="c5" oor:op="replace">
- <prop oor:name="Command">
- <value>.uno:StatusbarLogo</value>
- </prop>
- <prop oor:name="Module">
- <value/>
- </prop>
- <prop oor:name="Controller">
- <value>com.sun.star.comp.framework.LogoImageStatusbarController</value>
- </prop>
- </node>
- <node oor:name="c6" oor:op="replace">
- <prop oor:name="Command">
- <value>.uno:StatusbarLogoText</value>
- </prop>
- <prop oor:name="Module">
- <value/>
- </prop>
- <prop oor:name="Controller">
- <value>com.sun.star.comp.framework.LogoTextStatusbarController</value>
- </prop>
- </node>
- <node oor:name="c7" oor:op="replace">
<prop oor:name="Command">
<value>.uno:LanguageStatus</value>
</prop>
Modified: openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu (original)
+++ openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu Sun Feb 3 13:23:59 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/l10n/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs Sun Feb 3 13:23:59 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,16 @@
* 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.
- *
+ *
***********************************************************-->
@@ -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>
@@ -197,6 +213,103 @@
</info>
</prop>
</group>
+ <group oor:name="MergeStatusBarInstruction">
+ <info>
+ <desc>Describes a merge status bar instruction 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. A merge instruction describes how the attached status bar items should be merged into the Office status bar.</desc>
+ </info>
+ <prop oor:name="MergePoint" oor:type="xs:string">
+ <info>
+ <desc>Describes the command that should be used as a reference point for the merge command.</desc>
+ </info>
+ </prop>
+ <prop oor:name="MergeCommand" oor:type="xs:string">
+ <info>
+ <desc>A command to be processed for this merge instruction.</desc>
+ </info>
+ </prop>
+ <prop oor:name="MergeCommandParameter" oor:type="xs:string">
+ <info>
+ <desc>Optional parameters for a merge command. Interpretation depends on the individual command.</desc>
+ </info>
+ </prop>
+ <prop oor:name="MergeFallback" oor:type="xs:string">
+ <info>
+ <desc>A fallback command to be used if MergeCommand cannot be applied.</desc>
+ </info>
+ </prop>
+ <prop oor:name="MergeContext" oor:type="xs:string">
+ <info>
+ <desc>A property to define the context of this merge instruction. It can be empty or a colon separated list of the supported application modules.</desc>
+ </info>
+ </prop>
+ <set oor:name="StatusBarItems" oor:node-type="StatusBarItem">
+ <info>
+ <desc>Contains a list of status bar items used by an Add-On.</desc>
+ </info>
+ </set>
+ </group>
+ <group oor:name="StatusBarItem">
+ <info>
+ <desc>Describes a status bar item representing a function 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>
+ </info>
+ <prop oor:name="Context" oor:type="xs:string">
+ <info>
+ <desc>A property to define the context of a status bar item. It can be empty or a colon separated list of the supported application modules.</desc>
+ </info>
+ </prop>
+ <prop oor:name="URL" oor:type="xs:string">
+ <info>
+ <desc>A command URL which represents the function to execute.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>A localized string used as the status bar item label.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="Alignment" oor:type="xs:string">
+ <info>
+ <desc>The alignment of the status bar item.</desc>
+ </info>
+ <constraints>
+ <enumeration oor:value="left">
+ <info>
+ <desc>The status bar control is aligned to the left</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="center">
+ <info>
+ <desc>The status bar control is aligned in the center</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="right">
+ <info>
+ <desc>The status bar control is aligned to the right</desc>
+ </info>
+ </enumeration>
+ </constraints>
+ <value>left</value>
+ </prop>
+ <prop oor:name="AutoSize" oor:type="xs:boolean">
+ <info>
+ <desc>Specifies whether the size of the status bar item is fixed (false) or not (true).</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="OwnerDraw" oor:type="xs:boolean">
+ <info>
+ <desc>Specifies whether the contents of the status bar item are drawn by the client (true) or by the internal implemenetation (false).</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="Width" oor:type="xs:long">
+ <info>
+ <desc>A property to define the size of a status bar item.</desc>
+ </info>
+ <value>0</value>
+ </prop>
+ </group>
<group oor:name="UserDefinedImages">
<info>
<desc>A group of optional user-defined images. There are two ways to define image - 1. Embed the image data directly into the configuration. 2. Use file URLs to address external bitmap files. Embedded image data has a higher priority than file URLs.</desc>
@@ -272,6 +385,11 @@
<desc>Contains a list of merge toolbar instructions defined by an Add-On which specify how to merge toolbar items into an existing toolbar.</desc>
</info>
</set>
+ <set oor:name="MergeStatusBarItems" oor:node-type="MergeStatusBarInstruction">
+ <info>
+ <desc>Contains a list of merge status bar instructions defined by an Add-On which specify how to merge status bar items into an existing status bar.</desc>
+ </info>
+ </set>
</templates>
<component>
<group oor:name="AddonUI">
@@ -298,16 +416,21 @@
<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>
<desc>Contains a list of toolbar merging instructions of different add-ons. </desc>
</info>
</set>
+ <set oor:name="OfficeStatusbarMerging" oor:node-type="MergeStatusBarItems">
+ <info>
+ <desc>Contains a list of status bar merging instructions of different add-ons. </desc>
+ </info>
+ </set>
<set oor:name="OfficeHelp" oor:node-type="MenuItem">
<info>
<desc>Contains a list of functions inserted into the Office help menu. The optional property 'Submeno' will be ignored for this set.</desc>
Modified: openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs Sun Feb 3 13:23:59 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/l10n/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs Sun Feb 3 13:23:59 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/l10n/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs Sun Feb 3 13:23:59 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 -->
Modified: openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs Sun Feb 3 13:23:59 2013
@@ -1298,10 +1298,10 @@
<!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control points are displayed simple or enhanced.</desc>
<label>Simple control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint" oor:type="xs:boolean">
<!-- OldPath: Writer/Layout/Lines -->
@@ -1309,16 +1309,25 @@
<!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control points.</desc>
+ <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">
<info>
<desc>Contains various window settings such as scrollbars, rules, etc.</desc>
</info>
+ <prop oor:name="ShowScrollBarTips" oor:type="xs:boolean">
+ <!-- UIHints: Not accessible via user interface -->
+ <info>
+ <author>arielch</author>
+ <desc>Enables the user to prevent the display of help tips on the scrollbars programmatically.</desc>
+ <label>Prevent scrollbars help tips</label>
+ </info>
+ <value>true</value>
+ </prop>
<prop oor:name="HorizontalScroll" oor:type="xs:boolean">
<!-- OldPath: Writer/Layout/Window -->
<!-- OldLocation: Soffice.cfg -->
@@ -4817,6 +4826,11 @@
<desc>KeyRight</desc>
</info>
</enumeration>
+ <enumeration oor:value="1282"> <!-- 0x502 -->
+ <info>
+ <desc>KeyTab</desc>
+ </info>
+ </enumeration>
<enumeration oor:value="1284"> <!-- 0x504 -->
<info>
<desc>KeySpace</desc>
Modified: openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs Sun Feb 3 13:23:59 2013
@@ -212,10 +212,10 @@
<!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control points are displayed simple or enhanced.</desc>
<label>Simple control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint" oor:type="xs:boolean">
<!-- OldPath: HTML_Editor/Layout/Lines -->
@@ -223,10 +223,10 @@
<!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control points.</desc>
+ <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/l10n/main/oox/source/drawingml/customshapeproperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/oox/source/drawingml/customshapeproperties.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/oox/source/drawingml/customshapeproperties.cxx (original)
+++ openoffice/branches/l10n/main/oox/source/drawingml/customshapeproperties.cxx Sun Feb 3 13:23:59 2013
@@ -85,6 +85,35 @@ void CustomShapeProperties::apply( const
// not sure if this needs to be implemented
}
+bool setOrCreatePropertyValue(
+ uno::Sequence< beans::PropertyValue >& rPropSeq,
+ const OUString& rName,
+ const uno::Any& rAny)
+{
+ const sal_Int32 nCount(rPropSeq.getLength());
+
+ for(sal_Int32 a(0); a < nCount; a++)
+ {
+ beans::PropertyValue& rEntry = rPropSeq[a];
+
+ if(rEntry.Name.equals(rName))
+ {
+ rEntry.Value = rAny;
+ return false;
+ }
+ }
+
+ beans::PropertyValue aNewValue;
+
+ aNewValue.Name = rName;
+ aNewValue.Value = rAny;
+
+ rPropSeq.realloc(nCount + 1);
+ rPropSeq[nCount] = aNewValue;
+
+ return true;
+}
+
void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape ) const
{
@@ -92,69 +121,102 @@ void CustomShapeProperties::pushToPropSe
{
//const uno::Reference < drawing::XShape > xShape( xPropSet, UNO_QUERY );
Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( xShape, UNO_QUERY );
+ const OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) );
+ uno::Sequence< beans::PropertyValue > aGeoPropSeq;
+ uno::Any aGeoPropSet;
+ bool bValuesAdded(false);
+
if( xDefaulter.is() )
+ {
xDefaulter->createCustomShapeDefaults( maShapePresetType );
+ }
- PropertyMap aPropertyMap;
-
- aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
- aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
-
- if(mnTextRotation)
+ if(mbMirroredX || mbMirroredY || mnTextRotation)
{
- // #119920# Handle missing text rotation
- aPropertyMap[ PROP_TextRotateAngle ] <<= Any(mnTextRotation);
+ // #121371# set these values, but do *not* set a completely new
+ // "CustomShapeGeometry", this would reset the evtl. already created
+ // "Type" entry
+ aGeoPropSet = xPropSet->getPropertyValue(sCustomShapeGeometry);
+
+ if(aGeoPropSet >>= aGeoPropSeq)
+ {
+ uno::Any aAny;
+
+ if(mbMirroredX) // TTTT: remove again after aw080, make it part of object transformation
+ {
+ const rtl::OUString sMirroredX(RTL_CONSTASCII_USTRINGPARAM("MirroredX"));
+ aAny <<= mbMirroredX;
+ bValuesAdded = setOrCreatePropertyValue(aGeoPropSeq, sMirroredX, aAny);
+ }
+
+ if(mbMirroredY) // TTTT: remove again after aw080, make it part of object transformation
+ {
+ const rtl::OUString sMirroredY(RTL_CONSTASCII_USTRINGPARAM("MirroredY"));
+ aAny <<= mbMirroredY;
+ bValuesAdded = setOrCreatePropertyValue(aGeoPropSeq, sMirroredY, aAny);
+ }
+
+ if(mnTextRotation)
+ {
+ const rtl::OUString sTextRotateAngle(RTL_CONSTASCII_USTRINGPARAM("TextRotateAngle"));
+ aAny <<= (double)mnTextRotation;
+ bValuesAdded = setOrCreatePropertyValue(aGeoPropSeq, sTextRotateAngle, aAny);
+ }
+ }
}
- // converting the vector to a sequence
- Sequence< PropertyValue > aSeq = aPropertyMap.makePropertyValueSequence();
- PropertySet aPropSet( xPropSet );
- aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
-
if ( maAdjustmentGuideList.size() )
{
- const OUString sType = CREATE_OUSTRING( "Type" );
- const OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) );
- uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry );
- uno::Sequence< beans::PropertyValue > aGeoPropSeq;
- if ( aGeoPropSet >>= aGeoPropSeq )
+ if(!aGeoPropSeq.getLength())
+ {
+ aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry );
+ aGeoPropSet >>= aGeoPropSeq;
+ }
+
+ sal_Int32 i, nCount = aGeoPropSeq.getLength();
+
+ for ( i = 0; i < nCount; i++ )
{
- sal_Int32 i, nCount = aGeoPropSeq.getLength();
- for ( i = 0; i < nCount; i++ )
+ const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
+ const OUString sType = CREATE_OUSTRING( "Type" );
+
+ if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
{
- const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
- if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+ uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
+ if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq )
{
- uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
- if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq )
+ std::vector< CustomShapeGuide >::const_iterator aIter( maAdjustmentGuideList.begin() );
+ while( aIter != maAdjustmentGuideList.end() )
{
- std::vector< CustomShapeGuide >::const_iterator aIter( maAdjustmentGuideList.begin() );
- while( aIter != maAdjustmentGuideList.end() )
+ if ( (*aIter).maName.getLength() > 3 )
{
- if ( (*aIter).maName.getLength() > 3 )
+ sal_Int32 nAdjustmentIndex = (*aIter).maName.copy( 3 ).toInt32() - 1;
+ if ( ( nAdjustmentIndex >= 0 ) && ( nAdjustmentIndex < aAdjustmentSeq.getLength() ) )
{
- sal_Int32 nAdjustmentIndex = (*aIter).maName.copy( 3 ).toInt32() - 1;
- if ( ( nAdjustmentIndex >= 0 ) && ( nAdjustmentIndex < aAdjustmentSeq.getLength() ) )
- {
- EnhancedCustomShapeAdjustmentValue aAdjustmentVal;
- aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32();
- aAdjustmentVal.State = PropertyState_DIRECT_VALUE;
- aAdjustmentSeq[ nAdjustmentIndex ] = aAdjustmentVal;
- }
+ EnhancedCustomShapeAdjustmentValue aAdjustmentVal;
+ aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32();
+ aAdjustmentVal.State = PropertyState_DIRECT_VALUE;
+ aAdjustmentSeq[ nAdjustmentIndex ] = aAdjustmentVal;
}
- aIter++;
}
- aGeoPropSeq[ i ].Value <<= aAdjustmentSeq;
- xPropSet->setPropertyValue( sCustomShapeGeometry, Any( aGeoPropSeq ) );
+ aIter++;
}
+ aGeoPropSeq[ i ].Value <<= aAdjustmentSeq;
+ xPropSet->setPropertyValue( sCustomShapeGeometry, Any( aGeoPropSeq ) );
}
- else if ( aGeoPropSeq[ i ].Name.equals( sType ) )
- {
- aGeoPropSeq[ i ].Value <<= maShapePresetType;
- }
+ }
+ else if ( aGeoPropSeq[ i ].Name.equals( sType ) )
+ {
+ aGeoPropSeq[ i ].Value <<= maShapePresetType;
}
}
}
+
+ if(bValuesAdded)
+ {
+ aGeoPropSet <<= aGeoPropSeq;
+ xPropSet->setPropertyValue(sCustomShapeGeometry, aGeoPropSet);
+ }
}
else
{
Modified: openoffice/branches/l10n/main/oox/source/ole/axcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/oox/source/ole/axcontrol.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/oox/source/ole/axcontrol.cxx (original)
+++ openoffice/branches/l10n/main/oox/source/ole/axcontrol.cxx Sun Feb 3 13:23:59 2013
@@ -454,12 +454,12 @@ void ControlConverter::convertAxPicture(
convertPicture( rPropMap, rPicData );
// picture scale mode
- sal_Int16 nScaleMode = ImageScaleMode::None;
+ sal_Int16 nScaleMode = ImageScaleMode::NONE;
switch( nPicSizeMode )
{
- case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::None; break;
- case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::Anisotropic; break;
- case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::Isotropic; break;
+ case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::NONE; break;
+ case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::ISOTROPIC; break;
+ case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::ANISOTROPIC; break;
default: OSL_ENSURE( false, "ControlConverter::convertAxPicture - unknown picture size mode" );
}
rPropMap.setProperty( PROP_ScaleMode, nScaleMode );
Modified: openoffice/branches/l10n/main/padmin/source/rtsetup.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/padmin/source/rtsetup.src?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/padmin/source/rtsetup.src (original)
+++ openoffice/branches/l10n/main/padmin/source/rtsetup.src Sun Feb 3 13:23:59 2013
@@ -194,7 +194,7 @@ TabPage RID_RTS_DEVICEPAGE
< "PostScript (Level from driver)" ; 1; > ;
< "PostScript Level 1" ; 2; > ;
< "PostScript Level 2"; 3; > ;
- < "PostScript Level 3"; 3; > ;
+ < "PostScript Level 3"; 4; > ;
< "PDF"; 10; > ;
};
};
Modified: openoffice/branches/l10n/main/postprocess/checkdeliver/checkdeliver.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/postprocess/checkdeliver/checkdeliver.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/postprocess/checkdeliver/checkdeliver.pl (original)
+++ openoffice/branches/l10n/main/postprocess/checkdeliver/checkdeliver.pl Sun Feb 3 13:23:59 2013
@@ -48,7 +48,6 @@ my @exceptionmodlist = (
"postprocess",
"instset.*native",
"smoketest.*native",
- "testautomation",
"testgraphical"
); # modules not yet delivered
Modified: openoffice/branches/l10n/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/postprocess/packcomponents/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/l10n/main/postprocess/packcomponents/makefile.mk Sun Feb 3 13:23:59 2013
@@ -190,7 +190,7 @@ my_components += component/vcl/vcl.unx
my_components += updchk.uno
.END
-.IF "$(BUILD_SPECIAL)" != ""
+.IF "$(ENABLE_OOOIMPROVEMENT)" != ""
my_components += oooimprovement
.END
@@ -311,7 +311,7 @@ my_components += \
fps \
ftransl \
java_uno_accessbridge \
- smplmail \
+ sysmail \
sysdtrans \
wininetbe1
.END
Modified: openoffice/branches/l10n/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/postprocess/rebase/coffbase.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/branches/l10n/main/postprocess/rebase/coffbase.txt Sun Feb 3 13:23:59 2013
@@ -253,7 +253,7 @@ slideshow.uno.dll 0x000000005ec60000 0x0
slideshowtestmi.dll 0x000000005e8b0000 0x003a0000
smdmi.dll 0x000000005e890000 0x00010000
smmi.dll 0x000000005e7f0000 0x00090000
-smplmail.uno.dll 0x000000005e7d0000 0x00010000
+sysmail.uno.dll 0x000000005e7d0000 0x00010000
sn_tools.dll 0x000000005e7a0000 0x00020000
so_activex.dll 0x000000005e770000 0x00020000
socomp.dll 0x000000005e750000 0x00010000
Modified: openoffice/branches/l10n/main/postprocess/rebase/no_rebase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/postprocess/rebase/no_rebase.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/postprocess/rebase/no_rebase.txt (original)
+++ openoffice/branches/l10n/main/postprocess/rebase/no_rebase.txt Sun Feb 3 13:23:59 2013
@@ -31,3 +31,5 @@ msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
+msvcr100d.dll
+dbghelp.dll
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno.cxx Sun Feb 3 13:23:59 2013
@@ -342,7 +342,7 @@ PyObject *PyUNO_invoke( PyObject *object
Runtime runtime;
PyRef paras,callable;
- if( PyObject_IsInstance( object, getPyUnoClass( runtime ).get() ) )
+ if( PyObject_IsInstance( object, getPyUnoClass().get() ) )
{
PyUNO* me = (PyUNO*) object;
OUString attrName = OUString::createFromAscii(name);
@@ -441,19 +441,30 @@ PyObject *PyUNO_str( PyObject * self )
buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
}
- return PyBytes_FromString( buf.getStr());
+ return PYSTR_FROMSTR( buf.getStr() );
}
+#if PY_MAJOR_VERSION >= 3
+PyObject* PyUNO_getattr (PyObject* self, PyObject* attr_name)
+#else
PyObject* PyUNO_getattr (PyObject* self, char* name)
+#endif
{
PyUNO* me;
+#if PY_VERSION_HEX >= 0x03030000
+ char *name = PyUnicode_AsUTF8(attr_name);
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
+ char *name = PyBytes_AsString(pUtf8.get());
+#endif
try
{
Runtime runtime;
me = (PyUNO*) self;
+#if PY_MAJOR_VERSION < 3
//Handle Python dir () stuff first...
if (strcmp (name, "__members__") == 0)
{
@@ -469,17 +480,20 @@ PyObject* PyUNO_getattr (PyObject* self,
}
return member_list;
}
-
+#endif
+
if (strcmp (name, "__dict__") == 0)
{
Py_INCREF (Py_None);
return Py_None;
}
+#if PY_MAJOR_VERSION < 3
if (strcmp (name, "__methods__") == 0)
{
Py_INCREF (Py_None);
return Py_None;
}
+#endif
if (strcmp (name, "__class__") == 0)
{
if( me->members->wrappedObject.getValueTypeClass() ==
@@ -550,10 +564,20 @@ PyObject* PyUNO_getattr (PyObject* self,
return NULL;
}
+#if PY_MAJOR_VERSION >= 3
+int PyUNO_setattr (PyObject* self, PyObject* attr_name, PyObject* value)
+#else
int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
+#endif
{
PyUNO* me;
+#if PY_VERSION_HEX >= 0x03030000
+ char *name = PyUnicode_AsUTF8(attr_name);
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
+ char *name = PyBytes_AsString(pUtf8.get());
+#endif
me = (PyUNO*) self;
try
{
@@ -594,6 +618,99 @@ int PyUNO_setattr (PyObject* self, char*
return 1; //as above.
}
+#if PY_MAJOR_VERSION >= 3
+static PyObject *PyUNO_dir( PyObject *self, PyObject *that )
+{
+ PyUNO* me;
+ PyObject* member_list;
+ Sequence<OUString> oo_member_list;
+
+ me = (PyUNO*) self;
+ oo_member_list = me->members->xInvocation->getMemberNames ();
+ member_list = PyList_New (oo_member_list.getLength ());
+ for (int i = 0; i < oo_member_list.getLength (); i++)
+ {
+ // setitem steals a reference
+ PyList_SetItem (member_list, i, ustring2PyUnicode(oo_member_list[i]).getAcquired() );
+ }
+ return member_list;
+}
+
+static PyObject *PyUNO_richcompare( PyObject *self, PyObject *that, int op )
+{
+ switch (op)
+ {
+ case Py_EQ:
+ case Py_NE:
+ if( self == that )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ try
+ {
+ Runtime runtime;
+ if( PyObject_IsInstance( that, getPyUnoClass().get() ) )
+ {
+ PyUNO *me = reinterpret_cast< PyUNO*> ( self );
+ PyUNO *other = reinterpret_cast< PyUNO *> (that );
+ com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass();
+ com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass();
+
+ if( tcMe == tcOther )
+ {
+ if( tcMe == com::sun::star::uno::TypeClass_STRUCT ||
+ tcMe == com::sun::star::uno::TypeClass_EXCEPTION )
+ {
+ Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
+ Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
+ if( xMe->getMaterial() == xOther->getMaterial() )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ }
+ else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
+ {
+ if( me->members->wrappedObject == other->members->wrappedObject )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ }
+ }
+ }
+ if (op == Py_EQ)
+ Py_RETURN_FALSE;
+ else
+ Py_RETURN_TRUE;
+ }
+ catch( com::sun::star::uno::RuntimeException & e)
+ {
+ raisePyExceptionWithAny( makeAny( e ) );
+ }
+ break;
+ default:
+ PyErr_SetString(Py_NotImplemented, "not implemented");
+ break;
+ }
+
+ return NULL;
+}
+
+
+static struct PyMethodDef PyUNO_methods[] = {
+ { "__dir__", (PyCFunction)PyUNO_dir, METH_VARARGS, NULL},
+ { NULL, NULL }
+};
+
+#else
// ensure object identity and struct equality
static int PyUNO_cmp( PyObject *self, PyObject *that )
{
@@ -603,7 +720,7 @@ static int PyUNO_cmp( PyObject *self, Py
try
{
Runtime runtime;
- if( PyObject_IsInstance( that, getPyUnoClass( runtime ).get() ) )
+ if( PyObject_IsInstance( that, getPyUnoClass().get() ) )
{
PyUNO *me = reinterpret_cast< PyUNO*> ( self );
@@ -636,6 +753,7 @@ static int PyUNO_cmp( PyObject *self, Py
}
return retDefault;
}
+#endif
static PyTypeObject PyUNOType =
{
@@ -645,9 +763,15 @@ static PyTypeObject PyUNOType =
0,
(destructor) PyUNO_del,
(printfunc) 0,
- (getattrfunc) PyUNO_getattr,
- (setattrfunc) PyUNO_setattr,
- PyUNO_cmp,
+#if PY_MAJOR_VERSION >= 3
+ (getattrfunc) 0,
+ (setattrfunc) 0,
+ 0,
+#else
+ (getattrfunc) PyUNO_getattr, /* tp_getattr */
+ (setattrfunc) PyUNO_setattr, /* tp_setattr */
+ (cmpfunc) PyUNO_cmp,
+#endif
(reprfunc) PyUNO_repr,
0,
0,
@@ -655,18 +779,31 @@ static PyTypeObject PyUNOType =
(hashfunc) 0,
(ternaryfunc) 0,
(reprfunc) PyUNO_str,
+#if PY_MAJOR_VERSION >= 3
+ (getattrofunc)PyUNO_getattr, /* tp_getattro */
+ (setattrofunc)PyUNO_setattr, /* tp_setattro */
+#else
(getattrofunc)0,
(setattrofunc)0,
+#endif
NULL,
0,
NULL,
(traverseproc)0,
(inquiry)0,
+#if PY_MAJOR_VERSION >= 3
+ PyUNO_richcompare, /* tp_richcompare */
+#else
(richcmpfunc)0,
+#endif
0,
(getiterfunc)0,
(iternextfunc)0,
+#if PY_MAJOR_VERSION >= 3
+ PyUNO_methods, /* tp_methods */
+#else
NULL,
+#endif
NULL,
NULL,
NULL,
@@ -690,7 +827,7 @@ static PyTypeObject PyUNOType =
#endif
};
-PyRef getPyUnoClass( const Runtime &)
+PyRef getPyUnoClass()
{
return PyRef( reinterpret_cast< PyObject * > ( &PyUNOType ) );
}
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_adapter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_adapter.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_adapter.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_adapter.cxx Sun Feb 3 13:23:59 2013
@@ -246,7 +246,7 @@ Any Adapter::invoke( const OUString &aFu
buf.appendAscii( "pyuno::Adapater: Method " ).append( aFunctionName );
buf.appendAscii( " is not implemented at object " );
PyRef str( PyObject_Repr( mWrappedObject.get() ), SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( str.get() ));
+ buf.append( pyString2ustring( str.get() ) );
throw IllegalArgumentException( buf.makeStringAndClear(), Reference< XInterface > (),0 );
}
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_callable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_callable.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_callable.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_callable.cxx Sun Feb 3 13:23:59 2013
@@ -199,7 +199,11 @@ static PyTypeObject PyUNO_callable_Type
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
+#if PY_MAJOR_VERSION >= 3
+ 0,
+#else
(cmpfunc) 0,
+#endif
(reprfunc) 0,
0,
0,
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_except.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_except.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_except.cxx Sun Feb 3 13:23:59 2013
@@ -142,7 +142,7 @@ static PyRef createClass( const OUString
}
PyRef args( PyTuple_New( 3 ), SAL_NO_ACQUIRE );
- PyRef pyTypeName = ustring2PyString( name /*.replace( '.', '_' )*/ );
+ PyRef pyTypeName = USTR_TO_PYSTR( name /*.replace( '.', '_' )*/ );
PyRef bases;
if( base.is() )
@@ -162,7 +162,7 @@ static PyRef createClass( const OUString
PyTuple_SetItem( args.get(), 2, PyDict_New() );
PyRef ret(
- PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
+ PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
SAL_NO_ACQUIRE );
// now overwrite ctor and attrib functions
@@ -170,7 +170,7 @@ static PyRef createClass( const OUString
{
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunointerface__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
}
else
{
@@ -179,13 +179,16 @@ static PyRef createClass( const OUString
PyRef getter = getObjectFromUnoModule( runtime,"_uno_struct__getattr__" );
PyRef repr = getObjectFromUnoModule( runtime,"_uno_struct__repr__" );
PyRef eq = getObjectFromUnoModule( runtime,"_uno_struct__eq__" );
+#if PY_MAJOR_VERSION >= 3
+ PyRef dir = getObjectFromUnoModule( runtime, "_uno_struct__dir__" );
+#endif
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunostruct__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("typeName"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__init__"), ctor.get() );
PyObject_SetAttrString(
@@ -198,6 +201,10 @@ static PyRef createClass( const OUString
ret.get(), const_cast< char * >("__str__"), repr.get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__eq__"), eq.get() );
+#if PY_MAJOR_VERSION >= 3
+ PyObject_SetAttrString(
+ ret.get(), const_cast< char * >("__dir__"), dir.get() );
+#endif
}
return ret;
}
@@ -233,7 +240,7 @@ PyRef getClass( const OUString & name ,
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunointerface__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
}
else
{
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_impl.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_impl.hxx Sun Feb 3 13:23:59 2013
@@ -43,6 +43,19 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.hxx>
+//
+// Local workarounds for compatibility issues
+//
+#if PY_MAJOR_VERSION >= 3
+ #define PYSTR_FROMSTR PyUnicode_FromString
+ #define USTR_TO_PYSTR ustring2PyUnicode
+ #define PYSTR_CHECK PyUnicode_Check
+#else
+ #define PYSTR_FROMSTR PyBytes_FromString
+ #define USTR_TO_PYSTR ustring2PyString
+ #define PYSTR_CHECK PyBytes_Check
+#endif
+
namespace pyuno
{
@@ -161,7 +174,7 @@ PyRef getEnumClass( const Runtime &);
PyRef getBoolClass( const Runtime &);
PyRef getCharClass( const Runtime &);
PyRef getByteSequenceClass( const Runtime & );
-PyRef getPyUnoClass( const Runtime &);
+PyRef getPyUnoClass();
PyRef getClass( const rtl::OUString & name , const Runtime & runtime );
PyRef getAnyClass( const Runtime &);
PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args );
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_module.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_module.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_module.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_module.cxx Sun Feb 3 13:23:59 2013
@@ -225,7 +225,11 @@ PyObject * extractOneStringArg( PyObject
return NULL;
}
PyObject *obj = PyTuple_GetItem( args, 0 );
+#if PY_MAJOR_VERSION >= 3
+ if( ! PyUnicode_Check(obj) )
+#else
if( !PyBytes_Check( obj ) && ! PyUnicode_Check(obj))
+#endif
{
OStringBuffer buf;
buf.append( funcName ).append( ": expecting one string argument" );
@@ -248,11 +252,11 @@ static PyObject *createUnoStructHelper(P
PyObject *structName = PyTuple_GetItem( args,0 );
PyObject *initializer = PyTuple_GetItem( args ,1 );
- if( PyBytes_Check( structName ) )
+ if( PYSTR_CHECK( structName ) )
{
if( PyTuple_Check( initializer ) )
{
- OUString typeName( OUString::createFromAscii(PyBytes_AsString(structName)));
+ OUString typeName( pyString2ustring( structName ) );
RuntimeCargo *c = runtime.getImpl()->cargo;
Reference<XIdlClass> idl_class ( c->xCoreReflection->forName (typeName),UNO_QUERY);
if (idl_class.is ())
@@ -287,7 +291,7 @@ static PyObject *createUnoStructHelper(P
{
OStringBuffer buf;
buf.append( "UNO struct " );
- buf.append( PyBytes_AsString(structName) );
+ buf.append( OUStringToOString( typeName, RTL_TEXTENCODING_ASCII_US ) );
buf.append( " is unkown" );
PyErr_SetString (PyExc_RuntimeError, buf.getStr());
}
@@ -462,9 +466,7 @@ static PyObject *getClass( PyObject *, P
try
{
Runtime runtime;
- PyRef ret = getClass(
- OUString( PyBytes_AsString( obj), strlen(PyBytes_AsString(obj)),RTL_TEXTENCODING_ASCII_US),
- runtime );
+ PyRef ret = getClass( pyString2ustring(obj), runtime );
Py_XINCREF( ret.get() );
return ret.get();
}
@@ -603,9 +605,16 @@ static PyObject * invoke ( PyObject *, P
{
PyObject *object = PyTuple_GetItem( args, 0 );
- if( PyBytes_Check( PyTuple_GetItem( args, 1 ) ) )
+ if( PYSTR_CHECK( PyTuple_GetItem( args, 1 ) ) )
{
+#if PY_VERSION_HEX >= 0x03030000
+ const char *name = PyUnicode_AsUTF8( PyTuple_GetItem( args, 1 ) );
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String( PyTuple_GetItem( args, 1 ) ), SAL_NO_ACQUIRE);
+ const char *name = PyBytes_AsString( pUtf8.get() );
+#else
const char *name = PyBytes_AsString( PyTuple_GetItem( args, 1 ) );
+#endif
if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
{
ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
@@ -614,7 +623,11 @@ static PyObject * invoke ( PyObject *, P
{
OStringBuffer buf;
buf.append( "uno.invoke expects a tuple as 3rd argument, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 2 ) ), RTL_TEXTENCODING_ASCII_US) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -622,7 +635,11 @@ static PyObject * invoke ( PyObject *, P
{
OStringBuffer buf;
buf.append( "uno.invoke expected a string as 2nd argument, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 1 ) ), RTL_TEXTENCODING_ASCII_US ) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -672,7 +689,11 @@ static PyObject *setCurrentContext( PyOb
{
OStringBuffer buf;
buf.append( "uno.setCurrentContext expects an XComponentContext implementation, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 0 ) ), RTL_TEXTENCODING_ASCII_US ) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 0) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -694,26 +715,52 @@ static PyObject *setCurrentContext( PyOb
struct PyMethodDef PyUNOModule_methods [] =
{
- {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL},
- {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
- {const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
- {const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
- {const_cast< char * >("getClass"), getClass,1, NULL},
- {const_cast< char * >("checkEnum"), checkEnum, 1, NULL},
- {const_cast< char * >("checkType"), checkType, 1, NULL},
- {const_cast< char * >("generateUuid"), generateUuid,0, NULL},
- {const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL},
- {const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL},
- {const_cast< char * >("absolutize"),absolutize,2, NULL},
- {const_cast< char * >("isInterface"),isInterface,1, NULL},
- {const_cast< char * >("invoke"),invoke, 2, NULL},
- {const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL},
- {const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL},
+ {const_cast< char * >("getComponentContext"), getComponentContext, METH_NOARGS, NULL},
+ {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS, NULL},
+ {const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
+ {const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
+ {const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
+ {const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
+ {const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
+ {const_cast< char * >("generateUuid"), generateUuid, METH_NOARGS, NULL},
+ {const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
+ {const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
+ {const_cast< char * >("absolutize"), absolutize, METH_VARARGS, NULL},
+ {const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
+ {const_cast< char * >("invoke"), invoke, METH_VARARGS, NULL},
+ {const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
+ {const_cast< char * >("getCurrentContext"), getCurrentContext, METH_NOARGS, NULL},
{NULL, NULL, 0, NULL}
};
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef PyUNOModule =
+{
+ PyModuleDef_HEAD_INIT,
+ const_cast< char * >("pyuno"),
+ NULL,
+ -1,
+ PyUNOModule_methods
+};
+#endif
}
+#if PY_MAJOR_VERSION >= 3
+extern "C" PyMODINIT_FUNC PyInit_pyuno(void)
+{
+ PyObject *m;
+
+ PyEval_InitThreads();
+
+ m = PyModule_Create(&PyUNOModule);
+ if (m == NULL)
+ return NULL;
+
+ if (PyType_Ready((PyTypeObject *)getPyUnoClass().get()))
+ return NULL;
+ return m;
+}
+#else
extern "C" PY_DLLEXPORT void initpyuno()
{
// noop when called already, otherwise needed to allow multiple threads
@@ -721,3 +768,4 @@ extern "C" PY_DLLEXPORT void initpyuno()
PyEval_InitThreads();
Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
}
+#endif
Modified: openoffice/branches/l10n/main/pyuno/source/module/pyuno_runtime.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/pyuno/source/module/pyuno_runtime.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/pyuno/source/module/pyuno_runtime.cxx (original)
+++ openoffice/branches/l10n/main/pyuno/source/module/pyuno_runtime.cxx Sun Feb 3 13:23:59 2013
@@ -73,7 +73,11 @@ static PyTypeObject RuntimeImpl_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
+#if PY_MAJOR_VERSION >= 3
+ 0,
+#else
(cmpfunc) 0,
+#endif
(reprfunc) 0,
0,
0,
@@ -154,8 +158,9 @@ static PyRef importUnoModule( ) throw (
OUStringBuffer buf;
buf.appendAscii( "python object raised an unknown exception (" );
PyRef valueRep( PyObject_Repr( excValue.get() ), SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( valueRep.get())).appendAscii( ", traceback follows\n" );
- buf.appendAscii( PyBytes_AsString( str.get() ) );
+
+ buf.append( pyString2ustring( valueRep.get() ) ).appendAscii( ", traceback follows\n" );
+ buf.append( pyString2ustring( str.get() ) );
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
}
PyRef dict( PyModule_GetDict( module.get() ) );
@@ -544,7 +549,7 @@ PyRef Runtime::any2PyObject (const Any &
// assuming that the Message is always the first member, wuuuu
void *pData = (void*)a.getValue();
OUString message = *(OUString * )pData;
- PyRef pymsg = ustring2PyString( message );
+ PyRef pymsg = USTR_TO_PYSTR( message );
PyTuple_SetItem( args.get(), 0 , pymsg.getAcquired() );
// the exception base functions want to have an "args" tuple,
// which contains the message
@@ -662,7 +667,21 @@ Any Runtime::pyObject2Any ( const PyRef
{
}
-#if PY_MAJOR_VERSION < 3 // Python 3 has no PyInt
+#if PY_MAJOR_VERSION >= 3 // Python 3 has no PyInt
+ else if (PyBool_Check(o))
+ {
+ if( o == Py_True )
+ {
+ sal_Bool b = sal_True;
+ a = Any( &b, getBooleanCppuType() );
+ }
+ else
+ {
+ sal_Bool b = sal_False;
+ a = Any( &b, getBooleanCppuType() );
+ }
+ }
+#else
else if (PyInt_Check (o))
{
if( o == Py_True )
@@ -724,8 +743,10 @@ Any Runtime::pyObject2Any ( const PyRef
double d = PyFloat_AsDouble (o);
a <<= d;
}
+#if PY_MAJOR_VERSION < 3
else if (PyBytes_Check (o))
a <<= pyString2ustring(o);
+#endif
else if( PyUnicode_Check( o ) )
a <<= pyString2ustring(o);
else if (PyTuple_Check (o))
@@ -750,6 +771,13 @@ Any Runtime::pyObject2Any ( const PyRef
seq = Sequence<sal_Int8 > (
(sal_Int8*) PyBytes_AsString(str.get()), PyBytes_Size(str.get()));
}
+#if PY_MAJOR_VERSION >= 3
+ else if ( PyByteArray_Check( str.get() ) )
+ {
+ seq = Sequence< sal_Int8 >(
+ (sal_Int8 *) PyByteArray_AS_STRING(str.get()), PyByteArray_GET_SIZE(str.get()));
+ }
+#endif
a <<= seq;
}
else
@@ -776,7 +804,7 @@ Any Runtime::pyObject2Any ( const PyRef
Reference< XInterface > () );
}
}
- else if( PyObject_IsInstance( o, getPyUnoClass( runtime ).get() ) )
+ else if( PyObject_IsInstance( o, getPyUnoClass().get() ) )
{
PyUNO* o_pi;
o_pi = (PyUNO*) o;
@@ -881,7 +909,7 @@ Any Runtime::pyObject2Any ( const PyRef
OUStringBuffer buf;
buf.appendAscii( "Couldn't convert " );
PyRef reprString( PyObject_Str( o ) , SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( reprString.get() ) );
+ buf.append( pyString2ustring( reprString.get() ) );
buf.appendAscii( " to a UNO type" );
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
}
@@ -939,7 +967,7 @@ Any Runtime::extractUnoException( const
PyRef typeName( PyObject_Str( excType.get() ), SAL_NO_ACQUIRE );
if( typeName.is() )
{
- buf.appendAscii( PyBytes_AsString( typeName.get() ) );
+ buf.append( pyString2ustring( typeName.get() ) );
}
else
{
@@ -949,7 +977,7 @@ Any Runtime::extractUnoException( const
PyRef valueRep( PyObject_Str( excValue.get() ), SAL_NO_ACQUIRE );
if( valueRep.is() )
{
- buf.appendAscii( PyBytes_AsString( valueRep.get()));
+ buf.append( pyString2ustring( valueRep.get()));
}
else
{
@@ -958,7 +986,7 @@ Any Runtime::extractUnoException( const
buf.appendAscii( ", traceback follows\n" );
if( str.is() )
{
- buf.appendAscii( PyBytes_AsString( str.get() ) );
+ buf.append( pyString2ustring( str.get() ) );
}
else
{