openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1441909 [21/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...
Date Sun, 03 Feb 2013 13:24:38 GMT
Modified: openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h Sun Feb  3 13:23:59 2013
@@ -22,6 +22,7 @@
 #ifndef _MyProtocolHandler_HXX
 #define _MyProtocolHandler_HXX
 
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/XToolkit.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -58,12 +59,12 @@ class MyProtocolHandler : public cppu::W
 >
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
 public:
-	MyProtocolHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-        : mxMSF( rxMSF ) {}
+	MyProtocolHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+        : mxContext( rxContext ) {}
 
 	// XDispatchProvider
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
@@ -98,7 +99,7 @@ sal_Bool SAL_CALL MyProtocolHandler_supp
 	throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
 	throw ( ::com::sun::star::uno::Exception );
 
 class BaseDispatch : public cppu::WeakImplHelper2
@@ -109,14 +110,14 @@ class BaseDispatch : public cppu::WeakIm
 {
 protected:
 	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 	::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > mxToolkit;
     ::rtl::OUString msDocService;
     ::rtl::OUString maComboBoxText;
     sal_Bool        mbButtonEnabled;
 
 public:
-	BaseDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	BaseDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& rServiceName );
 
 	virtual ~BaseDispatch();
@@ -142,18 +143,18 @@ public:
 class WriterDispatch : public BaseDispatch
 {
 public:
-	WriterDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	WriterDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxMSF, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) )
 	{}
 };
 
 class CalcDispatch : public BaseDispatch
 {
 public:
-	CalcDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	CalcDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxMSF, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadSheetDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadSheetDocument" ) ) )
 	{}
 };
 

Modified: openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx 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,110 +7,56 @@
  * 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.
- * 
+ *
  *************************************************************/
 
-
-
-#include <cppuhelper/factory.hxx>
-
 #include "MyProtocolHandler.h"
-#include "MyListener.h"
 
-namespace css = ::com::sun::star;
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
 
-#if 0
-static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& xRegistryKey       ,
-                      const char*                                               pImplementationName,
-                      const char*                                               pServiceName       )
+namespace framework
 {
-    ::rtl::OUStringBuffer sKey(256);
-	sKey.append     (::rtl::OUString::createFromAscii(pImplementationName));
-    sKey.appendAscii("/UNO/SERVICES/");
-    sKey.append     (::rtl::OUString::createFromAscii(pServiceName));
-
-    xRegistryKey->createKey(sKey.makeStringAndClear());
+    namespace complex_toolbar_controls
+    {
+        static ::cppu::ImplementationEntry const s_impl_entries[] =
+        {
+            {
+                MyProtocolHandler_createInstance,
+                MyProtocolHandler_getImplementationName,
+                MyProtocolHandler_getSupportedServiceNames,
+                ::cppu::createSingleComponentFactory,
+                0,
+                0
+            },
+            { 0, 0, 0, 0, 0, 0 }
+        };
+    }
 }
-#endif
 
 extern "C"
 {
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
-                                                                                 uno_Environment** ppEnv        )
-{
-	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-#if 0
-/**
- * This method not longer necessary since OOo 3.4 where the component registration was
- * was changed to passive component registration. For more details see
- * http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
- */
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
-                                                            void* pRegistryKey   )
-{
-    if (!pRegistryKey)
-        return sal_False;
-
-    try
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+        const sal_Char **ppEnvTypeName, uno_Environment ** )
     {
-        css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
-        writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME       , MYLISTENER_SERVICENAME        );
-        writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME );
-
-        return sal_True;
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
-    catch(const css::registry::InvalidRegistryException&)
-        { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-
-    return sal_False;
-}
-#endif
-
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName      ,
-                                                                void*     pServiceManager,
-                                                                void*     pRegistryKey   )
-{
-    if ( !pServiceManager || !pImplName )
-        return 0;
 
-    css::uno::Reference< css::lang::XSingleServiceFactory > xFactory  ;
-    css::uno::Reference< css::lang::XMultiServiceFactory >  xSMGR     (reinterpret_cast< css::lang::XMultiServiceFactory* >(pServiceManager), css::uno::UNO_QUERY);
-    ::rtl::OUString                                         sImplName = ::rtl::OUString::createFromAscii(pImplName);
-
-    if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) ) )
-	{
-        css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) );
-		xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames);
-	}
-    else
-    if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYPROTOCOLHANDLER_IMPLEMENTATIONNAME ) ) )
-	{
-        css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYPROTOCOLHANDLER_SERVICENAME ) );
-        xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames);
-	}
-
-    if (!xFactory.is())
-        return 0;
-
-    xFactory->acquire();
-    return xFactory.get();
+    SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+        const sal_Char *pImplName, void *pServiceManager, void *pRegistryKey )
+    {
+        return ::cppu::component_getFactoryHelper( pImplName,
+                pServiceManager,
+                pRegistryKey ,
+                framework::complex_toolbar_controls::s_impl_entries );
+    }
 }
-
-} // extern C

Modified: openoffice/branches/l10n/main/odk/examples/cpp/custompanel/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/custompanel/Makefile?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/custompanel/Makefile (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/custompanel/Makefile Sun Feb  3 13:23:59 2013
@@ -43,9 +43,6 @@ COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_N
 
 # Allow deploying the extension when running it
 
-#this should be in odk/settings/std.mk
-OUT_DEPLOY=$(OUT)/deploy
-
 OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME)
 OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY))
 OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY)
@@ -60,10 +57,6 @@ CXXFILES = \
 
 SLOFILES = $(patsubst %.cxx,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES))
 
