This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new be8bac3 Fixed links to Wiki, removed whitespace
be8bac3 is described below
commit be8bac394abcc456a2aa16c0c4adc2e1facb46e6
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Apr 8 17:46:49 2021 +0200
Fixed links to Wiki, removed whitespace
(cherry picked from commit 5f946091d0488e81980e69c79012bd4f5de91f2d)
---
.../Charts/JavaSampleChartAddIn.java | 21 ++--
.../Components/Addons/JobsAddon/AsyncJob.java | 19 +--
.../ProtocolHandlerAddon.java | 59 ++++-----
.../Components/CppComponent/service1_impl.cxx | 16 +--
.../Components/CppComponent/service2_impl.cxx | 23 ++--
.../Components/SimpleLicense/LicenseTest.java | 41 ++++---
.../org/openoffice/comp/test/ImageShrink.java | 61 +++++-----
.../dialogcomponent/DialogComponent.java | 97 +++++++--------
.../examples/DevelopersGuide/GUI/SystemDialog.java | 49 ++++----
.../FlatXmlFilterDetection/fdcomp.cxx | 21 ++--
.../FlatXmlFilter_cpp/FlatXml.cxx | 3 +-
.../OfficeDev/Linguistic/SampleHyphenator.java | 134 ++++++++++-----------
.../OfficeDev/Linguistic/SampleSpellChecker.java | 130 ++++++++++----------
.../OfficeDev/Linguistic/SampleThesaurus.java | 92 +++++++-------
.../DevelopersGuide/Spreadsheet/ExampleAddIn.java | 16 +--
.../EmbeddedObject/OwnEmbeddedObjectFactory.java | 15 ++-
main/odk/examples/java/PropertySet/PropTest.java | 35 +++---
main/odk/examples/java/Spreadsheet/CalcAddins.java | 85 ++++++-------
main/odk/pack/copying/makefile.mk | 34 +++---
19 files changed, 483 insertions(+), 468 deletions(-)
diff --git a/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
b/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
index 158fa1f..ab09a33 100644
--- a/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
+++ b/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
@@ -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.
- *
+ *
*************************************************************/
@@ -201,7 +201,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
JOptionPane.showMessageDialog( null, "One of the lines is still
null", "Assertion", JOptionPane.WARNING_MESSAGE );
return;
}
-
+
// position lines
// --------------
@@ -251,7 +251,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
XPropertySet aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, maTopLine );
aShapeProp.setPropertyValue( "PolyPolygon", aMaxPtSeq );
-
+
aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, maBottomLine );
aShapeProp.setPropertyValue( "PolyPolygon", aMinPtSeq );
@@ -298,7 +298,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
{
return( JavaSampleChartAddIn.class.getName() );
}
-
+
public String[] getSupportedServiceNames()
{
return getSupportedServiceNames_Static();
@@ -402,7 +402,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
// __________ static things __________
- private static final String smServiceName =
"com.sun.star.comp.Chart.JavaSampleChartAddIn";
+ private static final String smServiceName =
"com.sun.star.comp.Chart.JavaSampleChartAddIn";
public static String[] getSupportedServiceNames_Static()
{
@@ -434,7 +434,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
{
xSingleServiceFactory =
com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
JavaSampleChartAddIn.class, smServiceName,
- multiFactory, regKey );
+ multiFactory, regKey );
}
return xSingleServiceFactory;
@@ -450,7 +450,7 @@ public class JavaSampleChartAddIn extends WeakBase
implements
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(
com.sun.star.registry.XRegistryKey regKey )
// {
@@ -467,3 +467,4 @@ public class JavaSampleChartAddIn extends WeakBase
implements
// return bResult;
// }
}
+
diff --git
a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index 0e139d6..62cf420 100644
---
a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++
b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -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.
- *
+ *
*************************************************************/
@@ -45,7 +45,7 @@ import javax.swing.*;
* <li>the global com.sun.star.task.JobExecutor service and registered
for special events.</li>
* </ul>
*/
-public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
+public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
{
//___________________________________________
// const
@@ -89,7 +89,7 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
* if given argument list seems to be wrong
*/
public synchronized void executeAsync(com.sun.star.beans.NamedValue[]
lArgs ,
- com.sun.star.task.XJobListener
xListener)
+ com.sun.star.task.XJobListener
xListener)
throws com.sun.star.lang.IllegalArgumentException
{
// For asynchronous jobs a valid listener reference is guaranteed
normally ...
@@ -179,7 +179,7 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
com.sun.star.beans.NamedValue aDispatchResult = null;
com.sun.star.beans.NamedValue aSaveRequest = null;
- // SaveArguments will be made everytimes!
+ // SaveArguments will be made every time!
c = 1;
if (lJobConfig==null)
@@ -327,7 +327,7 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
* contains all shared configuration items for a job
*
* @param lJobConfig
- * contains all job sepcific configuration items
+ * contains all job specific configuration items
*
* @param lEnvironment
* contains some environment informations
@@ -421,7 +421,7 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
//___________________________________________
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public synchronized static boolean
__writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xRegKey)
// {
@@ -431,3 +431,4 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
// xRegKey);
// }
}
+
diff --git
a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
index 7191bac..6d118b3 100644
---
a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
+++
b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
@@ -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.
- *
+ *
*************************************************************/
@@ -51,14 +51,14 @@ public class ProtocolHandlerAddon {
*/
public static class ProtocolHandlerAddonImpl extends WeakBase implements
XDispatchProvider,
- XDispatch,
+ XDispatch,
XInitialization,
XServiceInfo {
/** The service name, that must be used to get an instance of this
service.
*/
static private final String[] m_serviceNames = {
"com.sun.star.frame.ProtocolHandler" };
-
+
/** The component context, that gives access to the service manager
and all registered services.
*/
private XComponentContext m_xCmpCtx;
@@ -72,7 +72,7 @@ public class ProtocolHandlerAddon {
private XFrame m_xFrame;
private XStatusListener m_xStatusListener;
-
+
/** The constructor of the inner class has a XMultiServiceFactory
parameter.
* @param xmultiservicefactoryInitialization A special service factory
* could be introduced while initializing.
@@ -80,7 +80,7 @@ public class ProtocolHandlerAddon {
public ProtocolHandlerAddonImpl( XComponentContext xComponentContext )
{
m_xCmpCtx = xComponentContext;
}
-
+
/** This method is a member of the interface for initializing an object
* directly after its creation.
* @param object This array of arbitrary objects will be passed to the
@@ -103,7 +103,7 @@ public class ProtocolHandlerAddon {
m_xCmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit",
m_xCmpCtx));
}
-
+
/** This method returns an array of all supported service names.
* @return Array of supported service names.
*/
@@ -114,7 +114,7 @@ public class ProtocolHandlerAddon {
public static String[] getServiceNames() {
return m_serviceNames;
}
-
+
/** This method returns true, if the given service will be
* supported by the component.
* @param stringService Service name.
@@ -122,22 +122,22 @@ public class ProtocolHandlerAddon {
*/
public boolean supportsService( String sService ) {
int len = m_serviceNames.length;
-
+
for( int i=0; i < len; i++) {
if ( sService.equals( m_serviceNames[i] ) )
return true;
}
-
+
return false;
}
-
+
/** Return the class name of the component.
* @return Class name of the component.
*/
public String getImplementationName() {
return ProtocolHandlerAddonImpl.class.getName();
}
-
+
// XDispatchProvider
public XDispatch queryDispatch( /*IN*/com.sun.star.util.URL aURL,
/*IN*/String sTargetFrameName,
@@ -153,23 +153,23 @@ public class ProtocolHandlerAddon {
}
return xRet;
}
-
+
public XDispatch[] queryDispatches( /*IN*/DispatchDescriptor[]
seqDescripts ) {
int nCount = seqDescripts.length;
XDispatch[] lDispatcher = new XDispatch[nCount];
-
+
for( int i=0; i<nCount; ++i )
lDispatcher[i] = queryDispatch( seqDescripts[i].FeatureURL,
seqDescripts[i].FrameName,
seqDescripts[i].SearchFlags );
-
- return lDispatcher;
+
+ return lDispatcher;
}
// XDispatch
public void dispatch( /*IN*/com.sun.star.util.URL aURL,
/*IN*/com.sun.star.beans.PropertyValue[]
aArguments ) {
-
+
if (
aURL.Protocol.compareTo("org.openoffice.Office.addon.example:") == 0 )
{
if ( aURL.Path.compareTo( "Function1" ) == 0 )
@@ -186,11 +186,11 @@ public class ProtocolHandlerAddon {
}
}
}
-
+
public void addStatusListener( /*IN*/XStatusListener xControl,
/*IN*/com.sun.star.util.URL aURL ) {
}
-
+
public void removeStatusListener( /*IN*/XStatusListener xControl,
/*IN*/com.sun.star.util.URL aURL ) {
}
@@ -210,7 +210,7 @@ public class ProtocolHandlerAddon {
aDescriptor.WindowAttributes = WindowAttribute.BORDER |
WindowAttribute.MOVEABLE |
WindowAttribute.CLOSEABLE;
-
+
XWindowPeer xPeer = m_xToolkit.createWindow( aDescriptor );
if ( null != xPeer ) {
XMessageBox xMsgBox =
(XMessageBox)UnoRuntime.queryInterface(
@@ -224,12 +224,12 @@ public class ProtocolHandlerAddon {
}
}
} catch ( com.sun.star.uno.Exception e) {
- // do your error handling
+ // do your error handling
}
}
}
-
-
+
+
/** Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
* <p>
@@ -245,14 +245,14 @@ public class ProtocolHandlerAddon {
*/
public static XSingleComponentFactory __getComponentFactory( String
sImplementationName ) {
XSingleComponentFactory xFactory = null;
-
+
if ( sImplementationName.equals(
ProtocolHandlerAddonImpl.class.getName() ) )
xFactory =
Factory.createComponentFactory(ProtocolHandlerAddonImpl.class,
ProtocolHandlerAddonImpl.getServiceNames());
-
+
return xFactory;
}
-
+
/** Writes the service information into the given registry key.
* This method is called by the <code>JavaLoader</code>.
* @return returns true if the operation succeeded
@@ -264,7 +264,7 @@ public class ProtocolHandlerAddon {
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(
// XRegistryKey xRegistryKey ) {
@@ -274,3 +274,4 @@ public class ProtocolHandlerAddon {
// xRegistryKey );
// }
}
+
diff --git
a/main/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
b/main/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index a7bca2b..d3a8346 100644
---
a/main/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++
b/main/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -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.
- *
+ *
*************************************************************/
@@ -51,7 +51,7 @@ OUString SAL_CALL getImplementationName_MyService1Impl()
"my_module.my_sc_implementation.MyService1") );
}
-
+
class MyService1Impl
: public ::my_module::XSomething
, public lang::XServiceInfo
@@ -59,7 +59,7 @@ class MyService1Impl
{
oslInterlockedCount m_refcount;
OUString m_sData;
- // it's good practise to store the context for further use when you use
+ // it's good practice to store the context for further use when you use
// other UNO API's in your implementation
Reference< XComponentContext > m_xContext;
public:
@@ -69,7 +69,7 @@ public:
{}
virtual ~MyService1Impl() {}
-
+
// XInterface
virtual Any SAL_CALL queryInterface( Type const & type )
throw (RuntimeException);
@@ -241,7 +241,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnviron
// 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
+// https://wiki.openoffice.org/wiki/Passive_Component_Registration
//
// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
// lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry )
diff --git
a/main/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
b/main/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index 9685ab7..874da56 100644
---
a/main/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++
b/main/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -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.
- *
+ *
*************************************************************/
@@ -39,12 +39,12 @@ using namespace ::com::sun::star::uno; // for basic types
namespace my_sc_impl
{
-extern Sequence< OUString > SAL_CALL
getSupportedServiceNames_MyService1Impl();
+extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl();
extern OUString SAL_CALL getImplementationName_MyService1Impl();
extern Reference< XInterface > SAL_CALL create_MyService1Impl(
Reference< XComponentContext > const & xContext )
SAL_THROW( () );
-
+
static Sequence< OUString > getSupportedServiceNames_MyService2Impl()
{
Sequence<OUString> names(1);
@@ -57,12 +57,12 @@ static OUString getImplementationName_MyService2Impl()
return OUString( RTL_CONSTASCII_USTRINGPARAM(
"my_module.my_sc_implementation.MyService2") );
}
-
+
class MyService2Impl : public ::cppu::WeakImplHelper3<
::my_module::XSomething, lang::XServiceInfo, lang::XInitialization >
{
OUString m_sData;
- // it's good practise to store the context for further use when you use
+ // it's good practice to store the context for further use when you use
// other UNO API's in your implementation
Reference< XComponentContext > m_xContext;
public:
@@ -74,7 +74,7 @@ public:
// focus on three given interfaces,
// no need to implement XInterface, XTypeProvider, XWeak
-
+
// XInitialization will be called upon
// createInstanceWithArguments[AndContext]()
virtual void SAL_CALL initialize( Sequence< Any > const & args )
@@ -93,7 +93,7 @@ public:
throw (RuntimeException);
};
-// XInitialization implemention
+// XInitialization implementation
void MyService2Impl::initialize( Sequence< Any > const & args )
throw (Exception)
{
@@ -196,7 +196,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
// 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
+// https://wiki.openoffice.org/wiki/Passive_Component_Registration
//
// sal_Bool SAL_CALL component_writeInfo(
// lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry )
@@ -216,4 +216,3 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
}
-
diff --git
a/main/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
b/main/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
index 282f144..18409a0 100644
---
a/main/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
+++
b/main/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
@@ -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.
- *
+ *
*************************************************************/
@@ -48,7 +48,7 @@ public class LicenseTest {
*/
static private final String __serviceName =
"org.openoffice.LicenseTest";
-
+
/** The initial component contextr, that gives access to
* the service manager, supported singletons, ...
* It's often later used
@@ -59,7 +59,7 @@ public class LicenseTest {
* It's often later used
*/
private XMultiComponentFactory m_xMCF;
-
+
/** The constructor of the inner class has a XMultiServiceFactory
parameter.
* @param xmultiservicefactoryInitialization A special service factory
* could be introduced while initializing.
@@ -67,13 +67,13 @@ public class LicenseTest {
public _LicenseTest(XComponentContext xCompContext) {
try {
m_cmpCtx = xCompContext;
- m_xMCF = m_cmpCtx.getServiceManager();
+ m_xMCF = m_cmpCtx.getServiceManager();
}
catch( Exception e ) {
e.printStackTrace();
}
}
-
+
/** This method returns an array of all supported service names.
* @return Array of supported service names.
*/
@@ -82,14 +82,14 @@ public class LicenseTest {
}
/** This method is a simple helper function to used in the
- * static component initialisation functions as well as in
+ * static component initialization functions as well as in
* getSupportedServiceNames.
*/
public static String[] getServiceNames() {
String[] sSupportedServiceNames = { __serviceName };
return sSupportedServiceNames;
}
-
+
/** This method returns true, if the given service will be
* supported by the component.
* @param sServiceName Service name.
@@ -98,16 +98,16 @@ public class LicenseTest {
public boolean supportsService( String sServiceName ) {
return sServiceName.equals( __serviceName );
}
-
+
/** Return the class name of the component.
* @return Class name of the component.
*/
public String getImplementationName() {
- return _LicenseTest.class.getName();
- }
+ return _LicenseTest.class.getName();
+ }
}
-
-
+
+
/**
* Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
@@ -121,11 +121,11 @@ public class LicenseTest {
public static XSingleComponentFactory __getComponentFactory(String
sImplName)
{
XSingleComponentFactory xFactory = null;
-
+
if ( sImplName.equals( _LicenseTest.class.getName() ) )
xFactory = Factory.createComponentFactory(_LicenseTest.class,
_LicenseTest.getServiceNames());
-
+
return xFactory;
}
@@ -139,7 +139,7 @@ public class LicenseTest {
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
// return
Factory.writeRegistryServiceInfo(_LicenseTest.class.getName(),
@@ -156,9 +156,10 @@ public class LicenseTest {
public void initialize( Object[] object )
throws com.sun.star.uno.Exception {
/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can intialize
+ * order!At this point you can read the objects and can initialize
* your component using these objects.
*/
}
-
+
}
+
diff --git
a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java
b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java
index cd91028..570c2bb 100644
---
a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java
+++
b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java
@@ -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.
- *
+ *
*************************************************************/
@@ -33,7 +33,7 @@ package org.openoffice.comp.test;
/**
*
- * @author dschulten
+ * @author dschulten
*/
import com.sun.star.lang.XSingleServiceFactory;
@@ -42,13 +42,13 @@ import com.sun.star.registry.XRegistryKey;
import com.sun.star.comp.loader.FactoryHelper;
import com.sun.star.lib.uno.helper.WeakBase;
-public class ImageShrink extends WeakBase
+public class ImageShrink extends WeakBase
implements com.sun.star.lang.XServiceInfo,
org.openoffice.test.XImageShrinkFilter {
com.sun.star.uno.XComponentContext xComponentContext = null;
-
+
// maintain a static implementation id for all instances of ImageShrink
// initialized by the first call to getImplementationId()
static byte[] _implementationId;
@@ -56,8 +56,8 @@ public class ImageShrink extends WeakBase
// hold the service name in a private static member variable of the class
protected static final String __serviceName =
"org.openoffice.test.ImageShrink";
-
-
+
+
String destDir = "";
String sourceDir = "";
boolean cancel = false;
@@ -72,7 +72,7 @@ public class ImageShrink extends WeakBase
public static XSingleServiceFactory __getServiceFactory(String implName,
XMultiServiceFactory multiFactory,
com.sun.star.registry.XRegistryKey regKey) {
-
+
com.sun.star.lang.XSingleServiceFactory xSingleServiceFactory = null;
if (implName.equals( ImageShrink.class.getName()) )
xSingleServiceFactory = FactoryHelper.getServiceFactory(
ImageShrink.class,
@@ -81,30 +81,30 @@ public class ImageShrink extends WeakBase
regKey);
return xSingleServiceFactory;
- }
-
+ }
+
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
{
// //System.out.println(ImageShrink.class.getName());
// return FactoryHelper.writeRegistryServiceInfo(
ImageShrink.class.getName(),
// __serviceName,
// regKey);
-// }
-
- // XFilter implementation (a sub-interface of XImageShrinkFilter)
+// }
+
+ // XFilter implementation (a sub-interface of XImageShrinkFilter)
public void cancel() {
cancel = true;
}
-
+
public boolean filter(com.sun.star.beans.PropertyValue[] propertyValue) {
- // while cancel = false,
- // scale images found in sourceDir according to dimension and
- // write them to destDir, using the image file format given in
-
-
+ // while cancel = false,
+ // scale images found in sourceDir according to dimension and
+ // write them to destDir, using the image file format given in
+
+
// []propertyValue
return true;
}
@@ -113,23 +113,23 @@ public class ImageShrink extends WeakBase
public String getDestinationDirectory() {
return destDir;
}
-
+
public com.sun.star.awt.Size getDimension() {
return dimension;
}
-
+
public String getSourceDirectory() {
return sourceDir;
}
-
+
public void setDestinationDirectory(String str) {
destDir = str;
}
-
+
public void setDimension(com.sun.star.awt.Size size) {
dimension = size;
}
-
+
public void setSourceDirectory(String str) {
sourceDir = str;
}
@@ -140,13 +140,14 @@ public class ImageShrink extends WeakBase
}
public boolean supportsService(String serviceName) {
- if ( serviceName.equals( __serviceName))
+ if ( serviceName.equals( __serviceName))
return true;
return false;
}
public String[] getSupportedServiceNames( ) {
return new String[] { __serviceName };
- }
-
+ }
+
}
+
diff --git
a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 0f350bd..88a89f1 100644
---
a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++
b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -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,22 +7,22 @@
* 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.
- *
+ *
*************************************************************/
import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.lang.XTypeProvider;
@@ -50,23 +50,23 @@ import com.sun.star.awt.WindowAttribute;
import com.sun.star.awt.WindowClass;
import com.sun.star.awt.WindowDescriptor;
import com.sun.star.awt.Rectangle;
-
+
import com.sun.star.test.XTestDialogHandler;
// DialogComponent implements all necessary interfaces self, this is only
-// for demonstration. More convenient is to use the impelmentation WeakBase or
+// for demonstration. More convenient is to use the implementation WeakBase or
// ComponentBase, see implementation of TestComponentA.
public class DialogComponent {
- // public static class _DialogComponent extends WeakBase
+ // public static class _DialogComponent extends WeakBase
public static class _DialogComponent
implements XTypeProvider, XServiceInfo, XTestDialogHandler,
XDialogEventHandler {
static final String __serviceName=
"com.sun.star.test.TestDialogHandler";
-
- static byte[] _implementationId;
+
+ static byte[] _implementationId;
private XComponentContext m_xCmpCtx;
-
+
private XFrame m_xFrame;
private XToolkit m_xToolkit;
@@ -78,17 +78,17 @@ public class DialogComponent {
m_xToolkit = (XToolkit)
UnoRuntime.queryInterface(
XToolkit.class,
m_xCmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit",
-
m_xCmpCtx));
+
m_xCmpCtx));
}
catch (Exception e) {
e.printStackTrace();
}
}
-
+
// XTestDialogHandler
public String createDialog( String DialogURL, XModel xModel,
XFrame xFrame ) {
m_xFrame = xFrame;
-
+
try {
XMultiComponentFactory xMCF =
m_xCmpCtx.getServiceManager();
Object obj;
@@ -97,7 +97,7 @@ public class DialogComponent {
if( xModel != null ) {
Object[] args = new Object[1];
args[0] = xModel;
-
+
obj =
xMCF.createInstanceWithArgumentsAndContext(
"com.sun.star.awt.DialogProvider2", args, m_xCmpCtx );
}
@@ -108,7 +108,7 @@ public class DialogComponent {
XDialogProvider2 xDialogProvider =
(XDialogProvider2)
UnoRuntime.queryInterface(
XDialogProvider2.class, obj );
-
+
XDialog xDialog =
xDialogProvider.createDialogWithHandler( DialogURL, this );
if( xDialog != null )
xDialog.execute();
@@ -118,13 +118,13 @@ public class DialogComponent {
}
return "Created dialog \"" + DialogURL + "\"";
}
-
+
public void copyText( XDialog xDialog, Object aEventObject ) {
XControlContainer xControlContainer =
(XControlContainer)UnoRuntime.queryInterface(
XControlContainer.class, xDialog );
String aTextPropertyStr = "Text";
String aText = "";
- XControl xTextField1Control =
xControlContainer.getControl( "TextField1" );
+ XControl xTextField1Control =
xControlContainer.getControl( "TextField1" );
XControlModel xControlModel1 =
xTextField1Control.getModel();
XPropertySet xPropertySet1 =
(XPropertySet)UnoRuntime.queryInterface(
XPropertySet.class, xControlModel1 );
@@ -135,8 +135,8 @@ public class DialogComponent {
catch (Exception e) {
e.printStackTrace();
}
-
- XControl xTextField2Control =
xControlContainer.getControl( "TextField2" );
+
+ XControl xTextField2Control =
xControlContainer.getControl( "TextField2" );
XControlModel xControlModel2 =
xTextField2Control.getModel();
XPropertySet xPropertySet2 =
(XPropertySet)UnoRuntime.queryInterface(
XPropertySet.class, xControlModel2 );
@@ -154,7 +154,7 @@ public class DialogComponent {
public void handleEvent() {
showMessageBox( "DialogComponent", "handleEvent()
called" );
}
-
+
public void handleEventWithArguments( XDialog xDialog, Object
aEventObject ) {
showMessageBox( "DialogComponent",
"handleEventWithArguments() called\n\n" +
"Event Object = " + aEventObject );
@@ -217,32 +217,32 @@ public class DialogComponent {
- /** This method is a simple helper function to used in the
- * static component initialisation functions as well as in
- * getSupportedServiceNames.
- */
- public static String[] getServiceNames() {
- String[] sSupportedServiceNames = { __serviceName };
- return sSupportedServiceNames;
- }
-
+ /** This method is a simple helper function to used in the
+ * static component initialisation functions as well as in
+ * getSupportedServiceNames.
+ */
+ public static String[] getServiceNames() {
+ String[] sSupportedServiceNames = { __serviceName };
+ return sSupportedServiceNames;
+ }
+
//XServiceInfo
- public String[] getSupportedServiceNames() {
- return getServiceNames();
- }
+ public String[] getSupportedServiceNames() {
+ return getServiceNames();
+ }
//XServiceInfo
- public boolean supportsService( String sServiceName ) {
- return sServiceName.equals( __serviceName );
- }
-
+ public boolean supportsService( String sServiceName ) {
+ return sServiceName.equals( __serviceName );
+ }
+
//XServiceInfo
- public String getImplementationName() {
- // return DialogComponent.class.getName();
- return _DialogComponent.class.getName();
- }
+ public String getImplementationName() {
+ // return DialogComponent.class.getName();
+ return _DialogComponent.class.getName();
+ }
- public void showMessageBox(String sTitle, String sMessage) {
+ public void showMessageBox(String sTitle, String sMessage) {
try {
if ( null != m_xFrame && null != m_xToolkit ) {
@@ -257,7 +257,7 @@ public class DialogComponent {
aDescriptor.WindowAttributes =
WindowAttribute.BORDER |
WindowAttribute.MOVEABLE |
WindowAttribute.CLOSEABLE;
-
+
XWindowPeer xPeer =
m_xToolkit.createWindow( aDescriptor );
if ( null != xPeer ) {
XMessageBox xMsgBox =
(XMessageBox)UnoRuntime.queryInterface(
@@ -271,9 +271,9 @@ public class DialogComponent {
}
}
} catch ( com.sun.star.uno.Exception e) {
- // do your error handling
+ // do your error handling
}
- }
+ }
}
/**
@@ -289,11 +289,11 @@ public class DialogComponent {
public static XSingleComponentFactory __getComponentFactory(String
sImplName)
{
XSingleComponentFactory xFactory = null;
-
+
if ( sImplName.equals( _DialogComponent.class.getName() ) )
xFactory = Factory.createComponentFactory(_DialogComponent.class,
_DialogComponent.getServiceNames());
-
+
return xFactory;
}
@@ -307,7 +307,7 @@ public class DialogComponent {
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
// return
Factory.writeRegistryServiceInfo(_DialogComponent.class.getName(),
@@ -315,3 +315,4 @@ public class DialogComponent {
// regKey);
// }
}
+
diff --git a/main/odk/examples/DevelopersGuide/GUI/SystemDialog.java
b/main/odk/examples/DevelopersGuide/GUI/SystemDialog.java
index 32d6905..cc1f097 100644
--- a/main/odk/examples/DevelopersGuide/GUI/SystemDialog.java
+++ b/main/odk/examples/DevelopersGuide/GUI/SystemDialog.java
@@ -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,19 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XInitialization;
@@ -35,16 +36,16 @@ import com.sun.star.uno.XComponentContext;
public class SystemDialog {
-
+
protected XComponentContext m_xContext = null;
protected com.sun.star.lang.XMultiComponentFactory m_xMCF;
-
+
/** Creates a new instance of MessageBox */
public SystemDialog(XComponentContext _xContext, XMultiComponentFactory
_xMCF){
m_xContext = _xContext;
m_xMCF = _xMCF;
}
-
+
public static void main(String args[]){
try {
XComponentContext xContext =
com.sun.star.comp.helper.Bootstrap.bootstrap();
@@ -61,8 +62,8 @@ public class SystemDialog {
System.exit( 0 );
}
-
-
+
+
public String raiseSaveAsDialog() {
String sStorePath = "";
XComponent xComponent = null;
@@ -70,37 +71,37 @@ public class SystemDialog {
// the filepicker is instantiated with the global
Multicomponentfactory...
Object oFilePicker =
m_xMCF.createInstanceWithContext("com.sun.star.ui.dialogs.FilePicker",
m_xContext);
XFilePicker xFilePicker = (XFilePicker)
UnoRuntime.queryInterface(XFilePicker.class, oFilePicker);
-
+
// the defaultname is the initially proposed filename..
xFilePicker.setDefaultName("MyExampleDocument");
-
+
// set the initial displaydirectory. In this example the user
template directory is used
Object oPathSettings =
m_xMCF.createInstanceWithContext("com.sun.star.util.PathSettings",m_xContext);
XPropertySet xPropertySet = (XPropertySet)
com.sun.star.uno.UnoRuntime.queryInterface(XPropertySet.class, oPathSettings);
String sTemplateUrl = (String)
xPropertySet.getPropertyValue("Template_writable");
xFilePicker.setDisplayDirectory(sTemplateUrl);
-
+
// set the filters of the dialog. The filternames may be retrieved
from
- //
http://wiki.services.openoffice.org/wiki/Framework/Article/Filter
+ // https://wiki.openoffice.org/wiki/Framework/Article/Filter
XFilterManager xFilterManager = (XFilterManager)
UnoRuntime.queryInterface(XFilterManager.class, xFilePicker);
xFilterManager.appendFilter("OpenDocument Text Template",
"writer8_template");
xFilterManager.appendFilter("OpenDocument Text", "writer8");
-
+
// choose the template that defines the capabilities of the
filepicker dialog
XInitialization xInitialize = (XInitialization)
UnoRuntime.queryInterface(XInitialization.class, xFilePicker);
Short[] listAny = new Short[] { new
Short(com.sun.star.ui.dialogs.TemplateDescription.FILESAVE_AUTOEXTENSION)};
xInitialize.initialize(listAny);
-
+
// add a control to the dialog to add the extension automatically
to the filename...
XFilePickerControlAccess xFilePickerControlAccess =
(XFilePickerControlAccess)
UnoRuntime.queryInterface(XFilePickerControlAccess.class, xFilePicker);
xFilePickerControlAccess.setValue(com.sun.star.ui.dialogs.ExtendedFilePickerElementIds.CHECKBOX_AUTOEXTENSION,
(short) 0, new Boolean(true));
-
+
xComponent = (XComponent)
UnoRuntime.queryInterface(XComponent.class, xFilePicker);
-
+
// execute the dialog...
XExecutableDialog xExecutable = (XExecutableDialog)
UnoRuntime.queryInterface(XExecutableDialog.class, xFilePicker);
short nResult = xExecutable.execute();
-
+
// query the resulting path of the dialog...
if (nResult == com.sun.star.ui.dialogs.ExecutableDialogResults.OK){
String[] sPathList = xFilePicker.getFiles();
@@ -111,14 +112,14 @@ public class SystemDialog {
} catch (com.sun.star.uno.Exception exception) {
exception.printStackTrace();
} finally{
- //make sure always to dispose the component and free the memory!
+ // make sure always to dispose the component and free the memory!
if (xComponent != null){
xComponent.dispose();
}
}
return sStorePath;
}
-
+
public String getWorkPath(){
String sWorkUrl = "";
try{
@@ -131,7 +132,7 @@ public class SystemDialog {
}
return sWorkUrl;
}
-
+
/** raises a folderpicker in which the user can browse and select a path
* @param _sDisplayDirectory the path to the directory that is initially
displayed
* @param _sTitle the title of the folderpicker
@@ -154,16 +155,16 @@ public class SystemDialog {
xFolderPicker.setTitle(_sTitle);
// show the dialog...
short nResult = xExecutable.execute();
-
+
// User has clicked "Select" button...
if (nResult == com.sun.star.ui.dialogs.ExecutableDialogResults.OK){
sReturnFolder = xFolderPicker.getDirectory();
}
-
+
}catch( Exception exception ) {
exception.printStackTrace(System.out);
} finally{
- //make sure always to dispose the component and free the memory!
+ // make sure always to dispose the component and free the memory!
if (xComponent != null){
xComponent.dispose();
}
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index 17b41e2..dda30bf 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -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.
- *
+ *
*************************************************************/
@@ -47,7 +47,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
// 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
+// https://wiki.openoffice.org/wiki/Passive_Component_Registration
//==================================================================================================
// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
// void * pServiceManager, void * pRegistryKey )
@@ -57,9 +57,9 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
// try
// {
// Reference< XRegistryKey > xNewKey(
-// reinterpret_cast< XRegistryKey * >(
pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
+// reinterpret_cast< XRegistryKey * >(
pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
// xNewKey = xNewKey->createKey(
OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+
// const Sequence< OUString > & rSNL =
FilterDetect_getSupportedServiceNames();
// const OUString * pArray = rSNL.getConstArray();
// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
@@ -80,15 +80,15 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey
)
{
void * pRet = 0;
-
- OUString implName = OUString::createFromAscii( pImplName );
+
+ OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager &&
implName.equals(FilterDetect_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory(
createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >(
pServiceManager ),
OUString::createFromAscii( pImplName ),
FilterDetect_createInstance,
FilterDetect_getSupportedServiceNames() ) );
-
+
if (xFactory.is())
{
xFactory->acquire();
@@ -99,3 +99,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
}
}
+
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 69483f0..b4b548b 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -315,7 +315,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
// 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
+// https://wiki.openoffice.org/wiki/Passive_Component_Registration
//
// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void *
pServiceManager, void * pRegistryKey )
// {
@@ -364,3 +364,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
}
} // extern "C"
+
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
index 012ba95..798ee7c 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
@@ -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,21 +7,21 @@
* 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.
- *
+ *
*************************************************************/
-// uno
+// uno
import com.sun.star.lib.uno.helper.ComponentBase;
import com.sun.star.uno.UnoRuntime;
@@ -32,10 +32,10 @@ import com.sun.star.lang.XSingleServiceFactory;
// supported Interfaces
import com.sun.star.linguistic2.XHyphenator;
import com.sun.star.linguistic2.XLinguServiceEventBroadcaster;
-import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XServiceDisplayName;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XServiceDisplayName;
// Exceptions
import com.sun.star.uno.Exception;
@@ -90,10 +90,10 @@ public class SampleHyphenator extends ComponentBase
implements
{
return aLoc1.Language.equals( aLoc2.Language ) &&
aLoc1.Country .equals( aLoc2.Country ) &&
- aLoc1.Variant .equals( aLoc2.Variant );
+ aLoc1.Variant .equals( aLoc2.Variant );
}
- private boolean GetValueToUse(
+ private boolean GetValueToUse(
String aPropName,
boolean bDefaultVal,
PropertyValue[] aProps )
@@ -103,7 +103,7 @@ public class SampleHyphenator extends ComponentBase
implements
try
{
// use temporary value if supplied
- for (int i = 0; i < aProps.length; ++i)
+ for (int i = 0; i < aProps.length; ++i)
{
if (aPropName.equals( aProps[i].Name ))
{
@@ -118,7 +118,7 @@ public class SampleHyphenator extends ComponentBase
implements
// otherwise use value from property set (if available)
XPropertySet xPropSet = aPropChgHelper.GetPropSet();
- if (xPropSet != null) // should always be the case
+ if (xPropSet != null) // should always be the case
{
Object aObj = xPropSet.getPropertyValue( aPropName );
if (AnyConverter.isBoolean( aObj ))
@@ -128,11 +128,11 @@ public class SampleHyphenator extends ComponentBase
implements
catch (Exception e) {
bRes = bDefaultVal;
}
-
+
return bRes;
}
-
- private short GetValueToUse(
+
+ private short GetValueToUse(
String aPropName,
short nDefaultVal,
PropertyValue[] aProps )
@@ -142,7 +142,7 @@ public class SampleHyphenator extends ComponentBase
implements
try
{
// use temporary value if supplied
- for (int i = 0; i < aProps.length; ++i)
+ for (int i = 0; i < aProps.length; ++i)
{
if (aPropName.equals( aProps[i].Name ))
{
@@ -157,7 +157,7 @@ public class SampleHyphenator extends ComponentBase
implements
// otherwise use value from property set (if available)
XPropertySet xPropSet = aPropChgHelper.GetPropSet();
- if (xPropSet != null) // should always be the case
+ if (xPropSet != null) // should always be the case
{
Object aObj = xPropSet.getPropertyValue( aPropName );
if (AnyConverter.isShort( aObj ))
@@ -167,20 +167,20 @@ public class SampleHyphenator extends ComponentBase
implements
catch (Exception e) {
nRes = nDefaultVal;
}
-
+
return nRes;
}
-
+
// __________ interface methods __________
-
-
+
+
//*****************
//XSupportedLocales
//*****************
public Locale[] getLocales()
throws com.sun.star.uno.RuntimeException
{
- Locale aLocales[] =
+ Locale aLocales[] =
{
new Locale( "de", "DE", "" ),
new Locale( "en", "US", "" )
@@ -188,23 +188,23 @@ public class SampleHyphenator extends ComponentBase
implements
return aLocales;
}
-
- public boolean hasLocale( Locale aLocale )
+
+ public boolean hasLocale( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
boolean bRes = false;
- if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) ||
+ if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) ||
IsEqual( aLocale, new Locale( "en", "US", "" ) ))
bRes = true;
- return bRes;
+ return bRes;
}
-
+
//***********
//XHyphenator
//***********
public XHyphenatedWord hyphenate(
String aWord, Locale aLocale,
- short nMaxLeading, PropertyValue[] aProperties )
+ short nMaxLeading, PropertyValue[] aProperties )
throws com.sun.star.uno.RuntimeException,
IllegalArgumentException
{
@@ -212,7 +212,7 @@ public class SampleHyphenator extends ComponentBase
implements
return null;
// linguistic is currently not allowed to throw exceptions
- // thus we return null fwhich means 'word cannot be hyphenated'
+ // thus we return null which means 'word cannot be hyphenated'
if (!hasLocale( aLocale ))
return null;
@@ -228,14 +228,14 @@ public class SampleHyphenator extends ComponentBase
implements
short nHyphMinWordLen = GetValueToUse(
"HyphMinWordLength", (short)5, aProperties );
XHyphenatedWord xRes = null;
-
+
if (aWord.length() >= nHyphMinWordLen)
{
String aHyphenatedWord = aWord;
short nHyphenationPos = -1;
short nHyphenPos = -1;
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your hyphenator
if (IsEqual( aLocale, new Locale( "de", "DE", "" ) ) )
{
@@ -243,7 +243,7 @@ public class SampleHyphenator extends ComponentBase
implements
{
// Note: there is only one position where the word
// can be hyphenated...
-
+
aHyphenatedWord = "Schifffahrt";
nHyphenationPos = 4;
nHyphenPos = 5;
@@ -256,15 +256,15 @@ public class SampleHyphenator extends ComponentBase
implements
else if (IsEqual( aLocale, new Locale( "en", "US", "" ) ) )
{
int nLast = aWord.length() - 1 - nHyphMinTrailing;
-
- if ( aWord.equals( "waterfall" ) )
+
+ if ( aWord.equals( "waterfall" ) )
{
if (4 <= nLast)
nHyphenationPos = nHyphenPos = 4;
else
nHyphenationPos = nHyphenPos = 1;
}
- else if ( aWord.equals( "driving" ) )
+ else if ( aWord.equals( "driving" ) )
{
nHyphenationPos = nHyphenPos = 3;
}
@@ -273,19 +273,19 @@ public class SampleHyphenator extends ComponentBase
implements
// check if hyphenation pos is valid,
// a value of -1 indicates that hyphenation is not possible
if ( nHyphenationPos != -1 &&
- !(nHyphenationPos < nHyphMinLeading) &&
+ !(nHyphenationPos < nHyphMinLeading) &&
!(nHyphenationPos >= aWord.length() - nHyphMinTrailing))
{
- xRes = new XHyphenatedWord_impl(aWord, aLocale,
+ xRes = new XHyphenatedWord_impl(aWord, aLocale,
nHyphenationPos, aHyphenatedWord, nHyphenPos);
}
}
return xRes;
}
-
+
public XHyphenatedWord queryAlternativeSpelling(
String aWord, Locale aLocale,
- short nIndex, PropertyValue[] aProperties )
+ short nIndex, PropertyValue[] aProperties )
throws com.sun.star.uno.RuntimeException,
IllegalArgumentException
{
@@ -307,20 +307,20 @@ public class SampleHyphenator extends ComponentBase
implements
short nHyphMinLeading = GetValueToUse( "HyphMinLeading",
(short)2, aProperties );
short nHyphMinTrailing = GetValueToUse(
"HyphMinTrailing", (short)2, aProperties );
short nHyphMinWordLen = GetValueToUse(
"HyphMinWordLength", (short)5, aProperties );
-
+
XHyphenatedWord xRes = null;
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your hyphenator
if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) )
{
// there is an alternative spelling only when the
- // word is hyphenated between the "ff" and old german spelling
+ // word is hyphenated between the "ff" and old German spelling
// is set.
if (aWord.equals( "Schiffahrt" ) &&
bIsGermanPreReform && nIndex == 4)
- {
- xRes = new XHyphenatedWord_impl(aWord, aLocale,
+ {
+ xRes = new XHyphenatedWord_impl(aWord, aLocale,
(short)4, "Schifffahrt", (short)5 );
}
}
@@ -331,16 +331,16 @@ public class SampleHyphenator extends ComponentBase
implements
return xRes;
}
-
+
public XPossibleHyphens createPossibleHyphens(
String aWord, Locale aLocale,
- PropertyValue[] aProperties )
+ PropertyValue[] aProperties )
throws com.sun.star.uno.RuntimeException,
IllegalArgumentException
{
if (IsEqual( aLocale, new Locale() ) || aWord.length() == 0)
return null;
-
+
// linguistic is currently not allowed to throw exceptions
// thus we return null which means 'word cannot be hyphenated'
if (!hasLocale( aLocale ))
@@ -356,15 +356,15 @@ public class SampleHyphenator extends ComponentBase
implements
short nHyphMinLeading = GetValueToUse( "HyphMinLeading",
(short)2, aProperties );
short nHyphMinTrailing = GetValueToUse(
"HyphMinTrailing", (short)2, aProperties );
short nHyphMinWordLen = GetValueToUse(
"HyphMinWordLength", (short)5, aProperties );
-
+
XPossibleHyphens xRes = null;
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your hyphenator
if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) )
{
if (bIsGermanPreReform && aWord.equals( "Schiffahrt" ))
- {
+ {
short aPos[] = new short[] { (short) 4 };
xRes = new XPossibleHyphens_impl(aWord, aLocale,
"Schiff=fahrt", aPos);
@@ -378,14 +378,14 @@ public class SampleHyphenator extends ComponentBase
implements
}
else if ( IsEqual( aLocale, new Locale( "en", "US", "" ) ) )
{
- if ( aWord.equals( "waterfall" ) )
+ if ( aWord.equals( "waterfall" ) )
{
short aPos[] = new short[]
{ (short) 1, (short) 4 };
xRes = new XPossibleHyphens_impl(aWord, aLocale,
"wa=ter=fall", aPos);
}
- else if ( aWord.equals( "driving" ) )
+ else if ( aWord.equals( "driving" ) )
{
short aPos[] = new short[]
{ (short) 3 };
@@ -396,7 +396,7 @@ public class SampleHyphenator extends ComponentBase
implements
return xRes;
}
-
+
//*****************************
//XLinguServiceEventBroadcaster
//*****************************
@@ -404,35 +404,35 @@ public class SampleHyphenator extends ComponentBase
implements
XLinguServiceEventListener xLstnr )
throws com.sun.star.uno.RuntimeException
{
- boolean bRes = false;
+ boolean bRes = false;
if (!bDisposing && xLstnr != null)
bRes = aPropChgHelper.addLinguServiceEventListener( xLstnr );
return bRes;
}
-
+
public boolean removeLinguServiceEventListener(
- XLinguServiceEventListener xLstnr )
+ XLinguServiceEventListener xLstnr )
throws com.sun.star.uno.RuntimeException
{
- boolean bRes = false;
+ boolean bRes = false;
if (!bDisposing && xLstnr != null)
bRes = aPropChgHelper.removeLinguServiceEventListener( xLstnr );
return bRes;
- }
+ }
//********************
// XServiceDisplayName
//********************
- public String getServiceDisplayName( Locale aLocale )
+ public String getServiceDisplayName( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
- return "Java Samples";
+ return "Java Samples";
}
//****************
// XInitialization
//****************
- public void initialize( Object[] aArguments )
+ public void initialize( Object[] aArguments )
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException
{
@@ -446,7 +446,7 @@ public class SampleHyphenator extends ComponentBase
implements
}
}
-
+
//*************
// XServiceInfo
//*************
@@ -468,17 +468,17 @@ public class SampleHyphenator extends ComponentBase
implements
{
return _aSvcImplName;
}
-
+
public String[] getSupportedServiceNames()
throws com.sun.star.uno.RuntimeException
{
return getSupportedServiceNames_Static();
}
-
+
// __________ static things __________
public static String _aSvcImplName = SampleHyphenator.class.getName();
-
+
public static String[] getSupportedServiceNames_Static()
{
String[] aResult = { "com.sun.star.linguistic2.Hyphenator" };
@@ -522,9 +522,9 @@ public class SampleHyphenator extends ComponentBase
implements
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
-// public static boolean __writeRegistryServiceInfo(
+// public static boolean __writeRegistryServiceInfo(
// com.sun.star.registry.XRegistryKey xRegKey )
// {
// boolean bResult = true;
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
index 7d4f4cb..3bd41ef 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
@@ -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.
- *
+ *
*************************************************************/
@@ -32,10 +32,10 @@ import com.sun.star.lang.XSingleServiceFactory;
// supported Interfaces
import com.sun.star.linguistic2.XSpellChecker;
import com.sun.star.linguistic2.XLinguServiceEventBroadcaster;
-import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XServiceDisplayName;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XServiceDisplayName;
// Exceptions
import com.sun.star.uno.Exception;
@@ -81,19 +81,19 @@ public class SampleSpellChecker extends ComponentBase
implements
"IsSpellWithDigits",
"IsSpellCapitalization"
};
- aPropChgHelper = new PropChgHelper_Spell( (XSpellChecker) this,
aProps );
- aEvtListeners = new ArrayList();
- bDisposing = false;
+ aPropChgHelper = new PropChgHelper_Spell( (XSpellChecker) this, aProps
);
+ aEvtListeners = new ArrayList();
+ bDisposing = false;
}
private boolean IsEqual( Locale aLoc1, Locale aLoc2 )
{
return aLoc1.Language.equals( aLoc2.Language ) &&
- aLoc1.Country .equals( aLoc2.Country ) &&
- aLoc1.Variant .equals( aLoc2.Variant );
+ aLoc1.Country .equals( aLoc2.Country ) &&
+ aLoc1.Variant .equals( aLoc2.Variant );
}
- private boolean GetValueToUse(
+ private boolean GetValueToUse(
String aPropName,
boolean bDefaultVal,
PropertyValue[] aProps )
@@ -103,7 +103,7 @@ public class SampleSpellChecker extends ComponentBase
implements
try
{
// use temporary value if supplied
- for (int i = 0; i < aProps.length; ++i)
+ for (int i = 0; i < aProps.length; ++i)
{
if (aPropName.equals( aProps[i].Name ))
{
@@ -118,7 +118,7 @@ public class SampleSpellChecker extends ComponentBase
implements
// otherwise use value from property set (if available)
XPropertySet xPropSet = aPropChgHelper.GetPropSet();
- if (xPropSet != null) // should always be the case
+ if (xPropSet != null) // should always be the case
{
Object aObj = xPropSet.getPropertyValue( aPropName );
if (AnyConverter.isBoolean( aObj ))
@@ -128,13 +128,13 @@ public class SampleSpellChecker extends ComponentBase
implements
catch (Exception e) {
bRes = bDefaultVal;
}
-
+
return bRes;
}
private boolean IsUpper( String aWord, Locale aLocale )
{
- java.util.Locale aLang = new java.util.Locale(
+ java.util.Locale aLang = new java.util.Locale(
aLocale.Language, aLocale.Country, aLocale.Variant );
return aWord.equals( aWord.toUpperCase( aLang ) );
}
@@ -142,7 +142,7 @@ public class SampleSpellChecker extends ComponentBase
implements
private boolean HasDigits( String aWord )
{
int nLen = aWord.length();
- for (int i = 0; i < nLen; ++i)
+ for (int i = 0; i < nLen; ++i)
{
if (Character.isDigit( aWord.charAt(i) ))
return true;
@@ -150,16 +150,16 @@ public class SampleSpellChecker extends ComponentBase
implements
return false;
}
- private short GetSpellFailure(
- String aWord,
+ private short GetSpellFailure(
+ String aWord,
Locale aLocale,
- PropertyValue[] aProperties )
+ PropertyValue[] aProperties )
{
short nRes = -1;
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your spellchecker
- boolean bIsGermanPreReform = GetValueToUse( "IsGermanPreReform",
false, aProperties );
+ boolean bIsGermanPreReform = GetValueToUse( "IsGermanPreReform",
false, aProperties );
if (IsEqual( aLocale, new Locale( "de", "DE", "" ) ))
{
if (bIsGermanPreReform && aWord.equals( "Schifffahrt" ))
@@ -177,25 +177,25 @@ public class SampleSpellChecker extends ComponentBase
implements
{
// default value (no other SpellFailure type is applicable)
nRes = SpellFailure.SPELLING_ERROR;
-
+
if (aWord.equals( "arizona" ))
nRes = SpellFailure.CAPTION_ERROR;
else if (aWord.equals( "house" ))
nRes = SpellFailure.SPELLING_ERROR;
else if (aWord.equals( "course" ))
nRes = SpellFailure.IS_NEGATIVE_WORD;
- }
+ }
}
-
+
return nRes;
}
- private XSpellAlternatives GetProposals(
- String aWord,
- Locale aLocale,
- PropertyValue[] aProperties )
+ private XSpellAlternatives GetProposals(
+ String aWord,
+ Locale aLocale,
+ PropertyValue[] aProperties )
{
- short nType = SpellFailure.SPELLING_ERROR;
+ short nType = SpellFailure.SPELLING_ERROR;
String[] aProposals = null;
// get values of relevant properties that may be used.
@@ -207,7 +207,7 @@ public class SampleSpellChecker extends ComponentBase
implements
boolean bIsSpellUpperCase = GetValueToUse( "IsSpellUpperCase",
false, aProperties );
boolean bIsSpellCapitalization = GetValueToUse(
"IsSpellCapitalization", true, aProperties );
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your spellchecker
if (IsEqual( aLocale, new Locale( "de", "DE", "" ) ))
{
@@ -246,17 +246,17 @@ public class SampleSpellChecker extends ComponentBase
implements
return new XSpellAlternatives_impl( aWord, aLocale,
nType, aProposals );
}
-
+
// __________ interface methods __________
-
-
+
+
//*****************
//XSupportedLocales
//*****************
public Locale[] getLocales()
throws com.sun.star.uno.RuntimeException
{
- Locale aLocales[] =
+ Locale aLocales[] =
{
new Locale( "de", "DE", "" ),
new Locale( "en", "US", "" )
@@ -264,30 +264,30 @@ public class SampleSpellChecker extends ComponentBase
implements
return aLocales;
}
-
- public boolean hasLocale( Locale aLocale )
+
+ public boolean hasLocale( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
boolean bRes = false;
- if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) ||
+ if ( IsEqual( aLocale, new Locale( "de", "DE", "" ) ) ||
IsEqual( aLocale, new Locale( "en", "US", "" ) ))
bRes = true;
- return bRes;
+ return bRes;
}
-
+
//*************
//XSpellChecker
//*************
public boolean isValid(
String aWord, Locale aLocale,
- PropertyValue[] aProperties )
+ PropertyValue[] aProperties )
throws com.sun.star.uno.RuntimeException,
IllegalArgumentException
{
if (IsEqual( aLocale, new Locale() ) || aWord.length() == 0)
return true;
-
+
// linguistic is currently not allowed to throw exceptions
// thus we return null which means 'word cannot be spelled'
if (!hasLocale( aLocale ))
@@ -301,7 +301,7 @@ public class SampleSpellChecker extends ComponentBase
implements
boolean bIsSpellWithDigits = GetValueToUse( "IsSpellWithDigits",
false, aProperties );
boolean bIsSpellUpperCase = GetValueToUse( "IsSpellUpperCase",
false, aProperties );
boolean bIsSpellCapitalization = GetValueToUse(
"IsSpellCapitalization", true, aProperties );
-
+
short nFailure = GetSpellFailure( aWord, aLocale, aProperties );
if (nFailure != -1)
{
@@ -316,22 +316,22 @@ public class SampleSpellChecker extends ComponentBase
implements
return nFailure == -1;
}
-
-
+
+
public XSpellAlternatives spell(
String aWord, Locale aLocale,
- PropertyValue[] aProperties )
+ PropertyValue[] aProperties )
throws com.sun.star.uno.RuntimeException,
IllegalArgumentException
{
if (IsEqual( aLocale, new Locale() ) || aWord.length() == 0)
return null;
-
+
// linguistic is currently not allowed to throw exceptions
- // thus we return null fwhich means 'word cannot be spelled'
+ // thus we return null which means 'word cannot be spelled'
if (!hasLocale( aLocale ))
return null;
-
+
XSpellAlternatives xRes = null;
if (!isValid( aWord, aLocale, aProperties ))
{
@@ -339,8 +339,8 @@ public class SampleSpellChecker extends ComponentBase
implements
}
return xRes;
}
-
-
+
+
//*****************************
//XLinguServiceEventBroadcaster
//*****************************
@@ -348,35 +348,35 @@ public class SampleSpellChecker extends ComponentBase
implements
XLinguServiceEventListener xLstnr )
throws com.sun.star.uno.RuntimeException
{
- boolean bRes = false;
+ boolean bRes = false;
if (!bDisposing && xLstnr != null)
bRes = aPropChgHelper.addLinguServiceEventListener( xLstnr );
return bRes;
}
-
+
public boolean removeLinguServiceEventListener(
- XLinguServiceEventListener xLstnr )
+ XLinguServiceEventListener xLstnr )
throws com.sun.star.uno.RuntimeException
{
- boolean bRes = false;
+ boolean bRes = false;
if (!bDisposing && xLstnr != null)
bRes = aPropChgHelper.removeLinguServiceEventListener( xLstnr );
return bRes;
- }
+ }
//********************
// XServiceDisplayName
//********************
- public String getServiceDisplayName( Locale aLocale )
+ public String getServiceDisplayName( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
- return "Java Samples";
+ return "Java Samples";
}
//****************
// XInitialization
//****************
- public void initialize( Object[] aArguments )
+ public void initialize( Object[] aArguments )
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException
{
@@ -411,17 +411,17 @@ public class SampleSpellChecker extends ComponentBase
implements
{
return _aSvcImplName;
}
-
+
public String[] getSupportedServiceNames()
throws com.sun.star.uno.RuntimeException
{
return getSupportedServiceNames_Static();
}
-
+
// __________ static things __________
public static String _aSvcImplName = SampleSpellChecker.class.getName();
-
+
public static String[] getSupportedServiceNames_Static()
{
String[] aResult = { "com.sun.star.linguistic2.SpellChecker" };
@@ -465,9 +465,9 @@ public class SampleSpellChecker extends ComponentBase
implements
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
-// public static boolean __writeRegistryServiceInfo(
+// public static boolean __writeRegistryServiceInfo(
// com.sun.star.registry.XRegistryKey xRegKey )
// {
// boolean bResult = true;
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
index 66d1a6d..c621b55 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
@@ -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.
- *
+ *
*************************************************************/
@@ -31,10 +31,10 @@ import com.sun.star.lang.XSingleServiceFactory;
// supported Interfaces
import com.sun.star.linguistic2.XThesaurus;
-import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XServiceDisplayName;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XServiceDisplayName;
// Exceptions
import com.sun.star.uno.Exception;
@@ -63,7 +63,7 @@ public class SampleThesaurus extends ComponentBase implements
PropChgHelper aPropChgHelper;
ArrayList aEvtListeners;
boolean bDisposing;
-
+
public SampleThesaurus()
{
// names of relevant properties to be used
@@ -73,25 +73,25 @@ public class SampleThesaurus extends ComponentBase
implements
"IsUseDictionaryList",
"IsGermanPreReform",
};
-
+
// this service has no listeners thus we may use the base class,
- // which is here basically used only to keep track of the
+ // which is here basically used only to keep track of the
// property set (and it's lifetime) since it gets used in the
// 'GetValueToUse' function
- aPropChgHelper = new PropChgHelper( (XThesaurus) this, aProps );
-
- aEvtListeners = new ArrayList();
- bDisposing = false;
+ aPropChgHelper = new PropChgHelper( (XThesaurus) this, aProps );
+
+ aEvtListeners = new ArrayList();
+ bDisposing = false;
}
private boolean IsEqual( Locale aLoc1, Locale aLoc2 )
{
return aLoc1.Language.equals( aLoc2.Language ) &&
- aLoc1.Country .equals( aLoc2.Country ) &&
- aLoc1.Variant .equals( aLoc2.Variant );
+ aLoc1.Country .equals( aLoc2.Country ) &&
+ aLoc1.Variant .equals( aLoc2.Variant );
}
- private boolean GetValueToUse(
+ private boolean GetValueToUse(
String aPropName,
boolean bDefaultVal,
PropertyValue[] aProps )
@@ -101,7 +101,7 @@ public class SampleThesaurus extends ComponentBase
implements
try
{
// use temporary value if supplied
- for (int i = 0; i < aProps.length; ++i)
+ for (int i = 0; i < aProps.length; ++i)
{
if (aPropName.equals( aProps[i].Name ))
{
@@ -116,7 +116,7 @@ public class SampleThesaurus extends ComponentBase
implements
// otherwise use value from property set (if available)
XPropertySet xPropSet = aPropChgHelper.GetPropSet();
- if (xPropSet != null) // should always be the case
+ if (xPropSet != null) // should always be the case
{
Object aObj = xPropSet.getPropertyValue( aPropName );
if (AnyConverter.isBoolean( aObj ))
@@ -126,40 +126,40 @@ public class SampleThesaurus extends ComponentBase
implements
catch (Exception e) {
bRes = bDefaultVal;
}
-
+
return bRes;
}
-
+
// __________ interface methods __________
-
-
+
+
//*****************
//XSupportedLocales
//*****************
public Locale[] getLocales()
throws com.sun.star.uno.RuntimeException
{
- Locale aLocales[] =
+ Locale aLocales[] =
{
new Locale( "en", "US", "" )
};
return aLocales;
}
-
- public boolean hasLocale( Locale aLocale )
+
+ public boolean hasLocale( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
boolean bRes = false;
if (IsEqual( aLocale, new Locale( "en", "US", "" ) ))
bRes = true;
- return bRes;
+ return bRes;
}
-
+
//**********
//XThesaurus
//**********
- public XMeaning[] queryMeanings(
+ public XMeaning[] queryMeanings(
String aTerm, Locale aLocale,
PropertyValue[] aProperties )
throws com.sun.star.lang.IllegalArgumentException,
@@ -167,9 +167,9 @@ public class SampleThesaurus extends ComponentBase
implements
{
if (IsEqual( aLocale, new Locale() ) || aTerm.length() == 0)
return null;
-
+
// linguistic is currently not allowed to throw exceptions
- // thus we return null fwhich means 'word cannot be looked up'
+ // thus we return null which means 'word cannot be looked up'
if (!hasLocale( aLocale ))
return null;
@@ -177,43 +177,43 @@ public class SampleThesaurus extends ComponentBase
implements
//! The values for 'IsIgnoreControlCharacters' and
'IsUseDictionaryList'
//! are handled by the dispatcher! Thus there is no need to access
//! them here.
- boolean bIsGermanPreReform = GetValueToUse( "IsGermanPreReform",
false, aProperties );
+ boolean bIsGermanPreReform = GetValueToUse( "IsGermanPreReform",
false, aProperties );
XMeaning[] aRes = null;
- //!! This code needs to be replaced by code calling the actual
+ //!! This code needs to be replaced by code calling the actual
//!! implementation of your thesaurus
if (aTerm.equals( "house" ) &&
IsEqual( aLocale, new Locale( "en", "US", "" ) ) )
{
aRes = new XMeaning[]
{
- new XMeaning_impl( "a building where one lives",
+ new XMeaning_impl( "a building where one lives",
new String[]{ "home", "place", "dwelling" } ),
- new XMeaning_impl( "a group of people sharing common
ancestry",
+ new XMeaning_impl( "a group of people sharing common
ancestry",
new String[]{ "family", "clan", "kindred" } ),
- new XMeaning_impl( "to provide with lodging",
+ new XMeaning_impl( "to provide with lodging",
new String[]{ "room", "board", "put up" } )
};
}
return aRes;
}
-
-
+
+
//********************
// XServiceDisplayName
//********************
- public String getServiceDisplayName( Locale aLocale )
+ public String getServiceDisplayName( Locale aLocale )
throws com.sun.star.uno.RuntimeException
{
- return "Java Samples";
+ return "Java Samples";
}
//****************
// XInitialization
//****************
- public void initialize( Object[] aArguments )
+ public void initialize( Object[] aArguments )
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException
{
@@ -248,17 +248,17 @@ public class SampleThesaurus extends ComponentBase
implements
{
return _aSvcImplName;
}
-
+
public String[] getSupportedServiceNames()
throws com.sun.star.uno.RuntimeException
{
return getSupportedServiceNames_Static();
}
-
+
// __________ static things __________
public static String _aSvcImplName = SampleThesaurus.class.getName();
-
+
public static String[] getSupportedServiceNames_Static()
{
String[] aResult = { "com.sun.star.linguistic2.Thesaurus" };
@@ -302,9 +302,9 @@ public class SampleThesaurus extends ComponentBase
implements
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
-// public static boolean __writeRegistryServiceInfo(
+// public static boolean __writeRegistryServiceInfo(
// com.sun.star.registry.XRegistryKey xRegKey )
// {
// boolean bResult = true;
diff --git a/main/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
b/main/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index 66e90e9..a98f483 100644
--- a/main/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/main/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -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.
- *
+ *
*************************************************************/
@@ -239,11 +239,11 @@ public class ExampleAddIn
// ignored in this example
aFuncLocale = aLocale;
}
-
+
public com.sun.star.lang.Locale getLocale()
{
return aFuncLocale;
- }
+ }
// XServiceName
@@ -289,10 +289,10 @@ public class ExampleAddIn
multiFactory, regKey);
return xSingleServiceFactory;
}
-
+
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(
// com.sun.star.registry.XRegistryKey regKey)
diff --git
a/main/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
b/main/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
index b4be594..2b3f9b0 100644
---
a/main/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
+++
b/main/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
@@ -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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
package org.openoffice.examples.embedding;
import com.sun.star.uno.UnoRuntime;
@@ -60,7 +62,7 @@ public final class OwnEmbeddedObjectFactory extends WeakBase
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo( XRegistryKey
xRegistryKey ) {
// return Factory.writeRegistryServiceInfo(m_implementationName,
@@ -92,7 +94,7 @@ public final class OwnEmbeddedObjectFactory extends WeakBase
{
if ( xStorage == null || sEntName == null || sEntName.length() == 0 )
throw new com.sun.star.lang.IllegalArgumentException();
-
+
if ( nEntryConnectionMode ==
com.sun.star.embed.EntryInitModes.DEFAULT_INIT )
{
if ( aClassID != null && aClassID.length != 0 )
@@ -124,3 +126,4 @@ public final class OwnEmbeddedObjectFactory extends WeakBase
}
}
+
diff --git a/main/odk/examples/java/PropertySet/PropTest.java
b/main/odk/examples/java/PropertySet/PropTest.java
index 3b8e4e7..e14d0f5 100644
--- a/main/odk/examples/java/PropertySet/PropTest.java
+++ b/main/odk/examples/java/PropertySet/PropTest.java
@@ -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,23 +7,23 @@
* 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.
- *
+ *
*************************************************************/
/*
-This example shows a UNO component that inherits
com.sun.star.lib.uno.helper.PropertySet in
-order to provide implementations of these interfaces:
+This example shows a UNO component that inherits
com.sun.star.lib.uno.helper.PropertySet in
+order to provide implementations of these interfaces:
com.sun.star.beans.XPropertySet
com.sun.star.beans.XMultiPropertySet
@@ -45,7 +45,7 @@ import com.sun.star.lang.XTypeProvider;
import com.sun.star.beans.PropertyAttribute;
/**
- This component contains the followin properties:
+ This component contains the following properties:
* <table border>
* <tr>
* <th> Property Name </th>
@@ -129,11 +129,11 @@ public class PropTest extends PropertySet implements
XServiceInfo
public Object[] arObjectA; // MAYBEVOID
public Any[] arAnyA; // MAYBEVOID
public XInterface[] arXinterfaceA; // MAYBEVOID
- public boolean[][] ar2BoolA; // MAYBEVOID
+ public boolean[][] ar2BoolA; // MAYBEVOID
public Boolean boolClassA; // MAYBEVOID
public Character charClassA; // MAYBEVOID
- public Byte byteClassA; // MAYBEVOID
- public Short shortClassA; // MAYBEVOID
+ public Byte byteClassA; // MAYBEVOID
+ public Short shortClassA; // MAYBEVOID
public Integer intClassA; // MAYBEVOID
public Long longClassA; // MAYBEVOID
public Float floatClassA; // MAYBEVOID
@@ -141,7 +141,7 @@ public class PropTest extends PropertySet implements
XServiceInfo
// readonly
public int roIntA= 100;
- public Integer roIntClassA= new Integer(100);
+ public Integer roIntClassA= new Integer(100);
public Object roObjectA= new Integer(101);
public Any roAnyA= new Any( new Type(int.class), new Integer(102));
@@ -149,14 +149,14 @@ public class PropTest extends PropertySet implements
XServiceInfo
public boolean bcBoolA;
public Boolean bcBoolClassA; // MAYBEVOID
public Object bcObjectA; // MAYBEVOID
- public Any bcAnyA; // MAYBEVOID
+ public Any bcAnyA; // MAYBEVOID
// MAYBEVOID
public Integer mvIntA;
public Object mvObjectA;
public Any mvAnyA;
public XInterface mvXinterfaceA;
-
+
public static final String __serviceName="PropTest";
public PropTest() {
@@ -208,7 +208,7 @@ public class PropTest extends PropertySet implements
XServiceInfo
registerProperty("mvAnyA", PropertyAttribute.MAYBEVOID);
registerProperty("mvXinterfaceA", PropertyAttribute.MAYBEVOID);
}
-
+
// XServiceName
public String getImplementationName( )
@@ -223,7 +223,7 @@ public class PropTest extends PropertySet implements
XServiceInfo
return true;
return false;
}
-
+
//XServiceName
public String[] getSupportedServiceNames( )
{
@@ -248,11 +248,12 @@ public class PropTest extends PropertySet implements
XServiceInfo
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
+// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
// {
// return FactoryHelper.writeRegistryServiceInfo(
PropTest.class.getName(),
// PropTest.__serviceName, regKey);
// }
}
+
diff --git a/main/odk/examples/java/Spreadsheet/CalcAddins.java
b/main/odk/examples/java/Spreadsheet/CalcAddins.java
index c4952c3..477b865 100644
--- a/main/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/main/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -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.
- *
+ *
*************************************************************/
@@ -50,7 +50,7 @@ import org.openoffice.sheet.addin.XCalcAddins;
* information about the component (__writeRegistryServiceInfo()).
*/
public class CalcAddins {
-
+
/** This inner class provides the component as a concrete implementation
* of the service description. It implements the needed interfaces.
* @implements XCalcAddins, XAddIn, XServiceName, XServiceInfo, XTypeProvider
@@ -61,15 +61,15 @@ public class CalcAddins {
XServiceName,
XServiceInfo
{
-
+
/** The component will be registered under this name.
*/
static private final String __serviceName =
"org.openoffice.sheet.addin.CalcAddins";
-
+
static private final String ADDIN_SERVICE = "com.sun.star.sheet.AddIn";
-
+
private Locale aFuncLoc;
-
+
private static final String[] stringFunctionName = {
/** TO DO:
* You should replace these method names by the method names of your interface.
@@ -77,19 +77,19 @@ public class CalcAddins {
"getMyFirstValue",
"getMySecondValue"
};
-
+
private static final short shortINVALID = -1;
-
+
/** TO DO:
* For each of your methods you should make up a new constant with a different
value.
*/
private static final short shortGETMYFIRSTVALUE = 0;
private static final short shortGETMYSECONDVALUE = 1;
-
-
+
+
/** TO DO:
* This is where you implement all methods of your interface. The parameters
have to
- * be the same as in your IDL file and their types have to be the correct
+ * be the same as in your IDL file and their types have to be the correct
* IDL-to-Java mappings of their types in the IDL file.
*/
public int getMyFirstValue(
@@ -97,39 +97,39 @@ public class CalcAddins {
) {
return (int) 1;
}
-
+
public int getMySecondValue(
com.sun.star.beans.XPropertySet xOptions,
int intDummy
) {
return( (int) ( 2 + intDummy ) );
}
-
-
+
+
// Implement method from interface XServiceName
public String getServiceName() {
return( __serviceName );
}
-
+
// Implement methods from interface XServiceInfo
public boolean supportsService(String stringServiceName) {
return( stringServiceName.equals( ADDIN_SERVICE ) ||
stringServiceName.equals( __serviceName ) );
}
-
+
public String getImplementationName() {
return( _CalcAddins.class.getName() );
}
-
+
public String[] getSupportedServiceNames() {
String[] stringSupportedServiceNames = { ADDIN_SERVICE,
__serviceName };
return( stringSupportedServiceNames );
}
-
+
// Implement methods from interface XAddIn
public String getDisplayArgumentName(String
stringProgrammaticFunctionName,int intArgument) {
String stringReturn = "";
-
+
switch( this.getFunctionID( stringProgrammaticFunctionName ) ) {
/** TO DO:
* You should list all argument names for each of your methods, here.
@@ -154,10 +154,10 @@ public class CalcAddins {
}
return( stringReturn );
}
-
+
public String getDisplayFunctionName(String stringProgrammaticName) {
String stringReturn = "";
-
+
switch( this.getFunctionID( stringProgrammaticName ) ) {
/** TO DO:
* Assign the name of each of your methods.
@@ -169,21 +169,21 @@ public class CalcAddins {
stringReturn = "getMySecondValue";
break;
}
-
+
return( stringReturn );
}
-
+
public String getProgrammaticCategoryName(String p1) {
return( "Add-In" );
}
-
+
public String getDisplayCategoryName(String p1) {
return( "Add-In" );
}
-
+
public String getFunctionDescription(String stringProgrammaticName) {
String stringReturn = "";
-
+
switch( this.getFunctionID( stringProgrammaticName ) ) {
/** TO DO:
* Enter a description for each of your methods that office users will
understand.
@@ -195,13 +195,13 @@ public class CalcAddins {
stringReturn = "This is your second method.";
break;
}
-
+
return( stringReturn );
}
-
+
public String getArgumentDescription(String
stringProgrammaticFunctionName,int intArgument) {
String stringReturn = "";
-
+
switch( this.getFunctionID( stringProgrammaticFunctionName ) ) {
/** TO DO:
* Enter a description for every argument of every method. Make them so that
office users will understand.
@@ -226,20 +226,20 @@ public class CalcAddins {
}
return( stringReturn );
}
-
+
public String getProgrammaticFuntionName(String p1) {
return( "" );
}
-
+
// Implement methods from interface XLocalizable
public Locale getLocale() {
return( aFuncLoc );
}
-
+
public void setLocale(Locale p1) {
aFuncLoc = p1;
}
-
+
// Auxiliary functions
private short getFunctionID( String stringProgrammaticName ) {
for ( int i = 0; i < stringFunctionName.length; i++ ) {
@@ -247,11 +247,11 @@ public class CalcAddins {
return( ( short ) i );
}
}
-
+
return( -1 );
}
}
-
+
/**
* Returns a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
@@ -266,16 +266,16 @@ public class CalcAddins {
XMultiServiceFactory multiFactory,
XRegistryKey regKey) {
XSingleServiceFactory xSingleServiceFactory = null;
-
+
if (implName.equals(_CalcAddins.class.getName()) )
xSingleServiceFactory =
FactoryHelper.getServiceFactory(_CalcAddins.class,
_CalcAddins.__serviceName,
multiFactory,
regKey);
-
+
return xSingleServiceFactory;
}
-
+
/**
* Writes the service information into the given registry key.
* This method is called by the <code>JavaLoader</code>
@@ -286,7 +286,7 @@ public class CalcAddins {
*/
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
// return
FactoryHelper.writeRegistryServiceInfo(_CalcAddins.class.getName(),
@@ -295,3 +295,4 @@ public class CalcAddins {
// _CalcAddins.ADDIN_SERVICE, regKey);
// }
}
+
diff --git a/main/odk/pack/copying/makefile.mk
b/main/odk/pack/copying/makefile.mk
index 7977fd9..c18bd2f 100644
--- a/main/odk/pack/copying/makefile.mk
+++ b/main/odk/pack/copying/makefile.mk
@@ -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.
-#
+#
#**************************************************************
@@ -167,16 +167,16 @@ DIR_FILE_LIST=\
$(SETTINGSLIST) \
$(DOCUFILES) \
$(INSTALLSCRIPT) \
- $(DESTIDLLIST) \
+ $(DESTIDLLIST) \
$(DESTINCLUDELIST) \
$(DESTCLASSESLIST) \
- $(IDL_DOCU_INDEX_FILE) \
- $(CONVERTTAGFLAG)
+ $(IDL_DOCU_INDEX_FILE) \
+ $(CONVERTTAGFLAG)
.IF "$(OS)"=="MACOSX"
DIR_FILE_LIST += $(DESTDIRBIN)/addsym-macosx.sh
.ENDIF
-
+
.IF "$(SOLAR_JAVA)" != ""
DIR_FILE_LIST += $(DESTDIRJAR)/win/unowinreg.dll
.ENDIF
@@ -216,7 +216,7 @@ all : CLEAN_DKVERSION_CHECK \
CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)/dk.mk
-
+
CLEAN_DKVERSION_CHECK:
@@-rm -f $(CLEANUP_DKVERSION_FILE)
@@ -231,22 +231,24 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk
tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e
's/@@BUILDID@@/$(RSCREVISION)/' -e 's/@@SCMREVISION@@/$(SCMREVISION)/'> $@
$(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
-# $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)"
$(DOCUHTMLFILES)
- @echo "tags converted" > $@
+# $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)"
$(DOCUHTMLFILES)
+ @echo "tags converted" > $@
$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css
$(DESTIDLLIST)
@@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF)
$(TOUCH) $@
-$(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
- -$(MKDIRHIER) $(@:d)
- $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot
"http://wiki.services.openoffice.org/wiki"; \
+$(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
+ -$(MKDIRHIER) $(@:d)
+ $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot
"https://wiki.openoffice.org/wiki"; \
-name $(IDLDOCREFNAME) -lg idl -dvgfile $(IDL_CHAPTER_REFS) -t
$(DESTDIRIDL)
-rm $(@:d)/idl.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)/docs/common/ref/idl.css
$(MY_TEXTCOPY_TARGETPRE) $(@:d:d)/idl.css
-
+
.IF "$(SOLAR_JAVA)" != ""
$(MYZIPTARGET) : $(BIN)/unowinreg.dll $(DESTCLASSESLIST)
- cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b)
$(MYZIPLIST)
+ cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b)
$(MYZIPLIST)
.ENDIF
+
+# vim: set noet ts=4 sw=4:
