[Libreoffice-commits] core.git: desktop/source desktop/unx drawinglayer/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Oct 6 12:13:08 PDT 2015
desktop/source/app/dispatchwatcher.hxx | 2 -
desktop/source/app/officeipcthread.cxx | 4 +--
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 -
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2 -
desktop/source/deployment/manager/dp_manager.cxx | 2 -
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2 -
desktop/source/lib/init.cxx | 2 -
desktop/source/migration/migration.cxx | 2 -
desktop/unx/source/splashx.c | 2 -
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx | 4 +--
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 12 +++++------
drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 2 -
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 2 -
drawinglayer/source/processor2d/hittestprocessor2d.cxx | 2 -
15 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 7154aece1fdc3ea5049ba2d91ce929a14d139056
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Oct 2 09:57:58 2015 +0200
Fix typos
Change-Id: Ia6246bb6d37a0ec1ac53a4cb095bfd6fd15f873d
Reviewed-on: https://gerrit.libreoffice.org/18945
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 08c46ba..d3e2e02 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -34,7 +34,7 @@ namespace desktop
/*
Class for controls dispatching of command URL through office command line. There
are "dangerous" command URLs, that can result in a running office without UI. To prevent
- this situation the implementation surveile all dispatches and looks for an open task if
+ this situation the implementation surveille all dispatches and looks for an open task if
there is arose a problem. If there is none the office will be shutdown to prevent a
running office without UI.
*/
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index eeb4913..50ded8f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -468,7 +468,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
if (comphelper::LibreOfficeKit::isActive())
{
// Setting nPipeMode to PIPEMODE_CREATED causes the trivial path to be taken below, starting
- // the listeing thread. (Which will immediately finish, see the execute() function, but what
+ // the listening thread. (Which will immediately finish, see the execute() function, but what
// the heck...)
nPipeMode = PIPEMODE_CREATED;
}
@@ -720,7 +720,7 @@ void OfficeIPCThread::execute()
// if we receive a request while the office is displaying some dialog or error during
// bootstrap, that dialogs event loop might get events that are dispatched by this thread
// we have to wait for cReady to be set by the real main loop.
- // only reqests that dont dispatch events may be processed before cReady is set.
+ // only requests that don't dispatch events may be processed before cReady is set.
cReady.wait();
// we might have decided to shutdown while we were sleeping
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 359b46e..95085b0 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -791,7 +791,7 @@ void ExtensionCmdQueue::Thread::execute()
//This exception is thrown when a user clicked cancel in the messagebox which was
//startet by the interaction handler. For example the user will be asked if he/she
//really wants to install the extension.
- //These interaction are run for exectly one extension at a time. Therefore we continue
+ //These interaction are run for exactly one extension at a time. Therefore we continue
//with installing the remaining extensions.
continue;
}
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 79b7b95..faf8092 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -619,7 +619,7 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
if (m_stop) {
return;
}
- //all errors should be handeld by the command environment.
+ //all errors should be handled by the command environment.
aUpdateData.sLocalURL = destFolder + "/" + sTitle;
}
}
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 73e8b34..cfb62ec 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -280,7 +280,7 @@ void PackageManagerImpl::initRegistryBackends()
m_xComponentContext ) );
}
-// this overcomes previous rumours that the sal API is misleading
+// this overcomes previous rumors that the sal API is misleading
// as to whether a directory is truly read-only or not
static bool isMacroURLReadOnly( const OUString &rMacro )
{
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 6f2bbca..6e5d996 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -305,7 +305,7 @@ void BackendImpl::PackageImpl:: initPackageHandler()
else
{
OSL_ASSERT( false );
- // NOT supported at the momemtn // TODO
+ // NOT supported at the moment // TODO
}
Reference< provider::XScriptProviderFactory > xFac =
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8fe6295..03fc12f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1192,7 +1192,7 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction)
static bool initialize_uno(const OUString& aAppProgramURL)
{
#ifdef IOS
- // For iOS we already hardocde the inifile as "rc" in the .app directory.
+ // For iOS we already hardcode the inifile as "rc" in the .app directory.
(void) aAppProgramURL;
#elif defined MACOSX
rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" SAL_CONFIGFILE("soffice"));
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index ca7fce8..37ce482 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -455,7 +455,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
}
}
- // exluded files...
+ // excluded files...
if (tmpAccess->getByName("ExcludedFiles") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index db9e01e..44e6b8c 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -588,7 +588,7 @@ static void splash_load_defaults( struct splash* splash, rtl_uString* pAppPath,
pos[2] = { -1, -1 },
size[2] = { -1, -1 };
- /* costruct the sofficerc file location */
+ /* construct the sofficerc file location */
rtl_uString_newFromAscii( &pSettings, "file://" );
rtl_uString_newConcat( &pSettings, pSettings, pAppPath );
rtl_uString_newConcat( &pSettings, pSettings, pTmp );
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index f85f372..7f506ee 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -191,7 +191,7 @@ namespace drawinglayer
// prepare return value
Primitive2DSequence aRetval(rEntries.size() + 1);
- // get outmost viusible range from object
+ // get outmost visible range from object
basegfx::B2DRange aOutmostRange(getOutputRange());
basegfx::B2DPolyPolygon aCombinedPolyPoly;
@@ -219,7 +219,7 @@ namespace drawinglayer
for(sal_uInt32 a(0); a < rEntries.size() - 1; a++)
{
- // create next inner polygon, combinbe with last one
+ // create next inner polygon, combined with last one
basegfx::B2DPolygon aNextPoly(rUnitPolygon);
aNextPoly.transform(rEntries[a + 1].maB2DHomMatrix);
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index e27a538..0f2ade1 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -388,7 +388,7 @@ namespace
namespace
{
- /** Helper class to buffer and hold a Primive target vector. It
+ /** Helper class to buffer and hold a Primitive target vector. It
encapsulates the new/delete functionality and allows to work
on pointers of the implementation classes. All data will
be converted to uno sequences of uno references when accessing the
@@ -953,7 +953,7 @@ namespace
{
const bool bNewActive(rClipPolyPolygon.count());
- // #i108636# The handlig of new ClipPolyPolygons was not done as good as possible
+ // #i108636# The handling of new ClipPolyPolygons was not done as good as possible
// in the first version of this interpreter; e.g. when a ClipPolyPolygon was set
// initially and then using a lot of push/pop actions, the pop always leads
// to setting a 'new' ClipPolyPolygon which indeed is the return to the ClipPolyPolygon
@@ -1309,7 +1309,7 @@ namespace
if(bDecoratedIsNeeded)
{
- // prepare overline, underline and srikeout data
+ // prepare overline, underline and strikeout data
const drawinglayer::primitive2d::TextLine eFontOverline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetOverline()));
const drawinglayer::primitive2d::TextLine eFontUnderline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetUnderline()));
const drawinglayer::primitive2d::TextStrikeout eTextStrikeout(drawinglayer::primitive2d::mapFontStrikeoutToTextStrikeout(rFont.GetStrikeout()));
@@ -1627,7 +1627,7 @@ namespace
creations, nor in EMF/WMF imports (checked with a whole bunch of critical EMF/WMF
bugdocs)
- For more commens, see the single action implementations.
+ For more comments, see the single action implementations.
*/
void interpretMetafile(
const GDIMetaFile& rMetaFile,
@@ -2304,7 +2304,7 @@ namespace
if(rPropertyHolders.Current().isRasterOpInvert())
{
// use a special version of FillGradientPrimitive2D which creates
- // non-overlapping geometry on decomposition to makethe old XOR
+ // non-overlapping geometry on decomposition to make the old XOR
// paint 'trick' work.
xGradient[0] = drawinglayer::primitive2d::Primitive2DReference(
new drawinglayer::primitive2d::NonOverlappingFillGradientPrimitive2D(
@@ -2880,7 +2880,7 @@ namespace
case MetaActionType::EPS :
{
/** CHECKED, WORKS WELL */
- // To support this action, i have added a EpsPrimitive2D which will
+ // To support this action, I have added a EpsPrimitive2D which will
// by default decompose to the Metafile replacement data. To support
// this EPS on screen, the renderer visualizing this has to support
// that primitive and visualize the Eps file (e.g. printing)
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index ac0f751..c4fd3f0 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -51,7 +51,7 @@ namespace drawinglayer
if(basegfx::fTools::more(aScale.getX(), 0.0) && basegfx::fTools::more(aScale.getY(), 0.0))
{
- // check if content overlaps with tageted size and needs to be embedded with a
+ // check if content overlaps with target size and needs to be embedded with a
// clipping primitive
const basegfx::B2DRange aRealContentRange(getB2DRangeFromPrimitive2DSequence(aContent, rViewInformation));
const basegfx::B2DRange aAllowedContentRange(0.0, 0.0, getContentWidth(), getContentHeight());
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index eeb04d0..93e9ba1 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -172,7 +172,7 @@ namespace drawinglayer
else
{
// no split, was already a single word. Continue to
- // decompse local entity
+ // decompose local entity
}
}
std::vector< Primitive2DReference > aNewPrimitives;
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 497d21a..1e594a0 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -594,7 +594,7 @@ namespace drawinglayer
basegfx::B3DPolyPolygon aEdgeRounding;
sal_uInt32 a;
- // tetxture parameters
+ // texture parameters
double fInvTexHeight(1.0);
::std::vector<double> aTexHeightArray;
basegfx::B3DRange aTexRangeFront;
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index d71d42e..9d7bb4b 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -528,7 +528,7 @@ namespace drawinglayer
// will be used for HitTest currently.
//
// This may be refined in the future, e.g:
- // - For Bitamps, the mask and/or transparence information may be used
+ // - For Bitmaps, the mask and/or transparence information may be used
// - For MetaFiles, the MetaFile content may be used
const basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D()));
More information about the Libreoffice-commits
mailing list