-# Add OSL_DEBUG_LEVEL to compiler the flags (for OSL_TRACE et. al.)
-ifeq "$(DEBUG)" "yes"
-CC_FLAGS += -DOSL_DEBUG_LEVEL=2
-endif
 
 # Targets
 .PHONY: ALL

Modified: openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml Sun Feb  3 13:23:59 2013
@@ -31,6 +31,6 @@
     <name>Custom Tool Panel Example</name>
   </display-name>
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/>
+    <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
   </dependencies>
 </description>

Modified: openoffice/branches/l10n/main/odk/examples/examples.html
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/examples.html?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/examples.html (original)
+++ openoffice/branches/l10n/main/odk/examples/examples.html Sun Feb  3 13:23:59 2013
@@ -442,12 +442,16 @@
 		  com.sun.star.lang.XMain</a> interface. In the run method, it connects to 
 		  the servers process and retrieves an instance and does some calls on the 
 		  instance.</td>
-		  </tr>		  
+		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="cpp/complextoolbarcontrols/" title="link to the source directory of the C++ complextoolbarcontrols example">complextoolbarcontrols</a></td>
 		  <td class="cell80">This example shows how to create a toolbar add-on with complex toolbar controls. 
 		  It shows how to use an Image Button, a Combo Box, a Spin Field, an Edit Field, a Dropdown Box, a Toggle Dropdown Button and a normal Dropdown Button</td>
-		  </tr>		  
+		  </tr>
+          <tr>
+          <td class="cell20"><a href="cpp/StatusbarController/" title="link to the source directory of the C++ StatusbarController example">StatusbarController</a></td>
+          <td class="cell80">These examples show how to implement a StatusbarController to add functionality in the status bar.</td>
+          </tr>
 		  <tbody>
 		  </table>
 		  </td>

Modified: openoffice/branches/l10n/main/odk/examples/java/Inspector/Addons.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/java/Inspector/Addons.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/java/Inspector/Addons.xcu (original)
+++ openoffice/branches/l10n/main/odk/examples/java/Inspector/Addons.xcu Sun Feb  3 13:23:59 2013
@@ -1,27 +1,6 @@
-<!--***********************************************************
- * 
- * 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
- * regarding copyright ownership.  The ASF licenses this file
- * 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.
- * 
- ***********************************************************-->
-
 <?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
@@ -29,36 +8,41 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-	<node oor:name="AddonUI">
-		<node oor:name="OfficeToolBar">
-			<node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
-				<node oor:name="toolBar_Inspector" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>org.openoffice.Office.addon.Inspector:inspect</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Object Inspector</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-					      <value></value>
-					</prop>	      
-				</node>
-			</node>
-		</node>
-	</node>
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeToolBar">
+            <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value xml:lang="en-US">Object Inspector</value>
+                </prop>
+                <node oor:name="ToolBarItems">
+                    <node oor:name="toolBar_Inspector" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>org.openoffice.Office.addon.Inspector:inspect</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Object Inspector</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value></value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+    </node>
 </oor:component-data>

