[Libreoffice-commits] core.git: solenv/bin svgio/source svl/qa svtools/source svx/source
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Mar 3 06:54:41 UTC 2017
solenv/bin/concat-deps.c | 2 +-
solenv/bin/modules/installer/epmfile.pm | 2 +-
solenv/bin/ooinstall | 2 +-
svgio/source/svgreader/svggnode.cxx | 2 +-
svgio/source/svgreader/svggradientnode.cxx | 2 +-
svgio/source/svgreader/svgstyleattributes.cxx | 2 +-
svgio/source/svgreader/svgtitledescnode.cxx | 2 +-
svl/qa/unit/svl.cxx | 2 +-
svtools/source/control/tabbar.cxx | 2 +-
svtools/source/misc/transfer.cxx | 4 ++--
svtools/source/uno/statusbarcontroller.cxx | 4 ++--
svtools/source/uno/toolboxcontroller.cxx | 4 ++--
svtools/source/uno/unoimap.cxx | 4 ++--
svx/source/accessibility/lookupcolorname.cxx | 2 +-
svx/source/inc/tbxform.hxx | 2 +-
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 2 +-
svx/source/unodraw/UnoGraphicExporter.cxx | 2 +-
svx/source/unodraw/unoshap2.cxx | 2 +-
18 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 3ffc206a4b70863fc1a340c0011eb4aa82819ae1
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Mar 2 15:17:15 2017 +0100
Fix typos
Change-Id: Ib25dadb25d8c2df1361de194f74cf3ddd459650d
Reviewed-on: https://gerrit.libreoffice.org/34783
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index c63d5a7..1d6907d 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -151,7 +151,7 @@ struct pool
int primary; /**< primary allocation in bytes */
int secondary; /**< secondary allocation in bytes */
};
-#define POOL_ALIGN_INCREMENT 8 /**< Alignement, must be a power of 2 and of size > to sizeof(void*) */
+#define POOL_ALIGN_INCREMENT 8 /**< alignment, must be a power of 2 and of size > to sizeof(void*) */
static void* pool_take_extent(struct pool* pool, int allocate)
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index b7b4bcc..0dbc37a 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -65,7 +65,7 @@ sub read_packagemap
{
my $packagemapref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$onepackagemapname, $includepatharrayref, 0);
- if ( $$packagemapref eq "" ) { installer::exiter::exit_program("ERROR: Could not find package map file \"$onepackagemapname\" (propery PACKAGEMAP)!", "read_packagemap"); }
+ if ( $$packagemapref eq "" ) { installer::exiter::exit_program("ERROR: Could not find package map file \"$onepackagemapname\" (property PACKAGEMAP)!", "read_packagemap"); }
my $packagemapcontent = installer::files::read_file($$packagemapref);
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 8d0f5be..83507a7 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -80,7 +80,7 @@ if ($is_windows) {
# FIXME: a better solution would be to fix installer to deal with broken symlinks
# make distro-pack-install shufle with the SDK installation to make it LSB compliant
-# it creates symlinks from the orignal path to /usr/share; they are not valid with $DESTDIR
+# it creates symlinks from the original path to /usr/share; they are not valid with $DESTDIR
# and potential second ooinstall call fails with strange error messages if the old tree is still there
if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
print "Cleaning destdir...\n";
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index 28c4dd8..16849ef 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -33,7 +33,7 @@ namespace svgio
maSvgStyleAttributes(*this),
mpaTransform(nullptr)
{
- OSL_ENSURE(aType == SVGTokenDefs || aType == SVGTokenG, "SvgGNode should ony be used for Group and Defs (!)");
+ OSL_ENSURE(aType == SVGTokenDefs || aType == SVGTokenG, "SvgGNode should only be used for Group and Defs (!)");
}
SvgGNode::~SvgGNode()
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 8d700c5..99469ed 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -54,7 +54,7 @@ namespace svgio
maXLink(),
mpXLink(nullptr)
{
- OSL_ENSURE(aType == SVGTokenLinearGradient || aType == SVGTokenRadialGradient, "SvgGradientNode should ony be used for Linear and Radial gradient (!)");
+ OSL_ENSURE(aType == SVGTokenLinearGradient || aType == SVGTokenRadialGradient, "SvgGradientNode should only be used for Linear and Radial gradient (!)");
}
SvgGradientNode::~SvgGradientNode()
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 8cb6bb5..b10c906 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -697,7 +697,7 @@ namespace svgio
}
// convert svg:stroke-miterlimit to LineAttrute:mfMiterMinimumAngle
- // The default needs to be set explicitely, because svg default <> Draw default
+ // The default needs to be set explicitly, because svg default <> Draw default
double fMiterMinimumAngle;
if (getStrokeMiterLimit().isSet())
{
diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx
index 36b4cd4..f5722b6 100644
--- a/svgio/source/svgreader/svgtitledescnode.cxx
+++ b/svgio/source/svgreader/svgtitledescnode.cxx
@@ -31,7 +31,7 @@ namespace svgio
: SvgNode(aType, rDocument, pParent),
maText()
{
- OSL_ENSURE(aType == SVGTokenTitle || aType == SVGTokenDesc, "SvgTitleDescNode should ony be used for Title and Desc (!)");
+ OSL_ENSURE(aType == SVGTokenTitle || aType == SVGTokenDesc, "SvgTitleDescNode should only be used for Title and Desc (!)");
}
SvgTitleDescNode::~SvgTitleDescNode()
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 8e185d5..8ac1dd7 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -145,7 +145,7 @@ void Test::testNumberFormat()
nullptr
};
-// Followings aren't in range of NF_FRACTION_START and NF_FRACTION_END
+// Following aren't in range of NF_FRACTION_START and NF_FRACTION_END
// see enum NfIndexTableOffset in svl/inc/svl/zforlist.hxx
const char* pFractionExt[] = {
"# \?\?\?/\?\?\?",
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 7ff5d2b..3a40a07 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1866,7 +1866,7 @@ void TabBar::SetCurPageId(sal_uInt16 nPageId)
if (nPageId == mnCurPageId)
return;
- // make invalide
+ // make invalid
bool bUpdate = false;
if (IsReallyVisible() && IsUpdateMode())
bUpdate = true;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 3337c22..ce36856 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -667,7 +667,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo
{
const Bitmap aBitmap(rBitmapEx.GetBitmap());
- // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True
+ // explicitly use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True
WriteDIB(aBitmap, aMemStm, false, true);
}
@@ -1573,7 +1573,7 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r
Bitmap aBitmap;
AlphaMask aMask;
- // explicitely use Bitmap::Read with bFileHeader = sal_True
+ // explicitly use Bitmap::Read with bFileHeader = sal_True
// #i124085# keep DIBV5 for read from clipboard, but should not happen
ReadDIBV5(aBitmap, aMask, *xStm);
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 0b00ac3..b44e177 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -355,7 +355,7 @@ void StatusbarController::addStatusListener( const OUString& aCommandURL )
return;
// Check if we are already initialized. Implementation starts adding itself as status listener when
- // intialize is called.
+ // initialize is called.
if ( !m_bInitialized )
{
// Put into the unordered_map of status listener. Will be activated when initialized is called
@@ -364,7 +364,7 @@ void StatusbarController::addStatusListener( const OUString& aCommandURL )
}
else
{
- // Add status listener directly as intialize has already been called.
+ // Add status listener directly as initialize has already been called.
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( m_xContext.is() && xDispatchProvider.is() )
{
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 2a443b5..4aa9032 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -390,7 +390,7 @@ void ToolboxController::addStatusListener( const OUString& aCommandURL )
return;
// Check if we are already initialized. Implementation starts adding itself as status listener when
- // intialize is called.
+ // initialize is called.
if ( !m_bInitialized )
{
// Put into the unordered_map of status listener. Will be activated when initialized is called
@@ -399,7 +399,7 @@ void ToolboxController::addStatusListener( const OUString& aCommandURL )
}
else
{
- // Add status listener directly as intialize has already been called.
+ // Add status listener directly as initialize has already been called.
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( m_xContext.is() && xDispatchProvider.is() )
{
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index e0ffcb8..2258817 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -82,7 +82,7 @@ public:
rtl::Reference<SvMacroTableEventDescriptor> mxEvents;
- // overriden helpers from PropertySetHelper
+ // overridden helpers from PropertySetHelper
virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) override;
virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override;
@@ -397,7 +397,7 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName()
}
}
-// overriden helpers from PropertySetHelper
+// overridden helpers from PropertySetHelper
void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues )
{
bool bOk = false;
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index 06cfee7..423eb43 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -70,7 +70,7 @@ ColorNameMap::ColorNameMap() {
}
catch (css::uno::RuntimeException const&)
{
- // When an exception occurred then whe have an empty name sequence
+ // When an exception occurred then we have an empty name sequence
// and the loop below is not entered.
}
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 369af51..c2dbd43 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -29,7 +29,7 @@
class SvxFmAbsRecWin : public NumericField
{
SfxToolBoxControl* m_pController;
- // for invalidating our content whe losing the focus
+ // for invalidating our content when losing the focus
public:
SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController );
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 0857542..8af2e51 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -92,7 +92,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo)
aViewRange.transform(pTargetDevice->GetInverseViewTransformation());
}
- // upate local ViewInformation2D
+ // update local ViewInformation2D
const drawinglayer::geometry::ViewInformation2D aNewViewInformation2D(
basegfx::B2DHomMatrix(),
pTargetDevice->GetViewTransformation(),
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 58fd9c7..fb5d9c7 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -197,7 +197,7 @@ namespace {
aRange.expand(basegfx::B2DPoint(aSize100th.Width(), aSize100th.Height()));
- // when explicitely pixels are requested from the GraphicExporter, use a *very* high limit
+ // when explicitly pixels are requested from the GraphicExporter, use a *very* high limit
// of 16gb (4096x4096 pixels), else use the default for the converters
nMaximumQuadraticPixels = std::min(sal_uInt32(4096 * 4096), sal_uInt32(pSize->Width() * pSize->Height()));
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index dcdcbe6..bf964ff 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1705,7 +1705,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
{
// Luckily, the object causing problems in tdf#93994 is not the
// UNO API object, but the XCustomShapeEngine involved. This
- // object is on-demand replacable and can be reset here. This
+ // object is on-demand replaceable and can be reset here. This
// will free the involved EditEngine and VirtualDevice.
pTarget->mxCustomShapeEngine.set(nullptr);
}
More information about the Libreoffice-commits
mailing list