[Libreoffice-commits] core.git: sfx2/classification sfx2/qa sfx2/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 20 07:03:59 UTC 2019
sfx2/classification/xNL.xsd | 2 +-
sfx2/qa/complex/sfx2/UndoManager.java | 2 +-
sfx2/source/doc/objstor.cxx | 4 ++--
sfx2/source/doc/printhelper.cxx | 8 ++++----
sfx2/source/doc/sfxbasemodel.cxx | 12 ++++++------
5 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e0acc90f3748a0973198cc2eb23ef1779ef84d3b
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 19 21:44:45 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Aug 20 09:03:09 2019 +0200
Fix typos
Change-Id: I2b21ba71cd555a88e015871e4f6f5a7747615520
Reviewed-on: https://gerrit.libreoffice.org/77763
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sfx2/classification/xNL.xsd b/sfx2/classification/xNL.xsd
index 1e5cafe16bc8..d82c6ab7bec0 100644
--- a/sfx2/classification/xNL.xsd
+++ b/sfx2/classification/xNL.xsd
@@ -52,7 +52,7 @@
</xs:element>
<xs:element name="OrganisationName" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>A container for organisation name details. Same organisaion with many types of names can be used by this container</xs:documentation>
+ <xs:documentation>A container for organisation name details. Same organisation with many types of names can be used by this container</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:complexContent>
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index 838958fc1ebf..7e438e852e71 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -654,7 +654,7 @@ public class UndoManager
m_currentTestCase.verifySingleModificationDocumentState();
// undo the modification, ensure the listener got the proper notifications
- assertEquals( "We did not yet do a undo!", 0, m_undoListener.getUndoActionCount() );
+ assertEquals( "We did not yet do an undo!", 0, m_undoListener.getUndoActionCount() );
i_undoManager.undo();
assertEquals( "A simple undo does not result in the proper Undo count.",
1, m_undoListener.getUndoActionCount() );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 6a659b5242a8..b703f0ffdfeb 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1662,7 +1662,7 @@ bool SfxObjectShell::SaveTo_Impl
{
SAL_WARN( "sfx.doc", "Storing has failed." );
- // in case the document storage was connected to backup temporarely it must be disconnected now
+ // in case the document storage was connected to backup temporarily it must be disconnected now
if ( bNeedsDisconnectionOnFail )
ConnectTmpStorage_Impl( pImpl->m_xDocStorage, nullptr );
}
@@ -3049,7 +3049,7 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
{
sal_Int32 nVersion = rMedium.GetFilter()->GetVersion();
- // OASIS templates have own mediatypes ( SO7 also actually, but it is to late to use them here )
+ // OASIS templates have own mediatypes (SO7 also actually, but it is to late to use them here)
const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat()
&& nVersion > SOFFICE_FILEFORMAT_60;
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 928196f5fbce..661074a9a102 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -421,7 +421,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
}
// The PaperSize may be set only when actually PAPER_USER
- // applies, otherwise the driver could choose a invalid format.
+ // applies, otherwise the driver could choose an invalid format.
if(nPaperFormat == view::PaperFormat_USER && aSetPaperSize.Width())
{
// Bug 56929 - MapMode of 100mm which recalculated when
@@ -626,7 +626,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
{
// OK - it's not a valid URL. But may it's a simple
// system path directly. It will be supported for historical
- // reasons. Otherwise we break to much external code ...
+ // reasons. Otherwise we break too much external code...
// We try to convert it to a file URL. If its possible
// we put the system path to the item set and let vcl work with it.
// No ucb or thread will be necessary then. In case it couldn't be
@@ -750,7 +750,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// Ok - may be execution before has finished (or started!) printing.
// And may it was a printing to a file.
- // Now we have to check if we can move the file (if necessary) via ucb to his right location.
+ // Now we have to check if we can move the file (if necessary) via UCB to its right location.
// Cases:
// a) printing finished => move the file directly and forget the watcher thread
// b) printing is asynchron and runs currently => start watcher thread and exit this method
@@ -766,7 +766,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
else
{
// Note: we create(d) some resource on the heap (thread and temp file).
- // They will be deleted by the thread automatically if he finish his run() method.
+ // They will be deleted by the thread automatically if it finishes its run() method.
ImplUCBPrintWatcher* pWatcher = new ImplUCBPrintWatcher( pPrinter, pUCBPrintTempFile, sUcbUrl );
pWatcher->create();
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 4ef95f9aa672..5c61dfb047fa 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -477,13 +477,13 @@ SfxSaveGuard::~SfxSaveGuard()
// storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called.
// So the ownership was delegated to the place where a veto exception was thrown.
// Now we have to call close() again and delegate the ownership to the next one, which
- // can't accept that. Close(sal_False) can't work in this case. Because then the document will may be never closed ...
+ // can't accept that. Close(sal_False) can't work in this case. Because then the document will may be never closed...
if ( !m_pData->m_bSuicide )
return;
- // Reset this state. In case the new close() request is not accepted by someone else ...
- // it's not a good idea to have two "owners" for close .-)
+ // Reset this state. In case the new close() request is not accepted by someone else...
+ // it's not a good idea to have two "owners" for close.-)
m_pData->m_bSuicide = false;
try
{
@@ -1896,7 +1896,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA
m_pData->m_pObjectShell->SetModified();
}
- // TODO/LATER: may be the mode should be retrieved from outside and the preused filter should not be set
+ // TODO/LATER: maybe the mode should be retrieved from outside and the preused filter should not be set
if ( m_pData->m_pObjectShell->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
{
const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_FILTER_NAME, false);
@@ -3653,7 +3653,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >&
SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() );
TransformParameters( SID_SAVEASDOC, aMediaDescriptor, aSet );
- // TODO/LATER: may be a special URL "private:storage" should be used
+ // TODO/LATER: maybe a special URL "private:storage" should be used
const SfxStringItem* pItem = aSet.GetItem<SfxStringItem>(SID_FILTER_NAME, false);
sal_Int32 nVersion = SOFFICE_FILEFORMAT_CURRENT;
if( pItem )
@@ -4163,7 +4163,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
// tell the guard we were successful
aViewCreationGuard.releaseAll();
- // outta gere
+ // outta here
return pBaseController;
}
More information about the Libreoffice-commits
mailing list