[Libreoffice-commits] core.git: filter/source forms/source fpicker/source framework/inc framework/qa framework/source
Andrea Gelmini
andrea.gelmini at gelma.net
Mon Oct 3 11:24:19 UTC 2016
filter/source/config/cache/basecontainer.cxx | 4 ++--
filter/source/config/cache/basecontainer.hxx | 2 +-
filter/source/config/cache/cacheupdatelistener.hxx | 2 +-
filter/source/config/cache/configflush.cxx | 2 +-
filter/source/config/cache/filtercache.cxx | 6 +++---
filter/source/config/cache/filtercache.hxx | 10 +++++-----
filter/source/config/cache/querytokenizer.hxx | 2 +-
filter/source/config/cache/typedetection.cxx | 2 +-
filter/source/config/cache/typedetection.hxx | 2 +-
filter/source/config/tools/merge/pyAltFCFGMerge | 2 +-
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 2 +-
forms/source/xforms/model_ui.cxx | 2 +-
fpicker/source/win32/filepicker/asyncrequests.hxx | 2 +-
framework/inc/classes/taskcreator.hxx | 2 +-
framework/inc/dispatch/interceptionhelper.hxx | 2 +-
framework/inc/helper/ocomponentenumeration.hxx | 4 ++--
framework/inc/helper/oframes.hxx | 2 +-
framework/inc/services/desktop.hxx | 4 ++--
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 2 +-
framework/source/accelerators/keymapping.cxx | 2 +-
20 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit f0249a88fc502df142d36f2f67c976618b7ba6b6
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Oct 1 13:08:29 2016 +0200
Fix typos
Change-Id: I6730c6c5eab9157533822e5045e9f86109062580
Reviewed-on: https://gerrit.libreoffice.org/29433
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 2c193f3..1869e75 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -425,7 +425,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea
// It hold a reference to us ... and call our container interface directly.
// be aware of some direct callbacks if it will be created :-)
- /* Note: Its not allowed to return NULL. Because an empty enumeration
+ /* Note: It's not allowed to return NULL. Because an empty enumeration
transport the same information but make no trouble outside.
Further its easier to work directly with the return value
instaed of checking of NULL returns! */
@@ -484,7 +484,7 @@ void SAL_CALL BaseContainer::flush()
// notify listener outside the lock!
// The used listener helper lives if we live
// and is threadsafe by itself.
- // Further its not a good idea to hold the own lock
+ // Further it's not a good idea to hold the own lock
// if an outside object is called :-)
css::lang::EventObject aSource (static_cast< css::util::XFlushable* >(this));
::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XFlushListener>::get());
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 2d5d459..f02146c 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -178,7 +178,7 @@ class BaseContainer : public BaseLock
/** @short returns a pointer to the current used cache member.
- @descr Its a point to the FilterCache instance behind m_pFlushCache
+ @descr It's a point to the FilterCache instance behind m_pFlushCache
or m_rCache.
@note The lifetime of this pointer is restricted to the time, where
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index 17e4db5..a5385f8 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -65,7 +65,7 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante
/** @short initialize new instance of this class.
- @descr Listening wont be started here. It can be done
+ @descr Listening won't be started here. It can be done
by calling startListening() on this instance.
@see startListening()
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index 5820841..fc220f2 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -61,7 +61,7 @@ void SAL_CALL ConfigFlush::refresh()
// notify listener outside the lock!
// The used listener helper lives if we live
// and is threadsafe by itself.
- // Further its not a good idea to hold the own lock
+ // Further it's not a good idea to hold the own lock
// if an outside object is called :-)
css::lang::EventObject aSource (static_cast< css::util::XRefreshable* >(this));
::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XRefreshListener>::get());
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 1059e7f..d1a56b7 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -504,7 +504,7 @@ void FilterCache::addStatePropsToItem( EItemType eType,
/* TODO
Hack -->
The default frame loader can't be located inside the normal set of frame loaders.
- Its an atomic property inside the misc cfg package. So we can't retrieve the information
+ It's an atomic property inside the misc cfg package. So we can't retrieve the information
about FINALIZED and MANDATORY very easy ... :-(
=> set it to readonly/required everytimes :-)
*/
@@ -826,7 +826,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
case E_PROVIDER_OLD :
{
// This special provider is used to work with
- // the old configuration format only. Its not cached!
+ // the old configuration format only. It's not cached!
sPath = CFGPACKAGE_TD_OLD;
pConfig = &xOld;
sRtlLog = "impl_openconfig(E_PROVIDER_OLD)";
@@ -1107,7 +1107,7 @@ void FilterCache::impl_validateAndOptimize()
{
// OK - there is no filter for this type. But thats not an error.
// May be it can be handled by a ContentHandler ...
- // But at this time its not guaranteed that there is any ContentHandler
+ // But at this time it's not guaranteed that there is any ContentHandler
// or FrameLoader inside this cache ... but on disk ...
bool bReferencedByLoader = true;
bool bReferencedByHandler = true;
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index e34dc2f..35ade19 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -256,7 +256,7 @@ class FilterCache : public BaseLock
/** @short standard ctor
- @descr Its not allowed to do anything here ...
+ @descr It's not allowed to do anything here...
especially is forbidden to start operations,
which needs a FilterCache instance too!
Why? Because this FilterCache instance will be
@@ -288,10 +288,10 @@ class FilterCache : public BaseLock
If the new data are needed immediately inside the original container,
the method takeOver() can be used to copy all changes back.
The may be following notifications of the configuration will be superfluous then.
- But they can't be stopped ...
+ But they can't be stopped...
All internal structures will be copied here. But the internal used
- configuration (update) access wont be copied. The cloned instance contains
+ configuration (update) access won't be copied. The cloned instance contains
a different one.
*/
std::unique_ptr<FilterCache> clone() const;
@@ -663,7 +663,7 @@ class FilterCache : public BaseLock
@attention Because this function might opens a new configuration
read access for reading one key value only, it should
- be used in rare cases only. Its an easy way ... but an
+ be used in rare cases only. It's an easy way... but an
expensive one.
@param sDirectKey
@@ -747,7 +747,7 @@ class FilterCache : public BaseLock
/** @short read the specified container item from the given configuration set.
- @descr Its not added to any internal structures here. That must be done
+ @descr It's not added to any internal structures here. That must be done
outside this method.
@param xSet
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index 42f2574..28e3286 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -42,7 +42,7 @@ namespace filter{
</ul>
uses this schema.
- @attention This class is not threadsafe implemented. Because its not necessary.
+ @attention This class is not threadsafe implemented. Because it's not necessary.
But you have to make sure, that ist not used as such :-)
*/
class QueryTokenizer : public std::unordered_map< OUString ,
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 278115c..92c1007 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -885,7 +885,7 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& r
// step over all possible types for this URL.
// solutions:
// a) no types => no detection
- // b) deep detection not allowed => return first valid type of list (because its the preferred or the first valid one)
+ // b) deep detection not allowed => return first valid type of list (because it's the preferred or the first valid one)
// or(!) match by URLPattern => in such case a deep detection will be suppressed!
// c) type has no detect service => safe the first occurred type without a detect service
// as "last chance"(!). It will be used outside of this method
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index a0c6bc8..c65a946 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -86,7 +86,7 @@ private:
The specified MediaDescriptor will be patched, so it contain
the right values every time. Using of any deep detection service
can be enabled/disabled. And last but not least: If the results
- wont be really clear (because a flat detected type has no deep
+ won't be really clear (because a flat detected type has no deep
detection service), a "suggested" type name will be returned as "rLastChance".
It can be used after e.g. all well known deep detection services
was used without getting any result. Then this "last-chance-type"
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge
index fee3f2b..b81766a 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -270,7 +270,7 @@ def readprops(buff):
return props
#---end java.util.Properties copy---#
-# Its a simple command line tool, which can merge different XML fragments
+# It's a simple command line tool, which can merge different XML fragments
# together. Such fragments must exist as files on disk, will be moved into
# one file together on disk.
#
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 1deae62..618ea5e 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -114,7 +114,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
// special case for impress documents which supports same service as draw documents
if ( rServiceName == "com.sun.star.drawing.DrawingDocument" )
{
- // so if we want a draw we need to check if its not an impress
+ // so if we want a draw we need to check if it's not an impress
if( !xInfo->supportsService("com.sun.star.presentation.PresentationDocument") )
return true;
}
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 2aba1c1..482fe7a 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -609,7 +609,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
if( xNode->getNodeName() == sName )
return xNode;
- // refuse to change name if its an attribute, and the name is already used
+ // refuse to change name if it's an attribute, and the name is already used
if( xNode->getNodeType() == NodeType_ATTRIBUTE_NODE
&& xNode->getParentNode().is()
&& Reference<XElement>(xNode->getParentNode(), UNO_QUERY_THROW)->hasAttribute( sName ) )
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index efca551..2d4a3cf 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -153,7 +153,7 @@ class AsyncRequests : private ::cppu::BaseMutex
void triggerJobExecution();
- /** does nothing special / excepting to make sure our class wont be inline .-)
+ /** does nothing special / excepting to make sure our class won't be inline .-)
*/
virtual ~AsyncRequests();
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 295fb21..9bca428 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -32,7 +32,7 @@ namespace framework{
/*-************************************************************************************************************
@short a helper to create new tasks or sub frames for "_blank" or FrameSearchFlag::CREATE
- @descr There are different places to create new (task)frames. Its not easy to service this code!
+ @descr There are different places to create new (task)frames. It's not easy to service this code!
Thats the reason for this helper. He capsulate asynchronous/synchronous creation by calling
a simple interface.
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 7c6e555..7462303 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -162,7 +162,7 @@ class InterceptionHelper : public ::cppu::WeakImplHelper<
/** @short standard destructor.
@descr This method destruct an instance of this class and clear some member.
- This method is protected, because its not allowed to use this class as a direct member!
+ This method is protected, because it's not allowed to use this class as a direct member!
You MUST use a dynamical instance (pointer). That's the reason for a protected dtor.
*/
virtual ~InterceptionHelper() override;
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index a055d88..e833f4d 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -35,7 +35,7 @@ namespace framework{
/*-************************************************************************************************************
@short implement a helper for a oneway enumeration of components
- @descr You can step during this list only for one time! Its a snapshot.
+ @descr You can step during this list only for one time! It's a snapshot.
Don't forget to release the reference. You are the owner of an instance of this implementation.
You can't use this as a baseclass. Please use it as a dynamical object for return.
@@ -121,7 +121,7 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper< css::container::X
/*-****************************************************************************************************
@short standard destructor
@descr This method destruct an instance of this class and clear some member.
- We make it protected, because its not supported to use this class as normal instance!
+ We make it protected, because it's not supported to use this class as normal instance!
You must create it dynamical in memory and use a pointer.
*//*-*****************************************************************************************************/
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 3eae713..2b35afe 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -162,7 +162,7 @@ class OFrames : public ::cppu::WeakImplHelper< css::frame::XFrames >
/*-****************************************************************************************************
@short standard destructor
@descr This method destruct an instance of this class and clear some member.
- This method is protected, because its not allowed to use this class as a member!
+ This method is protected, because it's not allowed to use this class as a member!
You MUST use a dynamical instance (pointer). That's the reason for a protected dtor.
*//*-*****************************************************************************************************/
virtual ~OFrames() override;
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 4c9f19c..8e90ba6 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -177,7 +177,7 @@ class Desktop : private cppu::BaseMutex,
@descr Additional to adding normal listener these method was implemented special.
Every listener will be asked for its uno implementation name.
- Some of them are well known... and the corresponding listener wont be added
+ Some of them are well known... and the corresponding listener won't be added
to the container of "normal listener". Those listener will be set as special
member.
see e.g. member m_xSfxTerminator
@@ -432,7 +432,7 @@ class Desktop : private cppu::BaseMutex,
* Because basic runs Application::Yield internally the application may quit
* while running inside the internal basic event loop. So all the basic
* infrastructure may be deleted while the call is executing, leading to
- * a varient of crashes. So this special terminate listener will
+ * a variant of crashes. So this special terminate listener will
* veto the current quit attempt, stop basic execution, which will
* cause the inner event loop to quit, and on return to the outer normal
* application event loop then resend the quit attempt.
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index dc7e288..c6bd94a 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -212,7 +212,7 @@ public class CheckXComponentLoader
String sURL = URLHelper.getFileURLFromSystemPath(aSysFile);
loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
- // Its not needed to reset this using states!
+ // It's not needed to reset this using states!
// Its done internally ...
if (!xIndicator.wasUsed())
{
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 02a0278..c2fbcb5 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -170,7 +170,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
if (pIt != m_lIdentifierHash.end())
return pIt->second;
- // Its not well known identifier - but may be a pure key code formatted as string ...
+ // It's not well known identifier - but may be a pure key code formatted as string...
// Check and convert it!
sal_uInt16 nCode = 0;
if (!KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(sIdentifier, nCode))
More information about the Libreoffice-commits
mailing list