Modified: openoffice/branches/l10n/main/odk/examples/java/Inspector/Inspector.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/java/Inspector/Inspector.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/java/Inspector/Inspector.java (original)
+++ openoffice/branches/l10n/main/odk/examples/java/Inspector/Inspector.java Sun Feb  3 13:23:59 2013
@@ -178,8 +178,7 @@ public class Inspector{
         try {
             Object oToolkit = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit", m_xComponentContext);
             XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit);
-            Rectangle aRectangle = new Rectangle();
-            XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, aRectangle, "errorbox", com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
+            XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, com.sun.star.awt.MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
             XComponent xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
             if (xMessageBox != null){
                 short nResult = xMessageBox.execute();

Modified: openoffice/branches/l10n/main/odk/pack/copying/dk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/pack/copying/dk.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/pack/copying/dk.mk (original)
+++ openoffice/branches/l10n/main/odk/pack/copying/dk.mk Sun Feb  3 13:23:59 2013
@@ -19,7 +19,7 @@
 #  
 #**************************************************************
 
-# OpenOffice.org @@RELEASE@@ SDK dependent settings
+# Apache OpenOffice @@RELEASE@@ SDK dependent settings
 SDKVERSION=@@RELEASE@@
 BUILDID=@@BUILDID@@
 SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file

Modified: openoffice/branches/l10n/main/odk/pack/copying/idl_chapter_refs.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/pack/copying/idl_chapter_refs.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/pack/copying/idl_chapter_refs.txt (original)
+++ openoffice/branches/l10n/main/odk/pack/copying/idl_chapter_refs.txt Sun Feb  3 13:23:59 2013
@@ -6547,8 +6547,8 @@ com.sun.star.task.JobExecutor
 TOPIC:
 com.sun.star.task.JobExecutor
 
-LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext
-DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext
+LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
+DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdb.DatabaseContext
@@ -7510,8 +7510,8 @@ com.sun.star.table.CellAddress
 com.sun.star.sheet.XSheetAnnotationAnchor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org
-DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org
+LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
+DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
 REF:
 TOPIC:
 com.sun.star.frame.XController

Modified: openoffice/branches/l10n/main/odk/pack/copying/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/pack/copying/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/pack/copying/makefile.mk (original)
+++ openoffice/branches/l10n/main/odk/pack/copying/makefile.mk Sun Feb  3 13:23:59 2013
@@ -106,6 +106,7 @@ DESTCLASSESLIST= \
 
 SETTINGSLIST= \
 	$(DESTDIRSETTINGS)/settings.mk \
+	$(DESTDIRSETTINGS)/platform.mk \
 	$(DESTDIRSETTINGS)/std.mk \
 	$(DESTDIRSETTINGS)/stdtarget.mk \
 	$(DESTDIRSETTINGS)/dk.mk
@@ -158,8 +159,7 @@ INSTALLSCRIPT= \
 	$(DESTDIR)/config.sub \
 	$(DESTDIR)/configure.pl \
 	$(DESTDIR)/setsdkenv_unix \
-	$(DESTDIR)/setsdkenv_unix.sh.in \
-	$(DESTDIR)/setsdkenv_unix.csh.in
+	$(DESTDIR)/setsdkenv_unix.sh.in
 .ELSE
 INSTALLSCRIPT= \
 	$(DESTDIR)/setsdkenv_windows.bat \

Modified: openoffice/branches/l10n/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_unix?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_unix (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_unix Sun Feb  3 13:23:59 2013
@@ -25,12 +25,12 @@ HOSTNAME=`hostname`
 CURRENTDIR=`/bin/pwd`
 SDKTMPDIR=`dirname $0`
 OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1`
-OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -2 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2`
+OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -3 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2`
 if [ "$OSTYPE" = "Darwin" ] 
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+    OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME
@@ -53,9 +53,8 @@ then
     echo ""
     echo " options:"
     echo "   --force-configure : force a new configuration of your SDK environment."
-    echo "                       Alternatively can you edit your SDK environment scripts directly:"
+    echo "                       Alternatively can you edit your SDK environment script directly:"
     echo "                        $HOME/$OO_SDK_NAME/setsdkenv_unix.sh"
-    echo "                        $HOME/$OO_SDK_NAME/setsdkenv_unix.csh"
     echo "   -h, --help        : print this help and exit"
     echo
     exit 1

Modified: openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in Sun Feb  3 13:23:59 2013
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice.org3
+# Example: OFFICE_HOME=/opt/apacheopenoffice3
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
+# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
 OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
 export OO_SDK_URE_HOME
 
@@ -50,6 +50,14 @@ OO_SDK_MAKE_HOME=@OO_SDK_MAKE_HOME@
 # Example: OO_SDK_ZIP_HOME=/usr/bin
 OO_SDK_ZIP_HOME=@OO_SDK_ZIP_HOME@
 
+# Directory of the cat command.
+# Example: OO_SDK_CAT_HOME=/usr/bin
+OO_SDK_CAT_HOME=@OO_SDK_CAT_HOME@
+
+# Directory of the sed command.
+# Example: OO_SDK_SED_HOME=/usr/bin
+OO_SDK_SED_HOME=@OO_SDK_SED_HOME@
+
 # Directory of the C++ compiler.
 # Example: OO_SDK_CPP_HOME=/usr/bin
 OO_SDK_CPP_HOME=@OO_SDK_CPP_HOME@
@@ -70,7 +78,7 @@ OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@
 SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
 export SDK_AUTO_DEPLOYMENT
 
-# Check installation path for the OpenOffice Development Kit.
+# Check installation path for the Apache OpenOffice Development Kit.
 if [ -z "${OO_SDK_HOME}" ]
 then
     echo Error: Please insert a correct value for the variable OO_SDK_HOME.
@@ -267,6 +275,20 @@ then
     export OO_SDK_ZIP_HOME
 fi
 
+# Add directory of the sed tool to the path, if necessary.
+if [ -n "${OO_SDK_SED_HOME}" ]
+then
+    PATH=${OO_SDK_SED_HOME}:${PATH}
+    export OO_SDK_SED_HOME
+fi
+
+# Add directory of the cat tool to the path, if necessary.
+if [ -n "${OO_SDK_CAT_HOME}" ]
+then
+    PATH=${OO_SDK_CAT_HOME}:${PATH}
+    export OO_SDK_CAT_HOME
+fi
+
 # Add directory of the C++ tools to the path, if necessary.
 if [ -n "${OO_SDK_CPP_HOME}" ]
 then
@@ -343,15 +365,17 @@ fi 
 # Prepare shell with all necessary environment variables.
 echo 
 echo " ************************************************************************"
-echo " *"                                                  
-echo " * SDK environment is prepared for ${platform}"      
-echo " *"                                                  
+echo " *"
+echo " * SDK environment is prepared for ${platform}"
+echo " *"
 echo " * SDK = $OO_SDK_HOME"
 echo " * Office = $OFFICE_HOME"
 echo " * Office Base = $OFFICE_BASE_HOME"
 echo " * URE = $OO_SDK_URE_HOME"
 echo " * Make = $OO_SDK_MAKE_HOME"
 echo " * Zip = $OO_SDK_ZIP_HOME"
+echo " * cat = $OO_SDK_CAT_HOME"
+echo " * sed = $OO_SDK_SED_HOME"
 echo " * C++ Compiler = $OO_SDK_CPP_HOME"
 echo " * Java = $OO_SDK_JAVA_HOME"
 echo " * SDK Output directory = $OO_SDK_OUT"

Modified: openoffice/branches/l10n/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_windows.template?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_windows.template Sun Feb  3 13:23:59 2013
@@ -23,22 +23,22 @@ REM This script sets all enviroment vari
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name
-REM Example: set OO_SDK_NAME=openoffice3.0_sdk
-set OO_SDK_NAME=openoffice.org3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
+set OO_SDK_NAME=apacheopenoffice3.0_sdk
 
 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
 set OFFICE_BASE_HOME=
 
 REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
 set OO_SDK_URE_HOME=
 
 REM Directory of the make command.
@@ -49,6 +49,14 @@ REM Directory of the zip tool.
 REM Example: set OO_SDK_ZIP_HOME=D:\infozip\bin
 set OO_SDK_ZIP_HOME=
 
+REM Directory of the cat tool.
+REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin\
+set OO_SDK_CAT_HOME=
+
+REM Directory of the sed tool.
+REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin\
+set OO_SDK_SED_HOME=
+
 REM Directory of the C++ compiler.
 REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin
 REM Example:set CPP_WINDOWS_SDK=C:\Program Files\\Microsoft SDKs\Windows\v6.0A\
@@ -65,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Pro
 set OO_SDK_JAVA_HOME=
 
 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
 set OO_SDK_OUT=
 
 REM Automatic deployment
@@ -105,6 +113,18 @@ if not defined OO_SDK_ZIP_HOME (
    goto :error
  )
 
+REM Check installation path for the cat tool.
+if not defined OO_SDK_CAT_HOME (
+   echo Error: the variable OO_SDK_CAT_HOME is missing!
+   goto :error
+ )
+
+REM Check installation path for the sed tool.
+if not defined OO_SDK_SED_HOME (
+   echo Error: the variable OO_SDK_SED_HOME is missing!
+   goto :error
+ )
+
 REM Set library path. 
 set LIB=%OO_SDK_HOME%\lib;%LIB%
 if defined CPP_WINDOWS_SDK (
@@ -160,6 +180,12 @@ if defined OO_SDK_MAKE_HOME set PATH=%OO
 REM Add directory of the zip tool to the path, if necessary.
 if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%
 
+REM Add directory of the cat tool to the path, if necessary.
+if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%
+
+REM Add directory of the sed tool to the path, if necessary.
+if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%
+
 REM Add directory of the C++ compiler to the path, if necessary.
 if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%
 
@@ -187,6 +213,8 @@ echo  * Office Base = %OFFICE_BASE_HOME%
 echo  * URE = %OO_SDK_URE_HOME%
 echo  * Make = %OO_SDK_MAKE_HOME%
 echo  * Zip = %OO_SDK_ZIP_HOME%
+echo  * cat = %OO_SDK_CAT_HOME%
+echo  * sed = %OO_SDK_SED_HOME%
 echo  * C++ Compiler = %OO_SDK_CPP_HOME%
 echo  * C# and VB.NET compilers = %OO_SDK_CLI_HOME%
 echo  * Java = %OO_SDK_JAVA_HOME%

Modified: openoffice/branches/l10n/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/settings/settings.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/settings/settings.mk (original)
+++ openoffice/branches/l10n/main/odk/settings/settings.mk 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,16 +7,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.
-#  
+#
 #**************************************************************
 
 # Global settings file for the minimal build environment of the SDK
@@ -657,3 +657,9 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc
 endif
 
 endif
+
+
+# Add OSL_DEBUG_LEVEL to compiler the flags (for OSL_TRACE et. al.)
+ifeq "$(DEBUG)" "yes"
+CC_FLAGS += -DOSL_DEBUG_LEVEL=2
+endif

Modified: openoffice/branches/l10n/main/odk/settings/std.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/settings/std.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/settings/std.mk (original)
+++ openoffice/branches/l10n/main/odk/settings/std.mk 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,17 +7,18 @@
 #  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.
-#  
+#
 #**************************************************************
+
 ifneq "$(OO_SDK_OUT)" ""
 OUT=$(subst \,/,$(OO_SDK_OUT))/$(OS)example.out
 else
@@ -35,6 +36,7 @@ OUT_SLB=$(OUT)/slb
 OUT_MISC=$(OUT)/misc
 OUT_OBJ=$(OUT)/obj
 OUT_CLASS=$(OUT)/class
+OUT_DEPLOY=$(OUT)/deploy
 IDL_DIR=$(PRJ)/idl
 BIN_DIR=$(PRJ)/bin
 CLASSES_DIR=$(PRJ)/classes
@@ -67,6 +69,8 @@ SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)
 SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
 SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
 SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
+SDK_CAT="$(OO_SDK_CAT_HOME)/cat"
+SDK_SED="$(OO_SDK_SED_HOME)/sed"
 IDLC="$(OO_SDK_HOME)/bin/idlc"
 CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
 JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"

Modified: openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (original)
+++ openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java Sun Feb  3 13:23:59 2013
@@ -188,7 +188,7 @@ final class InstallationFinder {
      */    
     private static String getPathFromWindowsRegistry() {
 
-        final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+        final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
 
         String path = null;
         

Modified: openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c (original)
+++ openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c Sun Feb  3 13:23:59 2013
@@ -61,7 +61,7 @@ void closeErrorFile();
  * environment variable to the program directory of the UNO installation.
  * If no installation is specified by the user, the default installation on
  * the system will be taken. The default installation is read from the
- * default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the 
+ * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the 
  * root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing, 
  * the key is read from the root key HKEY_LOCAL_MACHINE.</p>
  */

Modified: openoffice/branches/l10n/main/odk/util/check.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/util/check.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/util/check.pl (original)
+++ openoffice/branches/l10n/main/odk/util/check.pl Sun Feb  3 13:23:59 2013
@@ -141,10 +141,6 @@ if (-d "$StartDir") {
 	    print "\nERROR: \"$StartDir/setsdkenv_unix.sh.in\" is missing\n";
 	    $return++;
 	}
-	if (! -e "$StartDir/setsdkenv_unix.csh.in") {
-	    print "\nERROR: \"$StartDir/setsdkenv_unix.csh.in\" is missing\n";
-	    $return++;
-	}
     }
     print "\n";
 

Modified: openoffice/branches/l10n/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/util/makefile.pmk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/l10n/main/odk/util/makefile.pmk 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,24 +7,24 @@
 #  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.
-#  
+#
 #**************************************************************
 
 
 
 # used for sdk common files
-PRODUCT_RELEASE=3.4
-OFFICENAME=OpenOffice.org
-SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
+PRODUCT_RELEASE=3.5
+OFFICENAME=Apache OpenOffice
+SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
 TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
 IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/ImageScaleMode.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/ImageScaleMode.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/ImageScaleMode.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/ImageScaleMode.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,53 +7,43 @@
  * 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_ImageScaleMode_idl__
 #define __com_sun_star_awt_ImageScaleMode_idl__
 
-//=============================================================================
-
 module com { module sun { module star { module awt { 
 
-//=============================================================================
-
 /** defines modes how an image displayed in a given area should be scaled to fit this area
  */
 constants ImageScaleMode
 {
     /** specifies that no scaling should happen at all
     */
-    const short None = 0;
+    const short NONE = 0;
 
     /** specifies that the image should be scaled up or down to the size of the surrounding area isotropicly,
         i.e. by keeping its aspect ratio.
     */
-    const short Isotropic = 1;
+    const short ISOTROPIC = 1;
 
-    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropicly.
+    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropically.
 
         <p>The image will finally cover all of the surrounding area, but its dimensions might be distorted.</p>
     */
-    const short Anisotropic = 2;
+    const short ANISOTROPIC = 2;
 };
 
-//=============================================================================
-
 }; }; }; }; 
 
-//=============================================================================
-
 #endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuBar.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuBar.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuBar.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuBar.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,46 +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_awt_MenuBar_idl__
+#define __com_sun_star_awt_MenuBar_idl__
 
-#ifndef __com_sun_star_awt_MenuBar_idl__ 
-#define __com_sun_star_awt_MenuBar_idl__ 
- 
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
-#include <com/sun/star/awt/XMenuBar.idl> 
-#endif 
+#include <com/sun/star/awt/XMenuBar.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a menu for top-level windows.
-		
-	<p>A menu bar can only be used by top-level windows. They support
+    <p>A menu bar can only be used by top-level windows. They support
        the interface <type scope="com::sun::star::awt">XTopWindow</type>
        to set an menu bar object.
     </p>
  */
 published service MenuBar
-{ 
-	interface XMenuBar; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XMenuBar;
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuEvent.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuEvent.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuEvent.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,47 +7,35 @@
  * 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_MenuEvent_idl__
+#define __com_sun_star_awt_MenuEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+module com {  module sun {  module star {  module awt {
 
-#ifndef __com_sun_star_awt_MenuEvent_idl__ 
-#define __com_sun_star_awt_MenuEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
 /** specifies a menu event.
  */
 published struct MenuEvent: com::sun::star::lang::EventObject
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** contains the item id.
-	 */
-	short MenuId; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** contains the item ID.
+     */
+    short MenuId;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemStyle.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemStyle.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemStyle.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemStyle.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,58 +7,43 @@
  * 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_MenuItemStyle_idl__ 
-#define __com_sun_star_awt_MenuItemStyle_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** These values are used to specify the properties of a menu item. 
-		 
-	<p>They may be expanded in future versions.</p>
+#ifndef __com_sun_star_awt_MenuItemStyle_idl__
+#define __com_sun_star_awt_MenuItemStyle_idl__
+
+module com {  module sun {  module star {  module awt {
+
+/** These values are used to specify the properties of a menu item.
  */
-published constants MenuItemStyle
-{ 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked independently.
-	 */
-	const short CHECKABLE = 1; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked dependent on the neighbouring
+constants MenuItemStyle
+{
+    /** specifies an item which can be checked independently.
+     */
+    const short CHECKABLE = 1;
+
+    /** specifies an item which can be checked dependent on the neighbouring
         items.
-	 */
-	const short RADIOCHECK = 2; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies to check this item automatically on select.
-	 */
-	const short AUTOCHECK = 4; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+     */
+    const short RADIOCHECK = 2;
+
+    /** specifies to check this item automatically on select.
+     */
+    const short AUTOCHECK = 4;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemType.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemType.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/MenuItemType.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,31 +7,25 @@
  * 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_MenuItemType_idl__
 #define __com_sun_star_awt_MenuItemType_idl__
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+module com {  module sun {  module star {  module awt {
 
 /** specifies the type of a menu item, as returned by
-    <member scope="com::sun::star::awt">XMenuExtended2::getItemType()</member>.
+    <member scope="com::sun::star::awt">XMenu::getItemType()</member>.
  */
 published enum MenuItemType
 {
@@ -57,8 +51,6 @@ published enum MenuItemType
 
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/MessageBoxButtons.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/MessageBoxButtons.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/MessageBoxButtons.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/MessageBoxButtons.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,87 +7,78 @@
  * 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_MessageBoxButtons_idl__
+#define __com_sun_star_awt_MessageBoxButtons_idl__
 
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__ 
-#define __com_sun_star_awt_MessageBoxButtons_idl__ 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** defines constants for the possible message box button 
+module com {  module sun {  module star {  module awt {
+
+/** defines constants for the possible message box button
     combinations.
 
  */
 constants MessageBoxButtons
-{ 
-	//------------------------------------------------------------------------- 
-
-	/** specifies a message with "OK" button.
+{
+    /** specifies a message with "OK" button.
      */
     const long BUTTONS_OK                   = 1;
 
-	/** specifies a message box with "OK" and "CANCEL" button.
+    /** specifies a message box with "OK" and "CANCEL" button.
      */
     const long BUTTONS_OK_CANCEL            = 2;
 
-	/** specifies a message box with "YES" and "NO" button.
+    /** specifies a message box with "YES" and "NO" button.
      */
     const long BUTTONS_YES_NO               = 3;
 
-	/** specifies a message box with "YES", "NO" and "CANCEL" button.
+    /** specifies a message box with "YES", "NO" and "CANCEL" button.
      */
     const long BUTTONS_YES_NO_CANCEL        = 4;
 
-	/** specifies a message box with "RETRY" and "CANCEL" button.
+    /** specifies a message box with "RETRY" and "CANCEL" button.
      */
     const long BUTTONS_RETRY_CANCEL         = 5;
 
-	/** specifies a message box with "ABORT", "IGNORE" and "RETRY" button.
+    /** specifies a message box with "ABORT", "IGNORE" and "RETRY" button.
      */
     const long BUTTONS_ABORT_IGNORE_RETRY   = 6;
 
     /** specifies that OK is the default button.
      */
     const long DEFAULT_BUTTON_OK            = 0x10000;
-    
-	/** specifies that CANCEL is the default button.
+
+    /** specifies that CANCEL is the default button.
      */
     const long DEFAULT_BUTTON_CANCEL        = 0x20000;
 
-	/** specifies that RETRY is the default button.
+    /** specifies that RETRY is the default button.
      */
     const long DEFAULT_BUTTON_RETRY         = 0x30000;
-    
-	/** specifies that YES is the default button.
+
+    /** specifies that YES is the default button.
      */
     const long DEFAULT_BUTTON_YES           = 0x40000;
 
-	/** specifies that NO is the default button.
+    /** specifies that NO is the default button.
      */
     const long DEFAULT_BUTTON_NO            = 0x50000;
 
-	/** specifies that IGNORE is the default button.
+    /** specifies that IGNORE is the default button.
      */
     const long DEFAULT_BUTTON_IGNORE        = 0x60000;
-}; 
+};
+
+}; }; }; };
 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+#endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenu.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenu.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenu.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,45 +7,35 @@
  * 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_PopupMenu_idl__
+#define __com_sun_star_awt_PopupMenu_idl__
 
-#ifndef __com_sun_star_awt_PopupMenu_idl__ 
-#define __com_sun_star_awt_PopupMenu_idl__ 
- 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
-#include <com/sun/star/awt/XPopupMenu.idl> 
-#endif 
+#include <com/sun/star/awt/XPopupMenu.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a popup menu which is a recursive container for commands
-		
-	<p>A popup menu can be used as a standalone object to display a context 
-       menu. It's also possible to use a popup menu to integrate it into 
+    <p>A popup menu can be used as a standalone object to display a context
+       menu. It's also possible to use a popup menu to integrate it into
        another menu.</p>
  */
 published service PopupMenu
-{ 
-	interface XPopupMenu; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XPopupMenu;
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenuDirection.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenuDirection.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenuDirection.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/PopupMenuDirection.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,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/l10n/main/offapi/com/sun/star/awt/WindowDescriptor.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/WindowDescriptor.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/WindowDescriptor.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/WindowDescriptor.idl Sun Feb  3 13:23:59 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/l10n/main/offapi/com/sun/star/awt/XGraphics.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/XGraphics.idl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/XGraphics.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/XGraphics.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,311 +7,271 @@
  * 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_XGraphics_idl__
+#define __com_sun_star_awt_XGraphics_idl__
 
-#ifndef __com_sun_star_awt_XGraphics_idl__ 
-#define __com_sun_star_awt_XGraphics_idl__ 
- 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
- 
-#ifndef __com_sun_star_util_Color_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/util/Color.idl>
-#endif
+#include <com/sun/star/awt/SimpleFontMetric.idl>
+#include <com/sun/star/awt/FontDescriptor.idl>
+#include <com/sun/star/awt/RasterOperation.idl>
+#include <com/sun/star/awt/Gradient.idl>
+#include <com/sun/star/awt/Rectangle.idl>
+#include <com/sun/star/graphic/XGraphic.idl>
+
+module com {  module sun {  module star {  module awt {
+
+published interface XRegion;
+published interface XDisplayBitmap;
+published interface XFont;
+published interface XDevice;
 
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
-#include <com/sun/star/awt/SimpleFontMetric.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
-#include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_RasterOperation_idl__ 
-#include <com/sun/star/awt/RasterOperation.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_Gradient_idl__ 
-#include <com/sun/star/awt/Gradient.idl> 
-#endif 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
- published interface XRegion; 
- published interface XDisplayBitmap; 
- published interface XFont; 
- published interface XDevice; 
- 
-//============================================================================= 
- 
 /** provides the basic output operation of a device.
  */
 published interface XGraphics: com::sun::star::uno::XInterface
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the device of this graphics.
-	 */
-	XDevice getDevice(); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the font metric of the current font.
-	 */
-	SimpleFontMetric getFontMetric(); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the font used by text operations.
-	 */
-	[oneway] void setFont( [in] XFont xNewFont ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** creates a new font and sets the font.
-	 */
-	[oneway] void selectFont( [in] FontDescriptor aDescription ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the text color used by text operations.
-	 */
-	[oneway] void setTextColor( [in] com::sun::star::util::Color nColor ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the fill color used by text operations.
-	 */
-	[oneway] void setTextFillColor( [in] com::sun::star::util::Color nColor ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the line color.
-	 */
-	[oneway] void setLineColor( [in] com::sun::star::util::Color nColor ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the fill color.
-	 */
-	[oneway] void setFillColor( [in] com::sun::star::util::Color nColor ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the raster operation. 
-						
-		<p>If the device does not support raster operations 
-		then this call is ignored.</p>
-	 */
-	[oneway] void setRasterOp( [in] RasterOperation ROP ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the clip region to specified clipping.
-	 */
-	[oneway] void setClipRegion( [in] XRegion Clipping ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** builds the intersection with the current region.
-	 */
-	[oneway] void intersectClipRegion( [in] XRegion xClipping ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** saves all current settings (Font, TextColor, TextFillColor,
-		LineColor, FillColor, RasterOp, ClipRegion).
-	 */
-	[oneway] void push(); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** restores all previous saved settings.
-	 */
-	[oneway] void pop(); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** copies a rectangle of pixels from another device into this one.
-	 */
-	[oneway] void copy( [in] XDevice xSource, 
-			 [in] long nSourceX, 
-			 [in] long nSourceY, 
-			 [in] long nSourceWidth, 
-			 [in] long nSourceHeight, 
-			 [in] long nDestX, 
-			 [in] long nDestY, 
-			 [in] long nDestWidth, 
-			 [in] long nDestHeight ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a part of the specified bitmap to the output device.
-	 */
-	[oneway] void draw( [in] XDisplayBitmap xBitmapHandle, 
-			 [in] long SourceX, 
-			 [in] long SourceY, 
-			 [in] long SourceWidth, 
-			 [in] long SourceHeight, 
-			 [in] long DestX, 
-			 [in] long DestY, 
-			 [in] long DestWidth, 
-			 [in] long DestHeight ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets a single pixel in the output device.
-	 */
-	[oneway] void drawPixel( [in] long X, 
-			 [in] long Y ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a line in the output device.
-	 */
-	[oneway] void drawLine( [in] long X1, 
-			 [in] long Y1, 
-			 [in] long X2, 
-			 [in] long Y2 ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a rectangle in the output device.
-	 */
-	[oneway] void drawRect( [in] long X, 
-			 [in] long Y, 
-			 [in] long Width, 
-			 [in] long Height ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a rectangle with rounded corners in the output device.
-	 */
-	[oneway] void drawRoundedRect( [in] long X, 
-			 [in] long Y, 
-			 [in] long Width, 
-			 [in] long Height, 
-			 [in] long nHorzRound, 
-			 [in] long nVertRound ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws multiple lines in the output device at once.
-	 */
-	[oneway] void drawPolyLine( [in] sequence<long> DataX, 
-			 [in] sequence<long> DataY ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a polygon line in the output device.
-	 */
-	[oneway] void drawPolygon( [in] sequence<long> DataX, 
-			 [in] sequence<long> DataY ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws multiple polygons in the output device at once.
-	 */
-	[oneway] void drawPolyPolygon( [in] sequence< sequence<long> > DataX, 
-			 [in] sequence< sequence<long> > DataY ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws an ellipse in the output device.
-	 */
-	[oneway] void drawEllipse( [in] long X, 
-			 [in] long Y, 
-			 [in] long Width, 
-			 [in] long Height ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws an arc (part of a circle) in the output device.
-	 */
-	[oneway] void drawArc( [in] long X, 
-			 [in] long Y, 
-			 [in] long Width, 
-			 [in] long Height, 
-			 [in] long X1, 
-			 [in] long Y1, 
-			 [in] long X2, 
-			 [in] long Y2 ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a circular area in the output device.
-	 */
-	[oneway] void drawPie( [in] long X, 
-			 [in] long Y, 
-			 [in] long Width, 
-			 [in] long Height, 
-			 [in] long X1, 
-			 [in] long Y1, 
-			 [in] long X2, 
-			 [in] long Y2 ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a chord of a circular area in the output device.
-						
-		<p>A chord is a segment of a circle. You get two chords from a 
-		circle if you intersect the circle with a straight line 
-		joining two points on the circle.</p>
-	 */
-	[oneway] void drawChord( [in] long nX, 
-			 [in] long nY, 
-			 [in] long nWidth, 
-			 [in] long nHeight, 
-			 [in] long nX1, 
-			 [in] long nY1, 
-			 [in] long nX2, 
-			 [in] long nY2 ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws a color dispersion in the output device.
-	 */
-	[oneway] void drawGradient( [in] long nX, 
-			 [in] long nY, 
-			 [in] long nWidth, 
-			 [in] long Height, 
-			 [in] Gradient aGradient ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws text in the output device.
-	 */
-	[oneway] void drawText( [in] long X, 
-			 [in] long Y, 
-			 [in] string Text ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** draws texts in the output device using an explicit kerning table.
-	 */
-	[oneway] void drawTextArray( [in] long X, 
-			 [in] long Y, 
-			 [in] string Text, 
-			 [in] sequence<long> Longs ); 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** the device of this graphics
+     */
+    [attribute, readonly] XDevice Device;
+
+    /** the text color used by text operations.
+     */
+    [attribute] com::sun::star::util::Color TextColor;
+
+    /** the fill color used by text operations.
+     */
+    [attribute] com::sun::star::util::Color TextFillColor;
+
+    /** the line color.
+     */
+    [attribute] com::sun::star::util::Color LineColor;
+
+    /** the fill color.
+     */
+    [attribute] com::sun::star::util::Color FillColor;
+
+    /** the raster operation.
+
+        <p>If the device does not support raster operations,
+        this attribute is ignored.</p>
+     */
+    [attribute] RasterOperation RasterOp;
+
+    /** the font used by text operations.
+     */
+    [attribute] XFont Font;
+
+    /** the font metric of the current font.
+     */
+    [attribute, readonly] SimpleFontMetric FontMetric;
+
+    /** creates a new font and sets the font.
+     */
+    [oneway] void selectFont( [in] FontDescriptor aDescription );
+
+    /** sets the clip region to specified clipping.
+     */
+    [oneway] void setClipRegion( [in] XRegion Clipping );
+ 
+    /** builds the intersection with the current region.
+     */
+    [oneway] void intersectClipRegion( [in] XRegion xClipping );
+
+    /** saves all current settings (Font, TextColor, TextFillColor,
+        LineColor, FillColor, RasterOp, ClipRegion).
+     */
+    [oneway] void push();
+
+    /** restores all previous saved settings.
+     */
+    [oneway] void pop();
+
+    /** clears the given rectangle on the device
+
+        @since Apache OpenOffice 4.0
+     */
+    [oneway] void clear( [in] Rectangle aRect );
+
+    /** copies a rectangle of pixels from another device into this one.
+     */
+    [oneway] void copy( [in] XDevice xSource,
+             [in] long nSourceX,
+             [in] long nSourceY,
+             [in] long nSourceWidth,
+             [in] long nSourceHeight,
+             [in] long nDestX,
+             [in] long nDestY,
+             [in] long nDestWidth,
+             [in] long nDestHeight );
+
+    /** draws a part of the specified bitmap to the output device.
+     */
+    [oneway] void draw( [in] XDisplayBitmap xBitmapHandle,
+             [in] long SourceX,
+             [in] long SourceY,
+             [in] long SourceWidth,
+             [in] long SourceHeight,
+             [in] long DestX,
+             [in] long DestY,
+             [in] long DestWidth,
+             [in] long DestHeight );
+
+    /** sets a single pixel in the output device.
+     */
+    [oneway] void drawPixel( [in] long X,
+             [in] long Y );
+
+    /** draws a line in the output device.
+     */
+    [oneway] void drawLine( [in] long X1,
+             [in] long Y1,
+             [in] long X2,
+             [in] long Y2 );
+
+    /** draws a rectangle in the output device.
+     */
+    [oneway] void drawRect( [in] long X,
+             [in] long Y,
+             [in] long Width,
+             [in] long Height );
+
+    /** draws a rectangle with rounded corners in the output device.
+     */
+    [oneway] void drawRoundedRect( [in] long X,
+             [in] long Y,
+             [in] long Width,
+             [in] long Height,
+             [in] long nHorzRound,
+             [in] long nVertRound );
+
+    /** draws multiple lines in the output device at once.
+     */
+    [oneway] void drawPolyLine( [in] sequence<long> DataX,
+             [in] sequence<long> DataY );
+
+    /** draws a polygon line in the output device.
+     */
+    [oneway] void drawPolygon( [in] sequence<long> DataX,
+             [in] sequence<long> DataY );
+
+    /** draws multiple polygons in the output device at once.
+     */
+    [oneway] void drawPolyPolygon( [in] sequence< sequence<long> > DataX,
+             [in] sequence< sequence<long> > DataY );
+
+    /** draws an ellipse in the output device.
+     */
+    [oneway] void drawEllipse( [in] long X,
+             [in] long Y,
+             [in] long Width,
+             [in] long Height );
+
+    /** draws an arc (part of a circle) in the output device.
+     */
+    [oneway] void drawArc( [in] long X,
+             [in] long Y,
+             [in] long Width,
+             [in] long Height,
+             [in] long X1,
+             [in] long Y1,
+             [in] long X2,
+             [in] long Y2 );
+
+    /** draws a circular area in the output device.
+     */
+    [oneway] void drawPie( [in] long X,
+             [in] long Y,
+             [in] long Width,
+             [in] long Height,
+             [in] long X1,
+             [in] long Y1,
+             [in] long X2,
+             [in] long Y2 );
+
+    /** draws a chord of a circular area in the output device.
+
+        <p>A chord is a segment of a circle. You get two chords from a
+        circle if you intersect the circle with a straight line
+        joining two points on the circle.</p>
+     */
+    [oneway] void drawChord( [in] long nX,
+             [in] long nY,
+             [in] long nWidth,
+             [in] long nHeight,
+             [in] long nX1,
+             [in] long nY1,
+             [in] long nX2,
+             [in] long nY2 );
+
+    /** draws a color dispersion in the output device.
+     */
+    [oneway] void drawGradient( [in] long nX,
+             [in] long nY,
+             [in] long nWidth,
+             [in] long Height,
+             [in] Gradient aGradient );
+
+    /** draws text in the output device.
+     */
+    [oneway] void drawText( [in] long X,
+             [in] long Y,
+             [in] string Text );
+
+    /** draws texts in the output device using an explicit kerning table.
+     */
+    [oneway] void drawTextArray( [in] long X,
+             [in] long Y,
+             [in] string Text,
+             [in] sequence<long> Longs );
+
+    /** draws a <type scope="com::sun::star::graphic">XGraphic</type>
+        in the output device.
+
+        <p>Note that some devices may not support this operation.</p>
+
+        @since Apache OpenOffice 4.0
+
+        @param  nX
+            the X coordinate on the device where the graphic will be drawn
+
+        @param  nY
+            the Y coordinate on the device where the graphic will be drawn
+
+        @param  nWidth
+            the width of the region on the device
+
+        @param  nHeight
+            the height of the region on the device
+
+        @param  nStyle
+            the style used to draw the image.
+            See <type scope="com::sun::star::awt">ImageDrawMode</type>.
+
+        @param  aGraphic
+            the <type scope="com::sun::star::graphic">XGraphic</type>
+            to be drawn onto the device
+     */
+    [oneway] void drawImage( [in] long nX,
+                             [in] long nY,
+                             [in] long nWidth,
+                             [in] long nHeight,
+                             [in] short nStyle,
+                             [in] ::com::sun::star::graphic::XGraphic aGraphic );
+
+};
+
+}; }; }; };
+
+#endif



Mime
View raw message