framework/source/classes/framecontainer.cxx | 6 +++---
framework/source/dispatch/closedispatcher.cxx | 4 ++--
framework/source/dispatch/mailtodispatcher.cxx | 2 +-
framework/source/dispatch/servicehandler.cxx | 2 +-
framework/source/helper/oframes.cxx | 2 +-
framework/source/helper/persistentwindowstate.cxx | 2 +-
framework/source/inc/accelerators/presethandler.hxx | 2 +-
framework/source/inc/loadenv/actionlockguard.hxx | 2 +-
framework/source/inc/loadenv/loadenv.hxx | 6 +++---
framework/source/inc/loadenv/targethelper.hxx | 2 +-
framework/source/jobs/helponstartup.cxx | 2 +-
framework/source/jobs/job.cxx | 2 +-
framework/source/loadenv/loadenv.cxx | 14 +++++++-------
framework/source/services/autorecovery.cxx | 16 ++++++++--------
framework/source/services/desktop.cxx | 2 +-
framework/source/xml/acceleratorconfigurationreader.cxx | 2 +-
include/comphelper/configurationhelper.hxx | 4 ++--
include/comphelper/namedvaluecollection.hxx | 2 +-
include/framework/dispatchhelper.hxx | 2 +-
include/salhelper/singletonref.hxx | 2 +-
20 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit c7114b66bd615670950ef6f7c2d80adab3fb4c33
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
Date: Sun Oct 2 00:28:47 2016 +0200
Fix typos
Change-Id: I7000efdb7276053c16de992fa8f9a4e614ecb3e2
Reviewed-on: https://gerrit.libreoffice.org/29434
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/source/classes/framecontainer.cxx
b/framework/source/classes/framecontainer.cxx
index 7ab6489..b8a16dc 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -30,7 +30,7 @@ namespace framework{
@short initialize an empty container
@descr The container will be empty then - special features (e.g. the
async quit mechanism) are disabled.
- @threadsafe not necessary - its not a singleton
+ @threadsafe not necessary - it's not a singleton
*****************************************************************************************************************/
FrameContainer::FrameContainer()
/*DEPRECATEME
@@ -44,7 +44,7 @@ FrameContainer::FrameContainer()
@short deinitialize may a filled container
@descr Special features (if the currently are running) will be
disabled and we free all used other resources.
- @threadsafe not necessary - its not a singleton
+ @threadsafe not necessary - it's not a singleton
*****************************************************************************************************************/
FrameContainer::~FrameContainer()
{
@@ -124,7 +124,7 @@ void FrameContainer::clear()
// Clear the container ...
m_aContainer.clear();
// ... and don't forget to reset the active frame.
- // Its an reference to a valid container-item.
+ // It's a reference to a valid container-item.
// But no container item => no active frame!
m_xActiveFrame.clear();
}
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index aa15c28..b7cc208 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -103,7 +103,7 @@ css::uno::Sequence< css::frame::DispatchInformation >
SAL_CALL CloseDispatcher::
{
if (nCommandGroup == css::frame::CommandGroup::VIEW)
{
- /* Attention: Don't add .uno:CloseFrame here. Because its not really
+ /* Attention: Don't add .uno:CloseFrame here. Because it's not really
a configurable feature ... and further it does not have
a valid UIName entry inside the GenericCommands.xcu ...
*/
css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1);
@@ -329,7 +329,7 @@ IMPL_LINK_NOARG_TYPED(CloseDispatcher, impl_asyncCallback,
LinkParamNone*, void)
FrameListAnalyzer aCheck2(xDesktop, xCloseFrame,
FrameListAnalyzer::E_ALL);
// c1) there is as minimum 1 frame open, which is visible and
contains a document
- // different from our one. And its not the help!
+ // different from our one. And it's not the help!
// => close our frame only - nothing else.
if (!aCheck2.m_lOtherVisibleFrames.empty())
bCloseFrame = true;
diff --git a/framework/source/dispatch/mailtodispatcher.cxx
b/framework/source/dispatch/mailtodispatcher.cxx
index be08ac2..48d498e 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -48,7 +48,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
/**
@short standard ctor
- @descr This initializes a new instance of ths class with needed
information for work.
+ @descr This initializes a new instance of this class with needed
information for work.
@param rxContext
reference to uno servicemanager for creation of new
services
diff --git a/framework/source/dispatch/servicehandler.cxx
b/framework/source/dispatch/servicehandler.cxx
index 3f700bc..93acf4b 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -50,7 +50,7 @@ DEFINE_INIT_SERVICE(ServiceHandler,
/**
@short standard ctor
- @descr This initializes a new instance of ths class with needed
information for work.
+ @descr This initializes a new instance of this class with needed
information for work.
@param xFactory
reference to uno servicemanager for creation of new services
diff --git a/framework/source/helper/oframes.cxx
b/framework/source/helper/oframes.cxx
index 7cf1e8a..3759a3a 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -319,7 +319,7 @@ void OFrames::impl_appendSequence( Sequence<
css::uno::Reference< XFram
}
// Don't manipulate nResultPosition between these two loops!
- // Its the current position in the result list.
+ // It's the current position in the result list.
// Copy all items from second sequence.
for ( sal_Int32 nDestinationPosition=0;
nDestinationPosition<nDestinationCount; ++nDestinationPosition )
diff --git a/framework/source/helper/persistentwindowstate.cxx
b/framework/source/helper/persistentwindowstate.cxx
index 6938cc2..9118335 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -122,7 +122,7 @@ void SAL_CALL PersistentWindowState::frameAction(const
css::frame::FrameActionEv
case css::frame::FrameAction_COMPONENT_REATTACHED :
{
- // nothing todo here, because its not allowed to change
position and size
+ // nothing todo here, because it's not allowed to change
position and size
// of an already existing frame!
}
break;
diff --git a/framework/source/inc/accelerators/presethandler.hxx
b/framework/source/inc/accelerators/presethandler.hxx
index be781c2..830b5dc 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -132,7 +132,7 @@ class PresetHandler
working storage of the user layer. */
std::vector<OUString> m_lTargets;
- /** @short its the current office locale and will be used
+ /** @short it's the current office locale and will be used
to handle localized presets.
@descr Default is "x-no-translate" which disable any
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx
b/framework/source/inc/loadenv/actionlockguard.hxx
index a660252..2448b33 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -123,7 +123,7 @@ class ActionLockGuard
xLock->removeActionLock();
}
- /** @short unlock the internal wrapped resource, if its not already
done. */
+ /** @short unlock the internal wrapped resource, if it's not already
done. */
void unlock()
{
osl::MutexGuard g(m_mutex);
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index b0e4ad8..24ca05f 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -120,7 +120,7 @@ private:
or a non visible content was loaded!
It can be the same frame as m_xBaseFrame it describe, in case
the target "_self", "" or the search flag "SELF" was used.
- Otherwise its the new created or recycled frame, which was
+ Otherwise it's the new created or recycled frame, which was
used for loading and contains further the new component.
Please use method getTarget() or getTargetComponent()
@@ -390,7 +390,7 @@ private:
@attention Not all types we know, are supported by filters. So it
does not
indicates an error, if no suitable filter(loader etcpp
will be found
for a type. But a type must be detected for the specified
content.
- Otherwise its an error and loading can't be finished
successfully.
+ Otherwise it's an error and loading can't be finished
successfully.
@throw A LoadEnvException if detection failed.
@@ -470,7 +470,7 @@ private:
for this load request.
@descr Because this special feature is bound to the target specifier
"_default"
- its checked inside first. If its not set => this method return
an empty
+ its checked inside first. If it's not set => this method
return an empty
reference. Otherwise any currently existing frame will be
analyzed, if
it can be used here. The following rules exists:
diff --git a/framework/source/inc/loadenv/targethelper.hxx
b/framework/source/inc/loadenv/targethelper.hxx
index 615084e..40c5de1 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -81,7 +81,7 @@ class TargetHelper
And in case such special names can exists one times only
by definition inside the same frame tree (e.g. _beamer and
- OFFICE_HELP_TASK) its not a good idea to allow anything
here :-)
+ OFFICE_HELP_TASK) it's not a good idea to allow anything
here :-)
Of course we can't check unknown names, which are not
special ones.
But we decide, that it's not allowed to use "_" as first
sign
diff --git a/framework/source/jobs/helponstartup.cxx
b/framework/source/jobs/helponstartup.cxx
index 2b8d2e1..8acf259 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -168,7 +168,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const
css::uno::Sequence< css::be
::comphelper::SequenceAsHashMap lJobConfig =
lArgs.getUnpackedValueOrDefault("JobConfig", css::uno::Sequence<
css::beans::NamedValue >());
// check for right environment.
- // If its not a DocumentEvent, which triggered this job,
+ // If it's not a DocumentEvent, which triggered this job,
// we can't work correctly! => return immediately and do nothing
OUString sEnvType = lEnvironment.getUnpackedValueOrDefault("EnvType",
OUString());
if (sEnvType != "DOCUMENTEVENT")
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index b2e3ab3..935c79c 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -687,7 +687,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const
css::lang::EventObject& ) thro
We have to accept it and cancel all current processes inside.
It can occur only, if job was not already started if
queryTermination() was called here ..
Then we had not throwed a veto exception. But now we must agree
with this situation and break
- all our internal processes. Its not a good idea to mark this
instance as non startable any longer
+ all our internal processes. It's not a good idea to mark this
instance as non startable any longer
inside queryTermination() if no job was running too. Because that
would disable this job and may
the office does not really shutdownm, because another listener has
thrown the suitable exception.
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index b6f6f4c..7610c5f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -392,7 +392,7 @@ void LoadEnv::startLoading()
-----------------------------------------------*/
bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
{
- // Because its not a good idea to block the main thread
+ // Because it's not a good idea to block the main thread
// (and we can't be sure that we are currently not used inside the
// main thread!), we can't use conditions here really. We must yield
// in an intelligent manner :-)
@@ -606,8 +606,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
OUString&
// Mos of our filters are handled by our global
// default loader. But there exist some specialized
// loader, which does not work on top of filters!
- // So its not enough to search on the filter configuration.
- // Further its not enough to search for types!
+ // So it's not enough to search on the filter configuration.
+ // Further it's not enough to search for types!
// Because there exist some types, which are referenced by
// other objects ... but not by filters nor frame loaders!
@@ -1073,7 +1073,7 @@ bool LoadEnv::impl_loadContent()
if (!bHidden && !bMinimized && !bPreview && !xProgress.is())
{
- // Note: its an optional interface!
+ // Note: it's an optional interface!
css::uno::Reference< css::task::XStatusIndicatorFactory >
xProgressFactory(xTargetFrame, css::uno::UNO_QUERY);
if (xProgressFactory.is())
{
@@ -1221,7 +1221,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
osl::MutexGuard g(m_mutex);
// such search is allowed for special requests only ...
- // or better its not allowed for some requests in general :-)
+ // or better it's not allowed for some requests in general :-)
if (
( ! TargetHelper::matchSpecialTarget(m_sTarget,
TargetHelper::E_DEFAULT) ) ||
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
, false) ||
@@ -1233,7 +1233,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
}
// check URL
- // May its not useful to start expensive document search, if it
+ // May it's not useful to start expensive document search, if it
// can fail only .. because we load from a stream or model directly!
if (
(ProtocolCheck::isProtocol(m_aURL.Complete,
ProtocolCheck::E_PRIVATE_STREAM )) ||
@@ -1361,7 +1361,7 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const
css::uno::Reference< css::
// ? no lock interface ?
// Might its an external written frame implementation :-(
- // Allowing using of it ... but it can fail if its not synchronized with
our processes !
+ // Allowing using of it ... but it can fail if it's not synchronized with
our processes !
if (!xLock.is())
return false;
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index a4687b3..1d5b6d1 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -723,7 +723,7 @@ private:
AutoSave => pParams == 0
SessionSave/CrashSave => pParams != 0
- @return A suggestion, how the timer (if its not already disabled!)
+ @return A suggestion, how the timer (if it's not already disabled!)
should be restarted to fulfill the requirements.
@threadsafe
@@ -980,7 +980,7 @@ private:
result at the end... a non existing file .-)
On the other side removing of files from disc is an optional
- feature. If we are not able doing so... its not a real problem.
+ feature. If we are not able doing so... it's not a real problem.
Ok - users disc place will be smaller then... but we should produce
a crash during crash save because we can't delete a temporary file
only!
@@ -2059,7 +2059,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo& rIn
if (bRemoveIt)
{
// Catch NoSuchElementException.
- // Its not a good idea inside multithreaded environments to call
hasElement - removeElement.
+ // It's not a good idea inside multithreaded environments to call
hasElement - removeElement.
// DO IT!
try
{
@@ -2309,7 +2309,7 @@ IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired,
Timer *, void)
return;
} /* SAFE */
- // check some "states", where its not allowed (better: not a good
idea) to
+ // check some "states", where it's not allowed (better: not a good
idea) to
// start an AutoSave. (e.g. if the user makes drag & drop ...)
// Then we poll till this "disallowed" state is gone.
bool bAutoSaveNotAllowed = Application::IsUICaptured();
@@ -2466,7 +2466,7 @@ void AutoRecovery::implts_registerDocument(const
css::uno::Reference< css::frame
implts_specifyAppModuleAndFactory(aNew);
// Hack! Check for "illegal office documents"... as e.g. the Basic IDE
- // Its not really a full featured office document. It doesn't provide an
URL, any filter, a factory URL etcpp.
+ // It's not really a full featured office document. It doesn't provide an
URL, any filter, a factory URL etcpp.
// TODO file bug to Basic IDE developers. They must remove the office
document API from its service.
if (
(aNew.OrgURL.isEmpty()) &&
@@ -2553,7 +2553,7 @@ void AutoRecovery::implts_deregisterDocument(const
css::uno::Reference< css::fra
pIt = AutoRecovery::impl_searchDocument(m_lDocCache, xDocument);
if (pIt != m_lDocCache.end())
m_lDocCache.erase(pIt);
- pIt = m_lDocCache.end(); // otherwise its not specified what pIt means!
+ pIt = m_lDocCache.end(); // otherwise it's not specified what pIt means!
aCacheLock2.unlock();
} /* SAFE */
@@ -2891,7 +2891,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(
bool bAllow
// We return a suggestion for an active timer only.
// It will be ignored if the timer was disabled by the user ...
// Further this state can be set to USER_IDLE only later in this method.
- // Its not allowed to reset such state then. Because we must know, if
+ // It's not allowed to reset such state then. Because we must know, if
// there exists POSTPONED documents. see below ...
AutoRecovery::ETimerType eTimer =
AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL;
@@ -3223,7 +3223,7 @@ AutoRecovery::ETimerType
AutoRecovery::implts_openDocs(const DispatchParams& aPa
utl::MediaDescriptor lDescriptor;
- // its an UI feature - so the "USER" itself must be set as referer
+ // it's an UI feature - so the "USER" itself must be set as referer
lDescriptor[utl::MediaDescriptor::PROP_REFERRER()] <<=
OUString(REFERRER_USER);
lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index d1f09fb..db0ffc2 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1519,7 +1519,7 @@ css::uno::Reference< css::beans::XPropertySetInfo >
SAL_CALL Desktop::getPropert
@seealso method getCurrentComponent();
@param "xFrame", reference to valid frame in hierarchy. Method is not
defined for invalid values.
- But we don't check these. Its an IMPL-method and caller must
use it right!
+ But we don't check these. It's an IMPL-method and caller must
use it right!
@return A reference to found component.
@onerror A null reference is returned.
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx
b/framework/source/xml/acceleratorconfigurationreader.cxx
index bb282d0..fe58cc7 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -159,7 +159,7 @@ void SAL_CALL
AcceleratorConfigurationReader::startElement(const OUString&
m_rContainer.setKeyCommandPair(aEvent, sCommand);
else
{
- // Attention: Its not really a reason to throw an exception and
kill the office, if the configuration contains
+ // Attention: It's not really a reason to throw an exception and
kill the office, if the configuration contains
// multiple registrations for the same key :-) Show a warning ...
and ignore the second item.
// THROW_PARSEEXCEPTION("Command is registered for the same key
more than once.")
SAL_INFO("fwk",
diff --git a/include/comphelper/configurationhelper.hxx
b/include/comphelper/configurationhelper.hxx
index 45890cc..4a9243a 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -210,7 +210,7 @@ public:
* Because it opens the specified configuration package, reads the key and
* closes the configuration again.
*
- * So its not very useful to use this method for reading multiple keys at
the same time.
+ * So it's not very useful to use this method for reading multiple keys at
the same time.
* (Excepting these keys exists inside different configuration packages
...))
*/
static css::uno::Any readDirectKey(const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
@@ -226,7 +226,7 @@ public:
* Because it opens the specified configuration package, writes the key,
flush
* all changes and closes the configuration again.
*
- * So its not very useful to use this method for writing multiple keys at
the same time.
+ * So it's not very useful to use this method for writing multiple keys at
the same time.
* (Excepting these keys exists inside different configuration packages
...))
*/
static void writeDirectKey(const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
diff --git a/include/comphelper/namedvaluecollection.hxx
b/include/comphelper/namedvaluecollection.hxx
index 420994b..cb850aa 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -157,7 +157,7 @@ namespace comphelper
return get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType<
VALUE_TYPE >::get() );
}
- /** retrieves a value with a given name, or defaults it to a given
value, if its not present
+ /** retrieves a value with a given name, or defaults it to a given
value, if it's not present
in the collection
*/
template < typename VALUE_TYPE >
diff --git a/include/framework/dispatchhelper.hxx
b/include/framework/dispatchhelper.hxx
index f1e28e8..3cca78c 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -96,7 +96,7 @@ class FWE_DLLPUBLIC DispatchHelper : public
::cppu::WeakImplHelper< css::lang::X
const css::uno::Sequence<
css::beans::PropertyValue >& lArguments )
throw(css::uno::RuntimeException, std::exception) override;
- // not a public XDispatchHelper-method, need in
sfx2/source/control/statcach.cxx for extentions
+ // not a public XDispatchHelper-method, need in
sfx2/source/control/statcach.cxx for extensions
css::uno::Any SAL_CALL executeDispatch(
const css::uno::Reference<
css::frame::XDispatch >& xDispatch ,
const css::util::URL&
aURL ,
diff --git a/include/salhelper/singletonref.hxx
b/include/salhelper/singletonref.hxx
index 6b96d3e..1dd7ef7 100644
--- a/include/salhelper/singletonref.hxx
+++ b/include/salhelper/singletonref.hxx
@@ -46,7 +46,7 @@ namespace salhelper{
its state) must be made threadsafe by the object itself
or from outside.
- @attention To prevent the code against race conditions, its not
+ @attention To prevent the code against race conditions, it's not
allowed to start operations inside the ctor
of the internal wrapped object - especially operations
which needs a reference to the same singleton too.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
