summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2010-12-04 13:16:21 +0900
committerCaolán McNamara <caolanm@redhat.com>2010-12-06 09:13:26 +0000
commit50a0d1170ac8cd85373687f00d3b03a9aadefe40 (patch)
treeaef5cba1522c1d9a2f95c9217e709f884618782e /framework
parentebe931d8572c6698e97907cf042ccd471a15e2b7 (diff)
Replace all occured, occurance etc.
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/servicemanager.hxx2
-rw-r--r--framework/inc/dispatch/mailtodispatcher.hxx2
-rw-r--r--framework/inc/dispatch/menudispatcher.hxx2
-rw-r--r--framework/inc/dispatch/servicehandler.hxx2
-rw-r--r--framework/inc/dispatch/systemexec.hxx2
-rw-r--r--framework/inc/services/logindialog.hxx2
-rw-r--r--framework/qa/complex/framework/recovery/RecoveryTest.java40
-rw-r--r--[-rwxr-xr-x]framework/qa/complex/imageManager/interfaces/_XInitialization.java2
-rw-r--r--[-rwxr-xr-x]framework/qa/complex/imageManager/interfaces/_XTypeProvider.java2
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/storageholder.cxx2
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx2
-rw-r--r--framework/source/dispatch/servicehandler.cxx2
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/istoragelistener.hxx2
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx4
-rw-r--r--framework/source/jobs/joburl.cxx2
-rw-r--r--framework/source/services/modulemanager.cxx2
-rw-r--r--framework/source/unotypes/fwk.xml4
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx2
21 files changed, 42 insertions, 42 deletions
diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx
index dbb48a8807..b0ce5ee325 100644
--- a/framework/inc/classes/servicemanager.hxx
+++ b/framework/inc/classes/servicemanager.hxx
@@ -229,7 +229,7 @@ class ServiceManager
@param "sRegistryFile", file name of user registry.
@return A reference to a new initialized servicemanager with a valid registry.
- It can be NULL, if an error occured.
+ It can be NULL, if an error occurred.
@onerror Return a NULL-reference.
*//*-*****************************************************************************************************/
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index d26247a7d9..26faece82c 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -75,7 +75,7 @@ namespace framework{
/**
@short protocol handler for "mailto:" URLs
@descr It's a special dispatch object which is used registered for "mailto:*" URLs and
- will be automaticly used from the framework dispatch mechanism if such URL occured.
+ will be automaticly used from the framework dispatch mechanism if such URL occurred.
@base ThreadHelpBase
exports a lock member to guarantee right initialize value of it
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 2f8970b40c..85197c3245 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -176,7 +176,7 @@ class MenuDispatcher : // interfaces
@seealso method loadCancelled()
@param "xControl" , css::uno::Reference to a valid listener for state events.
- @param "aURL" , URL about listener will be informed, if something occured.
+ @param "aURL" , URL about listener will be informed, if something occurred.
@return -
@onerror -
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 33b572d0ca..54bbefab4c 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -75,7 +75,7 @@ namespace framework{
/**
@short protocol handler for "service:*" URLs
@descr It's a special dispatch/provider object which is registered for such URL pattern and will
- be automaticly used by the framework dispatch mechanism if such URL occured.
+ be automaticly used by the framework dispatch mechanism if such URL occurred.
His job is to create any registered uno components which must be coded inside
dispatched URL (may with some optional given parameters). After that such created
service must be hold his self alive. Such mechanism can be usefull for UI components
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index e93d54a62d..2a6755d6bd 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -75,7 +75,7 @@ namespace framework{
/**
@short protocol handler for "systemexec:*" URLs
@descr It's a special dispatch/provider object which is registered for such URL pattern and will
- be automaticly used by the framework dispatch mechanism if such URL occured.
+ be automaticly used by the framework dispatch mechanism if such URL occurred.
It forwards all URL's to the underlying operating system.
So it would e.g. be possible to open HTML files outside the office within a web browser.
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index d003baed32..ea13c21d7a 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -804,7 +804,7 @@ class LoginDialog : public XTYPEPROVIDER ,
@short helper methods to read/write properties from/to ini file
@descr Using of Config-Class isn't easy everytime :-(
Thats the reason for these helper. State of operation isn't realy important ..
- but we assert impossible cases or occured errors!
+ but we assert impossible cases or occurred errors!
@seealso -
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 0afd03b525..fb3cd6ee3f 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -719,7 +719,7 @@ public class RecoveryTest extends ComplexTestCase {
try{
xMathDoc = SOF.createMathDoc(frameName);
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while creating math document '"+frameName+"':");
+ log.println("Exception occurred while creating math document '"+frameName+"':");
failed("Couldn't create test environment");
}
return xMathDoc;
@@ -733,16 +733,16 @@ public class RecoveryTest extends ComplexTestCase {
try {
xPS.setPropertyValue("Formula", expFormula);
} catch(com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occured while filling math document with content.");
+ log.println("Exception occurred while filling math document with content.");
failed("Couldn't create test environment");
} catch(com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occured while filling math document with content.");
+ log.println("Exception occurred while filling math document with content.");
failed("Couldn't create test environment");
} catch(com.sun.star.beans.PropertyVetoException e) {
- log.println("Exception occured while filling math document with content.");
+ log.println("Exception occurred while filling math document with content.");
failed("Couldn't create test environment");
} catch(com.sun.star.beans.UnknownPropertyException e) {
- log.println("Exception occured while filling math document with content.");
+ log.println("Exception occurred while filling math document with content.");
failed("Couldn't create test environment");
}
}
@@ -752,7 +752,7 @@ public class RecoveryTest extends ComplexTestCase {
try{
xImpressDoc = SOF.createImpressDoc(frameName);
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while creating impress document '"+frameName+"':");
+ log.println("Exception occurred while creating impress document '"+frameName+"':");
failed("Couldn't create test environment");
}
return xImpressDoc;
@@ -803,7 +803,7 @@ public class RecoveryTest extends ComplexTestCase {
try{
xDrawDoc = SOF.createDrawDoc(frameName);
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while creating draw document '"+frameName+"':");
+ log.println("Exception occurred while creating draw document '"+frameName+"':");
failed("Couldn't create test environment");
}
return xDrawDoc;
@@ -855,16 +855,16 @@ public class RecoveryTest extends ComplexTestCase {
new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
oShapeProps.setPropertyValue("ZOrder", new Integer(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occured while setting or getting property value while filling draw document with content.");
+ log.println("Exception occurred while setting or getting property value while filling draw document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.beans.UnknownPropertyException e) {
- log.println("Exception occured while setting or getting property value while filling draw document with content.");
+ log.println("Exception occurred while setting or getting property value while filling draw document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occured while setting or getting property value while filling draw document with content.");
+ log.println("Exception occurred while setting or getting property value while filling draw document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.beans.PropertyVetoException e) {
- log.println("Exception occured while setting or getting property value while filling draw document with content.");
+ log.println("Exception occurred while setting or getting property value while filling draw document with content.");
failed("Couldn't create test environment");
}
}
@@ -882,7 +882,7 @@ public class RecoveryTest extends ComplexTestCase {
try {
xTextDoc = SOF.createTextDoc(frameName);
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while creating text document '"+frameName+"':");
+ log.println("Exception occurred while creating text document '"+frameName+"':");
failed("Couldn't create test environment");
}
return xTextDoc;
@@ -909,10 +909,10 @@ public class RecoveryTest extends ComplexTestCase {
oCursor, ControlCharacter.LINE_BREAK, false );
}
} catch ( com.sun.star.lang.IllegalArgumentException e ){
- log.println("Exception occured while filling text document with content.");
+ log.println("Exception occurred while filling text document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while filling text document with content.");
+ log.println("Exception occurred while filling text document with content.");
failed("Couldn't create test environment");
}
}
@@ -924,7 +924,7 @@ public class RecoveryTest extends ComplexTestCase {
try {
xSheetDoc = SOF.createCalcDoc(frameName);
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while creating calc document '"+frameName+"':");
+ log.println("Exception occurred while creating calc document '"+frameName+"':");
failed("Couldn't create test environment");
}
return xSheetDoc;
@@ -950,19 +950,19 @@ public class RecoveryTest extends ComplexTestCase {
oSheet.getCellByPosition(3, 2).setFormula("xTextDoc");
oSheet.getCellByPosition(3, 3).setFormula("xTextDoc");
} catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occured while filling calc document with content.");
+ log.println("Exception occurred while filling calc document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.container.NoSuchElementException e) {
- log.println("Exception occured while filling calc document with content.");
+ log.println("Exception occurred while filling calc document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Exception occured while filling calc document with content.");
+ log.println("Exception occurred while filling calc document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occured while filling calc document with content.");
+ log.println("Exception occurred while filling calc document with content.");
failed("Couldn't create test environment");
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while filling calc document with content.");
+ log.println("Exception occurred while filling calc document with content.");
failed("Couldn't create test environment");
}
}
diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java
index 115f581f7e..d9ca13d917 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java
+++ b/framework/qa/complex/imageManager/interfaces/_XInitialization.java
@@ -75,7 +75,7 @@ public class _XInitialization {
}
} catch (com.sun.star.uno.Exception e) {
- log.println("Exception occured while method calling.") ;
+ log.println("Exception occurred while method calling.") ;
e.printStackTrace((java.io.PrintWriter)log) ;
result = false ;
}
diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
index 7af00b163e..1b0f5fe2dc 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
@@ -59,7 +59,7 @@ public class _XTypeProvider {
/**
* Just calls the method.<p>
- * Has <b>OK</b> status if no runtime exceptions occured.
+ * Has <b>OK</b> status if no runtime exceptions occurred.
*/
public boolean _getImplementationId() {
boolean result = true;
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 45835eecb9..8eee860a45 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -500,7 +500,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u
//-----------------------------------------------
// IStorageListener
-void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*sPath*/)
+void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/)
{
reload();
}
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index a66d953d25..43051b58ba 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -361,7 +361,7 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
{
IStorageListener* pListener = *pIt2;
if (pListener)
- pListener->changesOccured(sNormedPath);
+ pListener->changesOccurred(sNormedPath);
}
aReadLock.unlock();
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index b2b9f61a4a..023b9c02dd 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -310,7 +310,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
@param xListener
reference to a valid listener for state events
@param aURL
- URL about listener will be informed, if something occured
+ URL about listener will be informed, if something occurred
@modified 30.04.2002 14:49, as96863
*/
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 928f350661..60f796e54d 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -331,7 +331,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
@param xListener
reference to a valid listener for state events
@param aURL
- URL about listener will be informed, if something occured
+ URL about listener will be informed, if something occurred
@modified 30.04.2002 14:49, as96863
*/
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index fdd086ead7..d4d2112885 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -220,7 +220,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
throw(css::uno::RuntimeException);
// IStorageListener
- virtual void changesOccured(const ::rtl::OUString& sPath);
+ virtual void changesOccurred(const ::rtl::OUString& sPath);
//______________________________________
// helper for derived classes
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 01464a0ea6..5b86638cd3 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -57,7 +57,7 @@ class IStorageListener
//--------------------------------------
/** @short TODO */
- virtual void changesOccured(const ::rtl::OUString& sPath) = 0;
+ virtual void changesOccurred(const ::rtl::OUString& sPath) = 0;
};
} // namespace framework
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 62db6a49a4..bd308fb618 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -97,7 +97,7 @@ class WindowCommandDispatch : private ThreadHelpBase
/// knows the frame, where we dispatch our commands as weak reference
css::uno::WeakReference< css::frame::XFrame > m_xFrame;
- /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference
+ /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference
css::uno::WeakReference< css::awt::XWindow > m_xWindow;
//___________________________________________
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index b3ea775857..ee666d0d02 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -58,7 +58,7 @@ namespace css = ::com::sun::star;
load environment only.
@descr Of course outside code must wrapp it, to transport
- the occured information to its caller.
+ the occurred information to its caller.
@author as96863
*/
@@ -133,7 +133,7 @@ class LoadEnvException
/** @short An ID, which make this exception unique among others. */
sal_Int32 m_nID;
- /** @short Contains the original exception, if any occured. */
+ /** @short Contains the original exception, if any occurred. */
css::uno::Any m_exOriginal;
/** TODO
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index a10c90bafa..2c5bbe864c 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -326,7 +326,7 @@ void JobURL::impldbg_checkIt()
JobURL::impldbg_checkURL("vnd.sun.star.job:service=;" , E_UNKNOWN, "" , "" , "" , NULL, NULL, NULL);
// check combinations
- // Note: No additional spaces or tabs are allowed after a seperator occured.
+ // Note: No additional spaces or tabs are allowed after a seperator occurred.
// Tab and spaces before a seperator will be used as value!
JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service" , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL);
JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service" , NULL, NULL, NULL);
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 1f23db3fa6..f3d1c23753 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -210,7 +210,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
// get access to the element
// Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further
// it cache it as a member of this module manager instance. If we change some props there ... but dont
- // flush changes (because an error occured) we will read them later. If we use a different config access
+ // flush changes (because an error occurred) we will read them later. If we use a different config access
// we can close it without a flush ... and our read data wont be affected .-)
css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig(
xSMGR,
diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml
index 513c759e38..081c7cb05f 100644
--- a/framework/source/unotypes/fwk.xml
+++ b/framework/source/unotypes/fwk.xml
@@ -106,7 +106,7 @@
<name> com.sun.star.comp.framework.ServiceHandler </name>
<description>
It's a special dispatch object which is registered for "service:*" URL pattern
- and will be automaticly used by the framework dispatch mechanism if such URL occured.
+ and will be automaticly used by the framework dispatch mechanism if such URL occurred.
His job is to create any registered uno components which must be coded inside
dispatched URL (may with some optional given parameters). After that such created
service must be hold his self alive. Such mechanism can be usefull for UI components
@@ -123,7 +123,7 @@
<name> com.sun.star.comp.framework.JobHandler </name>
<description>
It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern
- and will be automaticly used by the framework dispatch mechanism if such URL occured.
+ and will be automaticly used by the framework dispatch mechanism if such URL occurred.
It binds the dispatch mechanism to the generic job execution of this framework module.
That can be used for e.g. addon purposes.
</description>
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index bd748b2ce8..5ddfa4d6b4 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -58,7 +58,7 @@ namespace framework{
structure was detected.
This macro combined the given comment with a generic
- way to find out the XML line (where the error occured)
+ way to find out the XML line (where the error occurred)
to format a suitable message.
@param COMMENT