[Libreoffice-commits] core.git: 4 commits - registry/inc reportbuilder/java sal/osl sal/qa sc/qa scripting/source sc/source sdext/README sdext/source sd/source sfx2/source shell/source slideshow/qa solenv/gbuild sot/source stoc/source svtools/source svx/source sw/inc sw/source ucb/source unoxml/source vcl/generic vcl/qa vcl/source vcl/unx winaccessibility/source wizards/com wizards/source xmlhelp/Library_ucpchelp1.mk xmloff/source xmlsecurity/source
Michael Stahl
mstahl at redhat.com
Wed Jul 8 03:28:30 PDT 2015
registry/inc/regapi.hxx | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java | 2 -
sal/osl/unx/file_misc.cxx | 2 -
sal/osl/w32/file_dirvol.cxx | 2 -
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 4 +-
sc/qa/unit/filters-test.cxx | 4 +-
sc/qa/unit/ucalc_pivottable.cxx | 2 -
sc/source/filter/inc/xestyle.hxx | 2 -
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 2 -
sc/source/ui/inc/inputhdl.hxx | 2 -
sc/source/ui/vba/vbaborders.cxx | 2 -
sc/source/ui/vba/vbarange.cxx | 2 -
sc/source/ui/view/cellsh1.cxx | 2 -
scripting/source/provider/MasterScriptProvider.cxx | 2 -
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 2 -
sdext/README | 2 -
sdext/source/presenter/PresenterAccessibility.cxx | 2 -
sfx2/source/dialog/splitwin.cxx | 4 +-
sfx2/source/view/frame.cxx | 2 -
shell/source/tools/lngconvex/lngconvex.cxx | 2 -
slideshow/qa/tools/mkeffects.pl | 2 -
slideshow/qa/tools/mktransitions.pl | 2 -
solenv/gbuild/platform/filter-showIncludes.awk | 2 -
sot/source/sdstor/stgelem.hxx | 2 -
stoc/source/javavm/javavm.cxx | 4 +-
svtools/source/config/printoptions.cxx | 2 -
svtools/source/control/ctrltool.cxx | 2 -
svtools/source/misc/langtab.cxx | 2 -
svtools/source/table/tablecontrol.cxx | 2 -
svx/source/dialog/charmap.cxx | 4 +-
svx/source/engine3d/view3d.cxx | 2 -
svx/source/form/filtnav.cxx | 2 -
svx/source/sdr/contact/viewcontactofpageobj.cxx | 2 -
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 2 -
svx/source/xml/xmlgrhlp.cxx | 2 -
sw/inc/doc.hxx | 2 -
sw/source/core/crsr/findtxt.cxx | 2 -
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 2 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 20 +++++-----
sw/source/core/text/inftxt.hxx | 2 -
sw/source/core/text/itrpaint.cxx | 2 -
sw/source/core/text/portxt.cxx | 2 -
sw/source/core/unocore/unostyle.cxx | 4 +-
sw/source/core/view/viewsh.cxx | 2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
sw/source/filter/ww8/wrtw8nds.cxx | 6 +--
sw/source/filter/xml/swxml.cxx | 2 -
sw/source/ui/vba/vbaborders.cxx | 2 -
ucb/source/cacher/dynamicresultsetwrapper.cxx | 2 -
ucb/source/sorter/sortdynres.cxx | 2 -
ucb/source/ucp/cmis/cmis_content.cxx | 2 -
unoxml/source/dom/document.cxx | 2 -
vcl/generic/fontmanager/fontcache.cxx | 2 -
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 4 +-
vcl/source/app/svapp.cxx | 4 ++
vcl/source/window/dialog.cxx | 2 -
vcl/unx/generic/dtrans/X11_selection.cxx | 2 -
vcl/unx/generic/window/salframe.cxx | 2 -
winaccessibility/source/UAccCOM/AccEditableText.cxx | 6 +--
winaccessibility/source/UAccCOM/AccEditableText.h | 2 -
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 4 +-
wizards/source/formwizard/develop.xba | 4 +-
xmlhelp/Library_ucpchelp1.mk | 13 ------
xmloff/source/draw/ximpshap.cxx | 2 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 -
65 files changed, 89 insertions(+), 98 deletions(-)
New commits:
commit 815fe9110897d5d8c122a5743e3765b67013dd8b
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 8 12:20:17 2015 +0200
vcl: document mnDispatchLevel TODO
Change-Id: I3c9f16bf0a2e6565612c32f48a95f447c09860e9
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 42efa3b..5562170 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -347,6 +347,10 @@ inline void ImplYield(bool i_bWait, bool i_bAllEvents, sal_uLong const nReleased
Scheduler::ProcessTaskScheduling(false);
}
+ // TODO: there's a data race here on WNT only because ImplYield may be
+ // called without SolarMutex; if we can get rid of LazyDelete (with VclPtr)
+ // then the only remaining use of mnDispatchLevel is in OSX specific code
+ // so that would effectively eliminate the race on WNT
pSVData->maAppData.mnDispatchLevel++;
// do not wait for events if application was already quit; in that
// case only dispatch events already available
commit 6b199c50afea1b85c429bd71808cd23a759a0b44
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 8 12:19:19 2015 +0200
xmlhelp: remove obsolete GCC 4.2 warning stuff
Change-Id: Ica1e7430ac7dc9fc61c8135498a0470ba5f1ab81
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index d0b2bc3..0ea5d1b 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -11,19 +11,6 @@ $(eval $(call gb_Library_Library,ucpchelp1))
$(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
-# TODO: is this still relevant?
-# GCC versions 4.2.x introduced a warning "allocating zero-element array"
-# Allocating zero-element arrays is an allowed if not somewhat dubious
-# technique though, so this warning is plain wrong and has been fixed
-# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
-# Some files in this directory use zero allocated arrays, we need to
-# disable the WaE mechanism for the GCC 4.2.x series.
-# .IF "$(COM)"=="GCC"
-# .IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-# CFLAGSWERRCXX:=
-# .ENDIF # "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-# .ENDIF # "$(COM)"=="GCC"
-
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Library_add_cxxflags,ucpchelp1,\
-GR \
commit e544f449eded2738b45de4be13c72b128a16bafe
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Jul 7 23:14:45 2015 +0200
Fix typos
Change-Id: I020c7ce4d9aa93cb0292378a410cdb9f7788e920
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/registry/inc/regapi.hxx b/registry/inc/regapi.hxx
index c84dab4..e784838 100644
--- a/registry/inc/regapi.hxx
+++ b/registry/inc/regapi.hxx
@@ -390,7 +390,7 @@ REG_DLLPUBLIC bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
/** This function opens a registry with the specified name.
@param registryName points to a null terminated string specifying the name of the registry.
- @param phRegistry points to a hanle of the opened registry if the function succeeds otherwise NULL.
+ @param phRegistry points to a handle of the opened registry if the function succeeds otherwise NULL.
@param accessMode specifies the accessmode of the registry, RegAccessMode::READONLY or RegAccessMode::READWRITE.
@return REG_NO_ERROR if succeeds else an error code.
*/
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
index 5f0bb70..f5caa12 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
@@ -224,7 +224,7 @@ public class MasterPageFactory
}
catch (CloneNotSupportedException cne)
{
- throw new IllegalStateException("Implementation error: Unable to derive page", cne);
+ throw new IllegalStateException("Implementation error: unable to derive page", cne);
}
}
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 125afea..f507581 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -567,7 +567,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
osl::systemPathRemoveSeparator(sys_path);
// const_cast because sys_path is a local copy which we want to modify inplace instead of
- // coyp it into another buffer on the heap again
+ // copy it into another buffer on the heap again
return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);
}
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index cb95dd6..bd5bb02 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -682,7 +682,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
// const_cast because sys_path is a local copy
// which we want to modify inplace instead of
- // coyp it into another buffer on the heap again
+ // copy it into another buffer on the heap again
return oslTranslateFileError(create_dir_recursively_(
sys_path.pData, aDirectoryCreationCallbackFunc, pData));
}
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index c73fb88..c67fe6a 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -407,7 +407,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
- "length of ascci string of size 1",
+ "length of ascii string of size 1",
aStrBuf.getLength() == expVal
);
}
@@ -538,7 +538,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
- "capacity of ascci string of size 1",
+ "capacity of ascii string of size 1",
aStrBuf.getCapacity() == expVal
);
}
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bfb2a8a..bdc3a2a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -467,8 +467,8 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
{
{
// This example doc contains cell anchored shape that is rotated, the
- // rotated shape is in fact cliped by the sheet boundries ( and thus
- // is a good edge case test to see if we import it still correctly )
+ // rotated shape is in fact clipped by the sheet boundries (and thus
+ // is a good edge case test to see if we import it still correctly)
ScDocShellRef xDocSh = loadDoc("legacycellanchoredrotatedclippedshape.", ODS);
ScDocument& rDoc = xDocSh->GetDocument();
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 9effa08..96da933 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -2032,7 +2032,7 @@ void Test::testPivotTableDocFunc()
CPPUNIT_ASSERT_MESSAGE("Failed to create pivot table object.", pDPObj);
- // Craete a new pivot table output.
+ // Create a new pivot table output.
ScDBDocFunc aFunc(getDocShell());
bool bSuccess = aFunc.CreatePivotTable(*pDPObj, false, true);
CPPUNIT_ASSERT_MESSAGE("Failed to create pivot table output via ScDBDocFunc.", bSuccess);
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 0899d33..d918666 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -543,7 +543,7 @@ public:
};
/** Represents a STYLE record containing the data of a cell style.
- @descr The calss is able to store built-in and user-defined styles. */
+ @descr The class is able to store built-in and user-defined styles. */
class XclExpStyle : public XclExpRecord
{
public:
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index a0ee617..2a72f78 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -372,7 +372,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce
else
rData.GetFooterPosition( aRect );
- // the Rectangle could contain negative coordinates so it should be cliped
+ // the Rectangle could contain negative coordinates so it should be clipped
Rectangle aClipRect(Point(0, 0), aRect.GetSize());
vcl::Window* pWindow = mpViewShell->GetWindow();
if (pWindow)
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 5b0e837..9cdf44c 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -59,7 +59,7 @@ private:
ScEditEngineDefaulter* pEngine; ///< Edited data in the sheet (when the user clicks into the sheet, and starts writing there).
EditView* pTableView; // associated active EditView
- EditView* pTopView; // EditView in dthe input row
+ EditView* pTopView; // EditView in the input row
ScTypedCaseStrSet* pColumnData;
ScTypedCaseStrSet* pFormulaData;
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 1056713..7ef2b92 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -305,7 +305,7 @@ private:
ScVbaPalette m_Palette;
sal_Int32 getTableIndex( sal_Int32 nConst )
{
- // hokay return position of the index in the table
+ // okay return position of the index in the table
sal_Int32 nIndexes = getCount();
sal_Int32 realIndex = 0;
const sal_Int16* pTableEntry = supportedIndexTable;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index bba58b5..50df307 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1782,7 +1782,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception)
if ( pFormulaRanges->GetRangeList().empty() )
return uno::makeAny(sal_False);
- // chech if there are holes (where some cells are not formulas)
+ // check if there are holes (where some cells are not formulas)
// or returned range is not equal to this range
if ( ( pFormulaRanges->GetRangeList().size() > 1 )
|| ( pFormulaRanges->GetRangeList().front()->aStart != pThisRanges->GetRangeList().front()->aStart )
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c1becf7..238857d 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2578,7 +2578,7 @@ bool isDPSourceValid(const ScDPObject& rDPObj)
const ScDPCache* pCache = pDesc->CreateCache(pDimData);
if (!pCache)
- // cashe creation failed, probably due to invalid connection.
+ // cache creation failed, probably due to invalid connection.
return false;
}
return true;
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 66d1bb1..b2e229b 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -306,7 +306,7 @@ throw ( provider::ScriptFrameworkErrorException,
Reference< provider::XScript > xScript;
// If the script location is in the same location context as this
- // MSP then delate to the lanaguage provider controlled by this MSP
+ // MSP then delete to the lanaguage provider controlled by this MSP
// ** Special case is BASIC, all calls to getScript will be handled
// by the language script provider in the current location context
// even if its different
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 476e21c..5bec93d 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -49,7 +49,7 @@ public:
The priority class in which to insert the request with highest
or lowest priority.
@param bInsertWithHighestPriority
- When this flag is <TRUE/> the request is inserted with highes
+ When this flag is <TRUE/> the request is inserted with highest
priority in its class. When <FALSE/> the request is inserted
with lowest priority.
*/
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 8f00971..817b4a2 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1959,7 +1959,7 @@ void AccessibleNotes::NotifyCaretChange (
if (nOldParagraphIndex != nNewParagraphIndex)
{
// Moved caret from one paragraph to another (or showed or
- // hid the caret). Move focuse from one accessible
+ // hid the caret). Move focus from one accessible
// paragraph to another.
if (nOldParagraphIndex >= 0)
{
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 9423b79..077dbe3 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -733,7 +733,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
if ( GetItemCount( 0 ) == 1 && GetItemCount( 1 ) == 1 )
{
// The Rearranging in WorkWindow and a Show() on the SplitWindow is
- // caues by SfxDockingwindow (->SfxWorkWindow::ConfigChild_Impl)
+ // caused by SfxDockingwindow (->SfxWorkWindow::ConfigChild_Impl)
if ( !bPinned && !IsFloatingMode() )
{
bPinned = true;
@@ -815,7 +815,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide )
// removing the last DockingWindows.
if ( GetItemCount( nSet ) == 1 && GetItemCount( 0 ) == 1 )
{
- // The Rearranging in WorkWindow is caues by SfxDockingwindow
+ // The Rearranging in WorkWindow is caused by SfxDockingwindow
Hide();
pEmptyWin->aTimer.Stop();
sal_uInt16 nRealState = pEmptyWin->nState;
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 8f2d624..1594cf3 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -385,7 +385,7 @@ void SfxFrame::GetViewData_Impl()
pSet->Put( SfxUInt16Item( SID_VIEW_ID, pViewFrame->GetCurViewId() ) );
if ( pChildArr )
{
- // For Framesets also the data from the ChildViews hace to be processed
+ // For Framesets also the data from the ChildViews have to be processed
sal_uInt16 nCount = pChildArr->size();
for ( sal_uInt16 n=nCount; n>0; n--)
{
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index bb08e4d..2a9da14 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -392,7 +392,7 @@ void read_file(
}
}
-/** A simple helper function that appens the
+/** A simple helper function that happens the
content of one file to another one */
void concatenate_files(std::ostream& os, std::istream& is)
{
diff --git a/slideshow/qa/tools/mkeffects.pl b/slideshow/qa/tools/mkeffects.pl
index 1c5faea..a3065b9a 100644
--- a/slideshow/qa/tools/mkeffects.pl
+++ b/slideshow/qa/tools/mkeffects.pl
@@ -45,7 +45,7 @@ sub open_file
{
my $filename = pop @_;
- # Create base directory of temporary directory tree if not alreay
+ # Create base directory of temporary directory tree if not already
# present.
if ($TempDir eq "")
{
diff --git a/slideshow/qa/tools/mktransitions.pl b/slideshow/qa/tools/mktransitions.pl
index 8096e05..3b49925 100644
--- a/slideshow/qa/tools/mktransitions.pl
+++ b/slideshow/qa/tools/mktransitions.pl
@@ -47,7 +47,7 @@ sub open_file
{
my $filename = pop @_;
- # Create base directory of temporary directory tree if not alreay
+ # Create base directory of temporary directory tree if not already
# present.
if ($TempDir eq "")
{
diff --git a/solenv/gbuild/platform/filter-showIncludes.awk b/solenv/gbuild/platform/filter-showIncludes.awk
index 06788a9..21a4585 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -55,7 +55,7 @@ BEGIN {
} else {
# because MSVC stupidly prints the include files on stderr, it's
# necessary to forward everything that isn't matched by the pattern
- # so users get to see compiler errros
+ # so users get to see compiler errors
if (firstline) { # ignore the line that just prints name of sourcefile
firstline = 0
} else {
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 0a8bcc9..afeb950 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -107,7 +107,7 @@ enum StgEntryTime { // time codes:
//StructuredStorageDirectoryEntry
class StgEntry
-{ // directory enty
+{ // directory entry
sal_uInt16 nName[ 32 ]; // 00 name as WCHAR
sal_uInt16 nNameLen; // 40 size of name in bytes including 00H
sal_uInt8 cType; // 42 entry type
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index cad4d0d..dc35b20 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -1191,7 +1191,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException("JNI:GetMethodID java.util.Properties.remove", 0);
pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsPropName);
- // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only
+ // special case for ftp.nonProxyHosts and http.nonProxyHosts. The office only
// has a value for two java properties
if (!aPropertyName2.isEmpty())
{
@@ -1208,7 +1208,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsPropName, jsPropValue);
if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException("JNI:CallStaticObjectMethod java.lang.System.setProperty", 0);
- // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only
+ // special case for ftp.nonProxyHosts and http.nonProxyHosts. The office only
// has a value for two java properties
if (!aPropertyName2.isEmpty())
{
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index e8c9bb3..947eb15 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -517,7 +517,7 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of our class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index e5bdc8d..4e46dda 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -164,7 +164,7 @@ static OUString ImplMakeSearchStringFromName(const OUString& rStr)
ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong* pIndex) const
{
- // Append if there is no enty in the list or if the entry is larger
+ // Append if there is no entry in the list or if the entry is larger
// then the last one. We only compare to the last entry as the list of VCL
// is returned sorted, which increases the probability that appending
// is more likely
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 8a6b767..7f9fdee 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -60,7 +60,7 @@ const OUString ApplyLreOrRleEmbedding( const OUString &rText )
const sal_Unicode cRLE_Embedding = 0x202B; // the start char of an RLE embedding
const sal_Unicode cPopDirectionalFormat = 0x202C; // the unicode PDF (POP_DIRECTIONAL_FORMAT) char that terminates an LRE/RLE embedding
- // check if there are alreay embedding characters at the strings start
+ // check if there are already embedding characters at the strings start
// if so change nothing
const sal_Unicode cChar = rText[0];
if (cChar == cLRE_Embedding || cChar == cRLE_Embedding)
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1b5ffde..5d6c962 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -306,7 +306,7 @@ namespace svt { namespace table
aRetText = "Grid control";
break;
case TCTYPE_TABLE:
- aRetText = "Grid conrol";
+ aRetText = "Grid control";
break;
case TCTYPE_ROWHEADERBAR:
aRetText = "RowHeaderBar";
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index f5e9595..b7923ac 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -642,9 +642,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
svx::SvxShowCharSetItem* pItem = ImplGetItem(nSelectedIndex);
// Don't fire the focus event.
if ( bFocus )
- m_pAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), makeAny(pItem->GetAccessible()) ); // this call asures that m_pItem is set
+ m_pAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), makeAny(pItem->GetAccessible()) ); // this call assures that m_pItem is set
else
- m_pAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS, Any(), makeAny(pItem->GetAccessible()) ); // this call asures that m_pItem is set
+ m_pAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS, Any(), makeAny(pItem->GetAccessible()) ); // this call assures that m_pItem is set
assert(pItem->m_pItem && "No accessible created!");
Any aOldAny, aNewAny;
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 422cd83..5c1e395 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -172,7 +172,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
if(xTargetOverlay.is())
{
- // buld transfoprmation: translate and rotate so that given edge is
+ // build transfoprmation: translate and rotate so that given edge is
// on x axis, them mirror in y and translate back
const basegfx::B2DVector aEdge(aMirrorAxisB.X() - aMirrorAxisA.X(), aMirrorAxisB.Y() - aMirrorAxisA.Y());
basegfx::B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index b5b1390..7c0ecce 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1337,7 +1337,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
if (!OFilterItemExchange::hasFormat(GetDataFlavorExVector()))
return DND_ACTION_NONE;
- // do we conain the formitem?
+ // do we contain the formitem?
if (!FindEntry(m_aControlExchange->getFormItem()))
return DND_ACTION_NONE;
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 4e5614d..98784a86 100644
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
@@ -66,7 +66,7 @@ void ViewContactOfPageObj::ActionChanged()
drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageObj::createViewIndependentPrimitive2DSequence() const
{
- // ceate graphical visualisation data. Since this is the view-independent version which should not be used,
+ // create graphical visualisation data. Since this is the view-independent version which should not be used,
// create a replacement graphic visualisation here. Use GetLastBoundRect to access the model data directly
// which is aOutRect for SdrPageObj.
const Rectangle aModelRectangle(GetPageObj().GetLastBoundRect());
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 7004342..3926b82 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -118,7 +118,7 @@ namespace sdr
rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0,
aObjectRange.getMinX(), aObjectRange.getMinY());
- // ceate unit polygon from object's absolute path
+ // create unit polygon from object's absolute path
basegfx::B2DHomMatrix aInverse(aObjectMatrix);
aInverse.invert();
aUnitPolyPolygon.transform(aInverse);
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 0088c79..a4daaac 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -1063,7 +1063,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation(
SvXMLGraphicHelper that only gets the create mode
To write the Pictures stream, you have to call dispose at this component.
- Make sure you call dipose before you commit the parent storage.
+ Make sure you call dispose before you commit the parent storage.
uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in
SvXMLGraphicHelper
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e34a77d..b5461ba 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -871,7 +871,7 @@ public:
SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
/** Access to frames.
- Iterate over Flys - forr Basic-Collections. */
+ Iterate over Flys - for Basic-Collections. */
size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index fe9e746..042c58d 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -470,7 +470,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSText,
OUString sCleanStr;
std::vector<sal_Int32> aFltArr;
LanguageType eLastLang = 0;
- // if the search string contains a soft hypen,
+ // if the search string contains a soft hyphen,
// we don't strip them from the text:
bool bRemoveSoftHyphens = true;
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index a24cd7b..60835de 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -98,7 +98,7 @@ DocumentChartDataProviderManager::~DocumentChartDataProviderManager()
// clean up chart related structures...
// Note: the chart data provider gets already disposed in ~SwDocShell
// since all UNO API related functionality requires an existing SwDocShell
- // this assures that dipose gets called if there is need for it.
+ // this assures that dispose gets called if there is need for it.
maChartDataProviderImplRef.clear();
delete mpChartControllerHelper;
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 3e312f1..433c530 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1418,11 +1418,11 @@ namespace //local functions originally from docfmt.cxx
if( pStt->nNode == pEnd->nNode )
{
//The data parameter flag: bExpandCharToPara, comes from the data member of SwDoc,
- //Which is set in SW MS word Binary filter WW8ImplRreader. With this flag on, means that
- //current setting attribute set is a character range properties set and comes from a MS word
- //binary file, And the setting range include a paragraph end position (0X0D);
- //More specifications, as such property inside the character range properties set recorded in
- //MS word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //which is set in SW MS Word Binary filter WW8ImplRreader. With this flag on, means that
+ //current setting attribute set is a character range properties set and comes from a MS Word
+ //binary file, and the setting range include a paragraph end position (0X0D);
+ //more specifications, as such property inside the character range properties set recorded in
+ //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
@@ -1536,11 +1536,11 @@ namespace //local functions originally from docfmt.cxx
}
//The data parameter flag: bExpandCharToPara, comes from the data member of SwDoc,
- //Which is set in SW MS word Binary filter WW8ImplRreader. With this flag on, means that
- //current setting attribute set is a character range properties set and comes from a MS word
- //binary file, And the setting range include a paragraph end position (0X0D);
- //More specifications, as such property inside the character range properties set recorded in
- //MS word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //which is set in SW MS Word Binary filter WW8ImplRreader. With this flag on, means that
+ //current setting attribute set is a character range properties set and comes from a MS Word
+ //binary file, and the setting range include a paragraph end position (0X0D);
+ //more specifications, as such property inside the character range properties set recorded in
+ //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1)
{
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 107e6cb..c6684f7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -513,7 +513,7 @@ class SwTextFormatInfo : public SwTextPaintInfo
SwTabPortion *pLastTab; // The _last_ TabPortion
- sal_Int32 nSoftHyphPos; // SoftHyphPos forr Hyphenation
+ sal_Int32 nSoftHyphPos; // SoftHyphPos for Hyphenation
sal_Int32 nLineStart; // Current line start in rText
sal_Int32 nUnderScorePos; // enlarge repaint if underscore has been found
// #i34348# Changed type from sal_uInt16 to SwTwips
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1a6c3d0..e2e9b44 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -310,7 +310,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
SeekAndChg( GetInfo() );
else if ( !bFirst && pPor->IsBreakPortion() && GetInfo().GetOpt().IsParagraph() )
{
- // Paragraph symbols should have the same fon as the paragraph in fron of them,
+ // Paragraph symbols should have the same font as the paragraph in front of them,
// except for the case that there's redlining in the paragraph
if( GetRedln() )
SeekAndChg( GetInfo() );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 760a5a7..9ab83c5 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -279,7 +279,7 @@ static bool lcl_HasContent( const SwFieldPortion& rField, SwTextFormatInfo &rInf
bool SwTextPortion::_Format( SwTextFormatInfo &rInf )
{
- // 5744: If only the hypen does not fit anymore, we still need to wrap
+ // 5744: If only the hyphen does not fit anymore, we still need to wrap
// the word, or else return true!
if( rInf.IsUnderflow() && rInf.GetSoftHyphPos() )
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 24b33b6..b5bbfed 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2008,7 +2008,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
throw lang::IllegalArgumentException();
OSL_ENSURE(COND_COMMAND_COUNT == 28,
- "invalid size of comman count?");
+ "invalid size of command count?");
const beans::NamedValue *pSeq = aSeq.getConstArray();
const sal_Int32 nLen = aSeq.getLength();
@@ -2452,7 +2452,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
case FN_UNO_PARA_STYLE_CONDITIONS:
{
OSL_ENSURE(COND_COMMAND_COUNT == 28,
- "invalid size of comman count?");
+ "invalid size of command count?");
uno::Sequence< beans::NamedValue > aSeq(COND_COMMAND_COUNT);
beans::NamedValue *pSeq = aSeq.getArray();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 950bcac..0f36e03 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1839,7 +1839,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
mbInLibreOfficeKitCallback = true;
mpOut = &rDevice;
- // resizes the virtual device so to contain the entrie context
+ // resizes the virtual device so to contain the entries context
rDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
// setup the output device to draw the tile
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ea60878..7d4fc73 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -670,7 +670,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& nSdtPrToken,
m_rExport.SdrExporter().setParagraphSdtOpen(true);
}
else
- // Support multiple runs inside a run-evel SDT: don't close the SDT block yet.
+ // Support multiple runs inside a run-level SDT: don't close the SDT block yet.
m_bStartedCharSdt = true;
// clear sdt status
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 1cc2803..8b3adb4 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -800,7 +800,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
/*
MS needs to know the name and size of the font used in the ruby item,
- but we coud have written it in a mixture of asian and western
+ but we could have written it in a mixture of asian and western
scripts, and each of these can be a different font and size than the
other, so we make a guess based upon the first character of the text,
defaulting to asian.
@@ -1976,7 +1976,7 @@ void MSWordExportBase::GetSortedAnnotationMarks( const SwTextNode& rNode, sal_In
{
IMark* pMark = (*it);
- // Remove the positions egals to the current pos
+ // Remove the positions equal to the current pos
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
@@ -2012,7 +2012,7 @@ void MSWordExportBase::GetSortedBookmarks( const SwTextNode& rNode, sal_Int32 nA
{
IMark* pMark = (*it);
- // Remove the positions egals to the current pos
+ // Remove the positions equal to the current pos
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index d2a2fa7..7e589de 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -934,7 +934,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
// #i44177# - assure that for documents in OpenOffice.org
// file format the relation between outline numbering rule and styles is
// filled-up accordingly.
- // Note: The OpenOffice.org file format, which has no content that applys
+ // Note: The OpenOffice.org file format, which has no content that applies
// a certain style, which is related to the outline numbering rule,
// has lost the information, that this certain style is related to
// the outline numbering rule.
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 72f5ae6..2920186 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -237,7 +237,7 @@ private:
VbaPalette m_Palette;
sal_Int32 getTableIndex( sal_Int32 nConst )
{
- // hokay return position of the index in the table
+ // okay return position of the index in the table
sal_Int32 nIndexes = getCount();
sal_Int32 realIndex = 0;
const sal_Int16* pTableEntry = supportedIndexTable;
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 0bada74..9b70d9b 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -235,7 +235,7 @@ void SAL_CALL DynamicResultSetWrapper
<p>The Listener is allowed to blockade this call, until he really want to go
to the new version. The only situation, where the listener has to return the
update call at once is, while he disposes his broadcaster or while he is
- removing himsef as listener (otherwise you deadlock)!!!
+ removing himself as listener (otherwise you deadlock)!!!
*/
// handle the actions in the list
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 87a1703..a26c2b0 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -285,7 +285,7 @@ sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities()
<p>The Listener is allowed to blockade this call, until he really want to go
to the new version. The only situation, where the listener has to return the
update call at once is, while he disposes his broadcaster or while he is
- removing himsef as listener (otherwise you deadlock)!!!
+ removing himself as listener (otherwise you deadlock)!!!
*/
void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
throw( RuntimeException )
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index b54c246..03a9daf 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1428,7 +1428,7 @@ namespace cmis
}
else
{
- SAL_INFO( "ucb.ucp.cmis", "Couln't set property: " << rValue.Name );
+ SAL_INFO( "ucb.ucp.cmis", "Couldn't set property: " << rValue.Name );
lang::IllegalAccessException e ( OUString("Property is read-only!"),
static_cast< cppu::OWeakObject* >( this ) );
aRet[ n ] <<= e;
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 1b22891..f17910b 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -357,7 +357,7 @@ namespace DOM
return len;
}
- // clsoe callback
+ // close callback
//int xmlOutputCloseCallback (void * context)
static int closeCallback(void *context)
{
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index f7735d1..7289b5b 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -145,7 +145,7 @@ void FontCache::flush()
/*
* for each font entry write:
* name[;name[;name]]
- * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride;embed;antialias[;{metricfile,typeflags}][;stylename]
+ * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverride;embed;antialias[;{metricfile,typeflags}][;stylename]
*/
if( nEntrySize > 1 )
nSubEntry = static_cast<const PrintFontManager::TrueTypeFontFile*>(*it)->m_nCollectionEntry;
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 06d49dc8..12e6c9b 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -226,9 +226,9 @@ public class CheckMemoryUsage
}
/**
- * Checks how much memory should consum
+ * Checks how much memory should consume
* @param storageBefore
- * @return 1 if consum is ok, else 0
+ * @return 1 if consume is ok, else 0
*/
private int checkMemory(int nConsumMore)
{
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6d8c6d0..b6679d1 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -986,7 +986,7 @@ void Dialog::SetModalInputMode( bool bModal )
{
pSVData->maAppData.mnModalDialog++;
- // Diable the prev Modal Dialog, because our dialog must close at first,
+ // Disable the prev Modal Dialog, because our dialog must close at first,
// before the other dialog can be closed (because the other dialog
// is on stack since our dialog returns)
if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) )
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index f188527..fc4e97b 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1074,7 +1074,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
else if( rType == "image/bmp" )
{
// #i83376# try if someone has the data in image/bmp already before
- // doing the PIXMAP stuff (e.g. the gimp has this)
+ // doing the PIXMAP stuff (e.g. the Gimp has this)
bSuccess = getPasteData( selection, m_nImageBmpAtom, rData );
#if OSL_DEBUG_LEVEL > 1
if( bSuccess )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index fa733cf..4ce6f75 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3473,7 +3473,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
else
{
/*
- * do not unset the IC focuse here because would kill
+ * do not unset the IC focus here because would kill
* a lookup choice windows that might have the focus now
* mpInputContext->UnsetICFocus( this );
*/
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index e7e23aa..798e330 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::beans;
using namespace std;
/**
- * Copys a range of text to the clipboard.
+ * Copy a range of text to the clipboard.
*
* @param startOffset the start offset of copying.
* @param endOffset the end offset of copying.
@@ -124,8 +124,8 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text)
/**
* Cuts a range of text to the clipboard.
*
- * @param startOffset the start offset of cuting.
- * @param endOffset the end offset of cuting.
+ * @param startOffset the start offset of cutting.
+ * @param endOffset the end offset of cutting.
* @param success the boolean result to be returned.
*/
STDMETHODIMP CAccEditableText::cutText(long startOffset, long endOffset)
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h
index 26ea735..c1d15fb 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.h
+++ b/winaccessibility/source/UAccCOM/AccEditableText.h
@@ -68,7 +68,7 @@ public:
public:
// IAccessibleEditableText
- // Copys a range of text to the clipboard.
+ // Copies a range of text to the clipboard.
STDMETHOD(copyText)(long startOffset, long endOffset);
// Deletes a range of text.
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index 8ab03c4..23c9a60 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -265,11 +265,11 @@ class AgendaDocument(TextDocument):
'''Initializes a template.<br/>
This method does the following tasks:<br/>
- Get a Time and Date format for the document, and retrieve the null
+ get a Time and Date format for the document, and retrieve the null
date of the document (which is document-specific).<br/>
Initializes the Items Cache map.
Analyses the document:<br/>
- -find all "fille-ins" (appear as >xxx< in the document).
+ -find all "filled-ins" (appear as >xxx< in the document).
-analyze all items sections (and the tables in them).
-locate the titles and actualize them
-analyze the topics table
diff --git a/wizards/source/formwizard/develop.xba b/wizards/source/formwizard/develop.xba
index 238ac15..ce5730f 100644
--- a/wizards/source/formwizard/develop.xba
+++ b/wizards/source/formwizard/develop.xba
@@ -338,7 +338,7 @@ Dim nBaseWidth as Long
Set oLocTextShape = oTCShapeList(a)
If CurArrangement = cLeftJustified Then
If nYDBPos + nDBHeight = nMaxRowY Then
- ' The last Control was the highes in the row
+ ' The last Control was the highest in the row
nYDBPos = nSecMaxRowY + cVertDistance
Else
nYDBPos = nMaxRowY + cVertDistance
@@ -547,4 +547,4 @@ Dim i as Integer
Else
RemoveNirwanaShapes()
End If
-End Sub</script:module>
\ No newline at end of file
+End Sub</script:module>
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 6c09e8a..d0b2bc3 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
# TODO: is this still relevant?
# GCC versions 4.2.x introduced a warning "allocating zero-element array"
-# Allocating zero-element arrays is an allowed if not somewhat dubious
-# technique though, so this warning is plain wrong and has been fixed
+# Allocating zero-element arrays is an allowed if not somewhat dubious
+# technique though, so this warning is plain wrong and has been fixed
# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
# Some files in this directory use zero allocated arrays, we need to
-# diable the WaE mechanism for the GCC 4.2.x series.
+# disable the WaE mechanism for the GCC 4.2.x series.
# .IF "$(COM)"=="GCC"
# .IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
# CFLAGSWERRCXX:=
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index c9ad9f5..e2caee5 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -888,7 +888,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
}
else if( IsXMLToken( rLocalName, XML_TRANSFORM ) )
{
- // because of #85127# take svg:transform into account and hanle like
+ // because of #85127# take svg:transform into account and handle like
// draw:transform for compatibility
mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter());
}
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f0dfc81..bf0eb19 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -751,7 +751,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
//certificateUsageSSLCA. This, however, will be only set when in the trust settings dialog
//the button "This certificate can identify websites" is checked. If for example only
//"This certificate can identify mail users" is set then the end certificate can
- //be validated and the returned usage will conain certificateUsageEmailRecipient.
+ //be validated and the returned usage will contain certificateUsageEmailRecipient.
//But checking directly the root or intermediate certificate will fail. In the
//certificate path view the end certificate will be shown as valid but the others
//will be displayed as invalid.
commit 307edd412e4fe3a74378959f5d93f5a2a44f1b60
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 8 12:12:55 2015 +0200
sdext: the PDF library, not the tree
Change-Id: Ic867140ace06337f6121d7c4576eb9850577d7cb
diff --git a/sdext/README b/sdext/README
index 0007188..ed9aa33 100644
--- a/sdext/README
+++ b/sdext/README
@@ -2,7 +2,7 @@ Extensions for the Impress and Draw applications.
source/pdfimport/ - PDF import
- Uses an external poplar process to parse and handle PDF
+ Uses an external poppler process to parse and handle PDF
import as draw shapes.
source/minimizer/ - Presentation Minizer
More information about the Libreoffice-commits
mailing list