[Libreoffice-commits] core.git: android/abs-lib desktop/test framework/source include/sfx2 jurt/com sw/source udkapi/com unotools/source
Julien Nabet
serval2412 at yahoo.fr
Wed Jul 23 13:25:12 PDT 2014
android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java | 2 +-
desktop/test/deployment/options/readme.txt | 4 ++--
framework/source/dispatch/mailtodispatcher.cxx | 2 +-
framework/source/dispatch/servicehandler.cxx | 4 ++--
include/sfx2/bindings.hxx | 6 +++---
jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 2 +-
sw/source/filter/ww8/writerhelper.hxx | 2 +-
udkapi/com/sun/star/java/XJavaThreadRegister_11.idl | 2 +-
unotools/source/config/moduleoptions.cxx | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d5fb4b731938c22fcf9c5e3280da8f722b5492e4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Jul 23 22:23:52 2014 +0200
Typos
Change-Id: I0c17f40b3e593ae3771fa751a817f84bf2f2323d
diff --git a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
index cc4767a..72a75be 100644
--- a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
+++ b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
@@ -299,7 +299,7 @@ class ActivityChooserModel extends DataSetObservable {
private boolean mHistoricalRecordsChanged = true;
/**
- * Hander for scheduling work on client tread.
+ * Handler for scheduling work on client thread.
*/
private final Handler mHandler = new Handler();
diff --git a/desktop/test/deployment/options/readme.txt b/desktop/test/deployment/options/readme.txt
index 9879a72..bba7844 100644
--- a/desktop/test/deployment/options/readme.txt
+++ b/desktop/test/deployment/options/readme.txt
@@ -1,4 +1,4 @@
-Important: The hander component extensionoptions.jar in the extensions may not
+Important: The handler component extensionoptions.jar in the extensions may not
contain exactly the same sources as the one build in the handler directory. To
make sure that debugging works build the handler directory and put the
extensionoptions.jar into the extension.
@@ -10,7 +10,7 @@ leaf1.oxt: Defines a leaf under the node WriterNode
leaf1mod.oxt: Defines a leaf under the node WriterNode
-It has a douplicate entry in the manifest.xml (OptionsDialog.xcu). This would cause a DisposedException when uninstalling on OOo 3.0 and prevent the extension from being uninstalled. This is actually a bug of the extensions. However, the error is difficult to investigate. Therefore this was fixed to make OOo more robust (i96690).
+It has a duplicate entry in the manifest.xml (OptionsDialog.xcu). This would cause a DisposedException when uninstalling on OOo 3.0 and prevent the extension from being uninstalled. This is actually a bug of the extensions. However, the error is difficult to investigate. Therefore this was fixed to make OOo more robust (i96690).
================================================================================
leaf2.oxt: Defines a leaf under a node that has a name which requires special
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 44946c5..a164fc4 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -67,7 +67,7 @@ MailToDispatcher::~MailToDispatcher()
/**
@short decide if this dispatch implementation can be used for requested URL or not
- @descr A protocol handler is registerd for an URL pattern inside configuration and will
+ @descr A protocol handler is registered for an URL pattern inside configuration and will
be asked by the generic dispatch mechanism inside framework, if he can handle this
special URL which match his registration. He can agree by returning of a valid dispatch
instance or disagree by returning <NULL/>.
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 46d8ecd..f7e5f0f 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -69,7 +69,7 @@ ServiceHandler::~ServiceHandler()
/**
@short decide if this dispatch implementation can be used for requested URL or not
- @descr A protocol handler is registerd for an URL pattern inside configuration and will
+ @descr A protocol handler is registered for an URL pattern inside configuration and will
be asked by the generic dispatch mechanism inside framework, if he can handle this
special URL which match his registration. He can agree by returning of a valid dispatch
instance or disagree by returning <NULL/>.
@@ -231,7 +231,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
/**
@short add/remove listener for state events
@descr We use an internal container to hold such registered listener. This container lives if we live.
- And if call pas registration as non breakable transaction - we can accept the request without
+ And if call pass registration as non breakable transaction - we can accept the request without
any explicit lock. Because we share our mutex with this container.
@param xListener
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 9f03537..b1f1f0a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -60,7 +60,7 @@ typedef std::vector<SfxUnoControllerItem*> SfxUnoControllerArr_Impl;
#define SFX_CALLMODE_SLOT 0x00 // sync/async from Slot
#define SFX_CALLMODE_SYNCHRON 0x01 // synchronously in the same Stackframe
#define SFX_CALLMODE_ASYNCHRON 0x02 // asynchronously via AppEvent
-#define SFX_CALLMODE_RECORD 0x04 // take into accont while recording
+#define SFX_CALLMODE_RECORD 0x04 // take into account while recording
#define SFX_CALLMODE_API 0x08 // API call (silent)
#define SFX_CALLMODE_MODAL 0x10 // despite ModalMode
@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster
However these instances will be handled by the Macro <SFX_BINDINGS>
or the associated <SfxViewFrame>.
- The SfxBindings manages all of its Slot-Ids bound by the registerd
+ The SfxBindings manages all of its Slot-Ids bound by the registered
controllers and keeps a cache of the <Slot-Server> respectively.
(it is what we call the combination of SfxShell instance and SfxSlot).
In the SfxBindings it is stored, if and in this case which controllers
@@ -220,7 +220,7 @@ inline bool SfxBindings::IsInRegistrations() const
/* [Description]
Determines whether the <SfxContollerItems> SfxBindings instance is
- registerd or unregisted, i.e. <SfxBindings::EnterRegistrations()>
+ registered or unregistered, i.e. <SfxBindings::EnterRegistrations()>
calls that have not been closed by <SfxBindings::LeaveRegistrations()>.
[Return value]
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 7aebdfc..c8e246f 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -25,7 +25,7 @@ import com.sun.star.lang.DisposedException;
* For every jobs thread id exists a job queue which is registered
* at the <code>ThreadPool</code>.
* A JobQueue is splitted in a sync job queue and an async job queue.
- * The sync job queue is the registerd queue, it delegates async jobs
+ * The sync job queue is the registered queue, it delegates async jobs
* (put by <code>putjob</code>) into the async queue, which is only
* known by the sync queue.
* <p>
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 72d5794..8a99413 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -79,7 +79,7 @@ namespace sw
area, so this sw::Frame simplies matters by providing a single unified
view of the multitute of elements in writer and their differing quirks.
- A sw::Frame wraps a writer frame and is guaranted to have a suitable
+ A sw::Frame wraps a writer frame and is guaranteed to have a suitable
anchor position available from it. It hides much of the needless
complexity of the multitude of floating/inline elements in writer, it...
diff --git a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
index 9aa60e4..a8ce9fa 100644
--- a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
+++ b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
@@ -43,7 +43,7 @@ published interface XJavaThreadRegister_11: com::sun::star::uno::XInterface
void registerThread();
- /** revokes the current thread from the list of registerd threads.
+ /** revokes the current thread from the list of registered threads.
<p>This method should be called at the end of every JNI call from Java. </p>
*/
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index de435e4..705f684 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1110,9 +1110,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const OU
{
if ( sName == "swriter" )
return E_WRITER;
- if (sName.equalsIgnoreAsciiCase("swriter/Web")) // sometimes they are registerd for swriter/web :-(
+ if (sName.equalsIgnoreAsciiCase("swriter/Web")) // sometimes they are registered for swriter/web :-(
return E_WRITERWEB;
- if (sName.equalsIgnoreAsciiCase("swriter/GlobalDocument")) // sometimes they are registerd for swriter/globaldocument :-(
+ if (sName.equalsIgnoreAsciiCase("swriter/GlobalDocument")) // sometimes they are registered for swriter/globaldocument :-(
return E_WRITERGLOBAL;
if ( sName == "scalc" )
return E_CALC;
More information about the Libreoffice-commits
mailing list