[Libreoffice-commits] core.git: chart2/source desktop/source filter/source framework/source include/sfx2 qadevOOo/tests sc/source sfx2/classification svx/source sw/source unoidl/source vcl/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Apr 15 08:13:59 UTC 2017
chart2/source/tools/ObjectIdentifier.cxx | 4 ++--
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 +-
desktop/source/deployment/manager/dp_manager.cxx | 2 +-
filter/source/flash/swfwriter1.cxx | 2 +-
framework/source/services/autorecovery.cxx | 8 ++++----
include/sfx2/docfile.hxx | 2 +-
qadevOOo/tests/java/ifc/frame/_XModuleManager.java | 6 +++---
sc/source/filter/lotus/lotfilter.hxx | 2 +-
sfx2/classification/xNL.xsd | 2 +-
svx/source/gallery2/galbrws1.cxx | 2 +-
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2 +-
sw/source/core/text/itratr.cxx | 4 ++--
sw/source/filter/html/htmlsect.cxx | 2 +-
unoidl/source/sourceprovider-parser.y | 2 +-
vcl/source/filter/sgvtext.cxx | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 9f5a275a42659339ee41c4e0a4d860f2886470e4
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Apr 15 04:00:20 2017 +0200
Fix typos
Change-Id: I0238202c0dc0380b0e33a9c4567a9513c0afbe91
Reviewed-on: https://gerrit.libreoffice.org/36556
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 27b7394b7c6e..0aa654587b94 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -390,7 +390,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
}
else
{
- OSL_FAIL("give object could not be identifed in createClassifiedIdentifierForObject");
+ OSL_FAIL("give object could not be identified in createClassifiedIdentifierForObject");
}
return aRet;
@@ -472,7 +472,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
}
else
{
- OSL_FAIL("give object could not be identifed in createClassifiedIdentifierForObject");
+ OSL_FAIL("give object could not be identified in createClassifiedIdentifierForObject");
}
return aRet;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 34864cbfee4c..619412c31421 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -396,7 +396,7 @@ bool ExtensionManager::isUserDisabled(
it is not disabled by the user, then it is always registered. Otherwise an
extension is only registered when there is no registered extension in one of
the repositories with a higher priority. That is, if the extension is from
- the shared repository and an active extension with the same identifer is in
+ the shared repository and an active extension with the same identifier is in
the user repository, then the extension is not registered. Similarly a
bundled extension is not registered if there is an active extension with the
same identifier in the shared or user repository.
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index f437ec410b74..df1431c449a2 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1247,7 +1247,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
dp_misc::getDescriptionInfoset(url);
OSL_ENSURE(infoset.hasDescription() && infoset.getIdentifier(),
"Extension Manager: bundled and shared extensions "
- "must have an identifer and a version");
+ "must have an identifier and a version");
if (infoset.hasDescription() &&
infoset.getIdentifier() &&
(! i->first.equals(*(infoset.getIdentifier()))
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index b66cd0ff2234..80521d6493c0 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -968,7 +968,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
{
// AS: Go through the actual JPEG bits, separating out the
// header fields from the actual image fields. Fields are
- // identifed by 0xFFXX where XX is the field type. Both
+ // identified by 0xFFXX where XX is the field type. Both
// the header and the image need start and stop (D8 and D9),
// so that's why you see those written to both. I don't
// really know what the rest of these are, I got it to work
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index bca61b6ce747..b3849d54cc20 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2845,12 +2845,12 @@ void AutoRecovery::implts_prepareSessionShutdown()
that a document must be ignored for AutoSave and Recovery.
But sometimes XModel->getArgs() does not contained this information
if implts_registerDocument() was called.
- So we have to check a second time, if this property is set ....
- Best place doing so is to check it immeditaly before saving
+ So we have to check a second time, if this property is set...
+ Best place doing so is to check it immediately before saving
and suppressing saving the document then.
Of course removing the corresponding cache entry is not an option.
- Because it would disturb iteration over the cache !
- So we ignore such documents only ...
+ Because it would disturb iteration over the cache!
+ So we ignore such documents only...
Hopefully next time they are not inserted in our cache.
*/
bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo)
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index c695a127b4f8..5727d9a372ea 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -178,7 +178,7 @@ public:
SAL_WARN_UNUSED_RESULT bool IsReadOnly() const;
// Whether the medium had originally been opened r/o (either because it is
- // "physically" r/o, or because it was requested to be opended r/o,
+ // "physically" r/o, or because it was requested to be opened r/o,
// independent of later changes via SetOpenMode; used to keep track of the
// "true" state of the medium across toggles via SID_EDITDOC (which do
// change SetOpenMode):
diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
index c43de57f05b9..2c6d414a7fd6 100644
--- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
+++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
@@ -39,13 +39,13 @@ import com.sun.star.frame.UnknownModuleException;
* <ul>
* <li> <code>'XModuleManager.XFrame'</code> (of type <code>PropertyValue[]</code>):
* PropertyValue[n].Value : a XFrame
-* PropertyValue[n].Name : the expected return value of <code>idendify()</code></li>
+* PropertyValue[n].Name : the expected return value of <code>identify()</code></li>
* <li> <code>'XModuleManager.XController'</code> (of type <code>PropertyValue[]</code>):
* PropertyValue[n].Value : a XController
-* PropertyValue[n].Name : the expected return value of <code>idendify()</code></li>
+* PropertyValue[n].Name : the expected return value of <code>identify()</code></li>
* <li> <code>'XModuleManager.XModel'</code> (of type <code>PropertyValue[]</code>):
* PropertyValue[n].Value : a XFrame
-* PropertyValue[n].Name : the expected return value of <code>idendify()</code></li>
+* PropertyValue[n].Name : the expected return value of <code>identify()</code></li>
* </ul> <p>
* Test is <b> NOT </b> multithread compliant. <p>
* @see com.sun.star.frame.XModuleManager
diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx
index a62e9d3edf78..3b3634a08d5d 100644
--- a/sc/source/filter/lotus/lotfilter.hxx
+++ b/sc/source/filter/lotus/lotfilter.hxx
@@ -48,7 +48,7 @@ struct LotusContext
SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
ScProtectionAttr* pAttrUnprot;
- FormCache* pValueFormCache; // -> in memory.cxx initialisiert
+ FormCache* pValueFormCache; // -> initialized in memory.cxx
LotusContext()
: eTyp(eWK_UNKNOWN)
diff --git a/sfx2/classification/xNL.xsd b/sfx2/classification/xNL.xsd
index 8bf11c89c2fa..ce67d6367e26 100644
--- a/sfx2/classification/xNL.xsd
+++ b/sfx2/classification/xNL.xsd
@@ -223,7 +223,7 @@ e.g. used for legal purposes</xs:documentation>
</xs:attribute>
<xs:attribute name="ID" type="ct:String">
<xs:annotation>
- <xs:documentation>Globally unique identifer</xs:documentation>
+ <xs:documentation>Globally unique identifier</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Usage" type="OrganisationNameUsageList">
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e3a7afca7c4f..52135ea65540 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -547,7 +547,7 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
case KEY_RETURN:
{
if( bMod1 )
- sExecuteIdent = "proeprties";
+ sExecuteIdent = "properties";
}
break;
}
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index 0e08bb889593..268914f3abd8 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -68,7 +68,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
SwFormatVertOrient aVert( rFrameFormat.GetVertOrient() );
{
// to-frame anchored objects are *only* vertical positioned centered or
- // bottom, if its wrap mode is 'throught' and its anchor frame has fixed
+ // bottom, if its wrap mode is 'through' and its anchor frame has fixed
// size. Otherwise, it's positioned top.
sal_Int16 eVertOrient = aVert.GetVertOrient();
if ( ( bFlyAtFly &&
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 4bcc6987705d..55fbbadeb126 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -210,7 +210,7 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
m_nEndIndex++;
}
}
- else // skip the not opended ends
+ else // skip the not opened ends
{
while ( (m_nEndIndex < m_pHints->Count()) &&
(*m_pHints->GetSortedByEnd(m_nEndIndex)->GetAnyEnd() <= nNewPos) )
@@ -220,7 +220,7 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
}
// As long as we've not yet reached the end of EndArray and the
- // TextAttribute ends before or at the new position ...
+ // TextAttribute ends before or at the new position...
while ( ( m_nStartIndex < m_pHints->Count() ) &&
((pTextAttr=m_pHints->Get(m_nStartIndex))->GetStart()<=nNewPos) )
{
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 587e366debcb..adbd6a190835 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -237,7 +237,7 @@ void SwHTMLParser::NewDivision( int nToken )
// We only insert sections into frames if the section is linked.
if( (!aId.isEmpty() && !bPositioned) || !aHRef.isEmpty() )
{
- // Insert section (has to be done before setting of attribures,
+ // Insert section (has to be done before setting of attributes,
// because the section is inserted before the PaM position.
// If we are in the first node of a section, we insert the section
diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y
index 9cb7d061438f..f504d515832f 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -1318,7 +1318,7 @@ structMember:
error(
@3, yyscanner,
("struct/exception type " + data->currentName + " direct member "
- + id + " has same unqualified identifer as the type itself"));
+ + id + " has same unqualified identifier as the type itself"));
YYERROR;
}
unoidl::detail::SourceProviderEntity * ent = getCurrentEntity(data);
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index a4bd025414ff..678b6a9bd689 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -49,7 +49,7 @@
// Escape sequences: [Esc]<Ident><Value>[Esc] at least 4 characters
// Max length of value should be: 8 chars (7+sign). Therefore max. length
// of a escape sequence: 11 chars.
-// Identifer:
+// Identifier:
#define EscFont 'F' /* fontID, e.g. 92500 for CG Times */
#define EscGrad 'G' /* font angle 1..255 for <<Pt-127<<Pt */
More information about the Libreoffice-commits
mailing list