[Libreoffice-commits] core.git: filter/source framework/source helpcompiler/source include/svtools linguistic/source lotuswordpro/source sdext/source sd/source vcl/win wizards/com
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Jun 13 07:51:42 PDT 2015
filter/source/config/cache/filtercache.hxx | 4 ++--
framework/source/services/autorecovery.cxx | 2 +-
helpcompiler/source/BasCodeTagger.cxx | 2 +-
include/svtools/acceleratorexecute.hxx | 2 +-
include/svtools/contextmenuhelper.hxx | 2 +-
linguistic/source/lngsvcmgr.cxx | 2 +-
lotuswordpro/source/filter/lwpframelayout.cxx | 2 +-
sd/source/ui/func/fuprlout.cxx | 2 +-
sdext/source/pdfimport/tree/writertreevisiting.cxx | 2 +-
vcl/win/source/gdi/salprn.cxx | 2 +-
wizards/com/sun/star/wizards/web/data/CGDocument.py | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 1f408db49740f8cc6ba67d72b54f49d2e4fdae9b
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Jun 13 15:52:56 2015 +0200
Fix typos
Change-Id: Ifaa52b49b717d893846fc1e7ae4ac50735f824ac
Reviewed-on: https://gerrit.libreoffice.org/16260
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 2eee9f7..f932275 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -667,7 +667,7 @@ class FilterCache : public BaseLock
object.
@param bLocalesMode
- enable/disable special handling of localized configuratiom
+ enable/disable special handling of localized configuration
items by the returned configuration object.
@return A valid reference, if the configuration access could be opened
@@ -867,7 +867,7 @@ class FilterCache : public BaseLock
this list to check if the item was changed/added or removed. This method
checks the exist state of the requested item inside our own cache
and inside the underlying configuration layer to find out, if the item
- must be removed/added or modified inside the configuratuion layer.
+ must be removed/added or modified inside the configuration layer.
@param xSet
points directly to the configuration set, where the item should resist
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8f98232..1d741ef 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -552,7 +552,7 @@ private:
/** @short open the underlying configuration.
@descr This method must be called every time
- a configuartion call is needed. Because
+ a configuration call is needed. Because
method works together with the member
m_xCFG, open it on demand and cache it
afterwards.
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index c4779d7..89aca54 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -32,7 +32,7 @@ void LibXmlTreeWalker::nextNode()
}
else
m_pCurrentNode = m_pCurrentNode->next;
- //queue chiledren if they exist
+ //queue children if they exist
if ( m_pCurrentNode->xmlChildrenNode != NULL )
m_Queue.push_back( m_pCurrentNode->xmlChildrenNode );
}
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index f42bc2a..6e9c223 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -172,7 +172,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
/** @short trigger this accelerator.
- @descr The internal configuartions are used to find
+ @descr The internal configurations are used to find
as suitable command for this key code.
This command will be queued and executed later
asynchronous.
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index c0fd6bc..4b7db90 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -79,7 +79,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
// methods to retrieve a single command URL dependent value from a
- // ui configuratin manager
+ // ui configuration manager
Image getImageFromCommandURL( const OUString& aCmdURL ) const;
OUString getLabelFromCommandURL( const OUString& aCmdURL ) const;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index c6b2ae0..3824b91 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -683,7 +683,7 @@ namespace
for (sal_Int32 k = 0; k < 2; ++k)
{
- // add previously configuerd service first and append
+ // add previously configured service first and append
// new found services at the end
const Sequence< OUString > &rSeq = k == 0 ? rCfgSvcs : rNewSvcs;
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 61325da..0beee84 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -889,7 +889,7 @@ OUString LwpFrameLayout::GetNextLinkName()
{
LwpAtomHolder& rHolder = pLayout->GetName();
aName = rHolder.str();
- //for division name confict
+ //for division name conflict
if(!pLayout->GetStyleName().isEmpty())
aName = pLayout->GetStyleName();
}
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index c0fffc9..6ce661f 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -190,7 +190,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
OUString aFileName = aFile.getToken(0, DOCUMENT_TOKEN);
SdDrawDocument* pTempDoc = mpDoc->OpenBookmarkDoc( aFileName );
- // #69581: If I chosed the standard-template I got no filename and so I get no
+ // #69581: If I chose the standard-template I got no filename and so I get no
// SdDrawDocument-Pointer. But the method SetMasterPage is able to handle
// a NULL-pointer as a Standard-template ( look at SdDrawDocument::SetMasterPage )
OUString aLayoutName;
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index e54d412..d880191 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -660,7 +660,7 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
*/
// detect header
- // Note: the following assumes that the pages' chiuldren have been
+ // Note: the following assumes that the pages' children have been
// sorted geometrically
std::list< Element* >::iterator it = rElem.Children.begin();
while( it != rElem.Children.end() )
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index ea18040..c6d7623 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1521,7 +1521,7 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
while ( bWhile );
PostMessageW( GetSalData()->mpFirstInstance->mhComWnd, SAL_MSG_DUMMY, 0, 0 );
- // bring up a file choser if printing to file port but no file name given
+ // bring up a file chooser if printing to file port but no file name given
OUString aOutFileName;
if( mpInfoPrinter->maPortName.equalsIgnoreAsciiCase( "FILE:" ) && !(pFileName && !pFileName->isEmpty()) )
{
diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.py b/wizards/com/sun/star/wizards/web/data/CGDocument.py
index 7bb83ab..9ae627e 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDocument.py
+++ b/wizards/com/sun/star/wizards/web/data/CGDocument.py
@@ -36,7 +36,7 @@ relevant only for the web-wizard.
On the other-hand, the web-wizard can read those fields automatically
from SO documents.
In order to avoid conflict by saving, I use two fields: "cp_title", which
-should be read from the configuratin (saved session), and "title" which is
+should be read from the configuration (saved session), and "title" which is
the value read from the document.
The *cp_title* "overrides" *title*, if exists. if not, *title* is used.
The same is valid for *description* and *author*.
More information about the Libreoffice-commits
mailing list