You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/08/01 04:31:57 UTC
svn commit: r1754701 [3/13] - in /openoffice/branches/gbuild-reintegration:
./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ main/
main/accessibility/inc/accessibility/standard/ main/autodoc/inc/ary/idl/
main/avmedia/source/framework/ main/ba...
Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.hxx Mon Aug 1 04:31:52 2016
@@ -121,7 +121,7 @@ namespace dbaui
SUPPLY_DOCUMENTSAVE
};
/** check if a given continuation sequence contains a given continuation type<p/>
- @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation
+ @return the index within <arg>_rContinuations</arg> of the first occurrence of a continuation
of the requested type, -1 of no such continuation exists
*/
sal_Int32 getContinuation(
Modified: openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx Mon Aug 1 04:31:52 2016
@@ -3027,7 +3027,7 @@ void Desktop::OpenClients()
// memory. May be this mechanism will be inconsistent if the configuration exists ...
// but no document inside memory corrspond to this data.
// Furter it's not acceptable to recover such documents without any UI. It can
- // need some time, where the user wont see any results and wait for finishing the office startup ...
+ // need some time, where the user won't see any results and wait for finishing the office startup ...
sal_Bool bAllowRecoveryAndSessionManagement = (
( !pArgs->IsNoRestore() ) &&
( !pArgs->IsHeadless() ) &&
@@ -3290,7 +3290,7 @@ String GetURL_Impl(
return rName;
}
- // dont touch file urls, those should already be in internal form
+ // don't touch file urls, those should already be in internal form
// they won't get better here (#112849#)
if (rName.CompareToAscii("file:" , 5) == COMPARE_EQUAL)
{
Modified: openoffice/branches/gbuild-reintegration/main/desktop/source/app/officeipcthread.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/source/app/officeipcthread.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/source/app/officeipcthread.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/source/app/officeipcthread.cxx Mon Aug 1 04:31:52 2016
@@ -676,7 +676,7 @@ void SAL_CALL OfficeIPCThread::run()
// 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 reqests that don't dispatch events may be processed before cReady is set.
cReady.wait();
// we might have decided to shutdown while we were sleeping
Modified: openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/file_image_unx.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/file_image_unx.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/file_image_unx.c (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/file_image_unx.c Mon Aug 1 04:31:52 2016
@@ -49,7 +49,7 @@ int file_image_open (file_image * image,
struct stat st;
void * p;
- if (image == 0)
+ if (image == NULL)
return (EINVAL);
image->m_base = MAP_FAILED, image->m_size = 0;
@@ -87,10 +87,10 @@ int file_image_pagein (file_image * imag
size_t k;
volatile char c = 0;
- if (image == 0)
+ if (image == NULL)
return (EINVAL);
- if ((w.m_base = image->m_base) == 0)
+ if ((w.m_base = image->m_base) == NULL)
return (EINVAL);
if ((w.m_size = image->m_size) == 0)
return (0);
@@ -135,12 +135,12 @@ int file_image_pagein (file_image * imag
*/
int file_image_close (file_image * image)
{
- if (image == 0)
+ if (image == NULL)
return (EINVAL);
if (munmap (image->m_base, image->m_size) == -1)
return (errno);
- image->m_base = 0, image->m_size = 0;
+ image->m_base = NULL, image->m_size = 0;
return (0);
}
Modified: openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/pagein.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/pagein.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/pagein.c (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/source/pagein/pagein.c Mon Aug 1 04:31:52 2016
@@ -70,7 +70,7 @@ int main (int argc, char **argv)
for (i = 1; i < argc; i++)
{
- FILE * fp = 0;
+ FILE * fp = NULL;
size_t k = 0;
if (argv[i][0] == '-')
@@ -99,10 +99,10 @@ int main (int argc, char **argv)
}
- if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0))
+ if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == NULL))
{
char path[1024];
- if ((fp = fopen (&(argv[i][1]), "r")) == 0)
+ if ((fp = fopen (&(argv[i][1]), "r")) == NULL)
{
fprintf (stderr, "fopen: %s\n", strerror(errno));
continue;
@@ -124,7 +124,7 @@ int main (int argc, char **argv)
}
else
{
- if (fp != 0)
+ if (fp != NULL)
fclose (fp);
if (do_pagein (argv[i], &k) == 0)
Modified: openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java Mon Aug 1 04:31:52 2016
@@ -283,7 +283,7 @@ public class OptionsEventHandler {
throw new com.sun.star.lang.IllegalArgumentException(
"The window is not supported by this handler", this, (short) -1);
- //To acces the separate controls of the window we need to obtain the
+ //To access the separate controls of the window we need to obtain the
//XControlContainer from window implementation
XControlContainer xContainer = (XControlContainer) UnoRuntime.queryInterface(
XControlContainer.class, aWindow);
Modified: openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/update/readme.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/update/readme.txt?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/update/readme.txt (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/update/readme.txt Mon Aug 1 04:31:52 2016
@@ -48,7 +48,7 @@ For example
.../update/updatefeed/udpate
-The different test folders for the update are also commited in project extensions/www
+The different test folders for the update are also committed in project extensions/www
so that the files can be obtain via an URL. The structure and the contents is about the
same as the content
of desktop/test/deployment/udpate
Modified: openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/version/readme.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/version/readme.txt?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/version/readme.txt (original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/test/deployment/version/readme.txt Mon Aug 1 04:31:52 2016
@@ -71,7 +71,7 @@ Things to watch for:
"OK" (replace) preselected if x < y, and "Cancel" otherwise.
- If replacing an installed version x of an extension e with a version y fails
- because y has unsatisfied dependencies, or because y has a license to wich the
+ because y has unsatisfied dependencies, or because y has a license to which the
user does not agree, version x is left installed afterwards.
- Checking for already installed versions of an extension is only done within a
Modified: openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx Mon Aug 1 04:31:52 2016
@@ -76,7 +76,7 @@ namespace drawinglayer
@param rProjection
A part of the 3D ViewTransformation, the Camera to Device transformation which
transforms coordinates to a [0.0 .. 1.0] device range in X,Y and Z. Z may be used
- as source for for Z-Buffers. This transformation may be e.g. a parallell projection,
+ as source for for Z-Buffers. This transformation may be e.g. a parallel projection,
but also a perspective one and thus may use the last line of the matrix.
@param rDeviceToView
Modified: openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx Mon Aug 1 04:31:52 2016
@@ -60,7 +60,7 @@ namespace drawinglayer
geometry::ViewInformation3D maViewInformation3D;
/** if the embedded 3D primitives contain shadow, these parameters are needed
- to extract the shadow wich is a sequence od 2D primitives and may expand
+ to extract the shadow which is a sequence od 2D primitives and may expand
the 2D range. Since every single 3D object in a scene may individually
have shadow or not, these values need to be provided and prepared. The shadow
distance itself (a 2D transformation) is part of the 3D shadow definition
Modified: openoffice/branches/gbuild-reintegration/main/drawinglayer/source/geometry/viewinformation3d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/source/geometry/viewinformation3d.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/drawinglayer/source/geometry/viewinformation3d.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/drawinglayer/source/geometry/viewinformation3d.cxx Mon Aug 1 04:31:52 2016
@@ -62,7 +62,7 @@ namespace drawinglayer
basegfx::B3DHomMatrix maOrientation;
// Camera to Device with X,Y and Z [-1.0 .. 1.0]. This is the
- // 3D to 2D projection which may be parallell or perspective. When it is perspective,
+ // 3D to 2D projection which may be parallel or perspective. When it is perspective,
// the last line of the homogen matrix will NOT be unused
basegfx::B3DHomMatrix maProjection;
Modified: openoffice/branches/gbuild-reintegration/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx Mon Aug 1 04:31:52 2016
@@ -1603,7 +1603,7 @@ namespace
/** This is the main interpreter method. It is designed to handle the given Metafile
completely inside the given context and target. It may use and modify the context and
- target. This design allows to call itself recursively wich adapted contexts and
+ target. This design allows to call itself recursively which adapted contexts and
targets as e.g. needed for the META_FLOATTRANSPARENT_ACTION where the content is expressed
as a metafile as sub-content.
Modified: openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/DOTransferable.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/DOTransferable.cxx Mon Aug 1 04:31:52 2016
@@ -510,7 +510,7 @@ OUString CDOTransferable::byteStreamToOU
sal_Int32 nWChars;
sal_Int32 nMemSize = aByteStream.getLength( );
- // if there is a trailing L"\0" substract 1 from length
+ // if there is a trailing L"\0" subtract 1 from length
if ( 0 == aByteStream[ aByteStream.getLength( ) - 2 ] &&
0 == aByteStream[ aByteStream.getLength( ) - 1 ] )
nWChars = static_cast< sal_Int32 >( nMemSize / sizeof( sal_Unicode ) ) - 1;
Modified: openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/FmtFilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/FmtFilter.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/FmtFilter.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/dtobj/FmtFilter.cxx Mon Aug 1 04:31:52 2016
@@ -287,7 +287,7 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlTo
sal_uInt32 lHTMLFmtHdr = rtl_str_getLength( aHTMLFmtHdr );
- // the office allways writes the start
+ // the office always writes the start
// and end html tag in upper cases and
// without spaces
// both tags don't allow parameters
@@ -360,7 +360,7 @@ std::string GetHtmlFormatHeader(size_t s
return htmlHeader.str();
}
-// the office allways writes the start and end html tag in upper cases and
+// the office always writes the start and end html tag in upper cases and
// without spaces both tags don't allow parameters
const std::string TAG_HTML = std::string("<HTML>");
const std::string TAG_END_HTML = std::string("</HTML>");
Modified: openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/misc/ImplHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/misc/ImplHelper.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/misc/ImplHelper.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dtrans/source/win32/misc/ImplHelper.cxx Mon Aug 1 04:31:52 2016
@@ -254,7 +254,7 @@ void SAL_CALL DeleteTargetDevice( DVTARG
//
// Return Value:
// pointer to allocated copy of ptdSrc
-// if ptdSrc==NULL then retuns NULL is returned.
+// if ptdSrc==NULL then NULL is returned.
// if ptdSrc!=NULL and memory allocation fails, then NULL is returned
//-------------------------------------------------------------------------
@@ -312,7 +312,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevic
//
// Return Value:
// returns TRUE if copy was successful;
-// retuns FALSE if not successful, e.g. one or both of the pointers
+// returns FALSE if not successful, e.g. one or both of the pointers
// were invalid or the pointers were equal
//-------------------------------------------------------------------------
Modified: openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/AccessibleContextBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/AccessibleContextBase.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/AccessibleContextBase.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/AccessibleContextBase.hxx Mon Aug 1 04:31:52 2016
@@ -331,7 +331,7 @@ protected:
void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent);
/** Check whether or not the object has been disposed (or is in the
- state of beeing disposed). If that is the case then
+ state of being disposed). If that is the case then
DisposedException is thrown to inform the (indirect) caller of the
foul deed.
*/
@@ -339,7 +339,7 @@ protected:
throw (::com::sun::star::lang::DisposedException);
/** Check whether or not the object has been disposed (or is in the
- state of beeing disposed).
+ state of being disposed).
@return TRUE, if the object is disposed or in the course
of being disposed. Otherwise, FALSE is returned.
Modified: openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/hangulhanja.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/hangulhanja.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/hangulhanja.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/inc/editeng/hangulhanja.hxx Mon Aug 1 04:31:52 2016
@@ -201,7 +201,7 @@ namespace editeng
in your document, than you have to remember the document position immediately <em>behind</em>
the changed text. In a next call to ReplaceUnit, an index of <em>0</em> will denote exactly
this position behind the previous replacement<br/>
- The reaons for this is that this class here does not know anything about your document structure,
+ The reasons for this is that this class here does not know anything about your document structure,
so after a replacement took place, it's impossible to address anything in the range from the
beginning of the portion up to the replaced text.<br/>
In the very first call to ReplaceUnit, an index of <em>0</em> denotes the very first position of
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/misc/hangulhanja.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/misc/hangulhanja.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/misc/hangulhanja.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/misc/hangulhanja.cxx Mon Aug 1 04:31:52 2016
@@ -963,7 +963,7 @@ namespace editeng
if( sChangeInto.getLength() )
{
- // change the current occurence
+ // change the current occurrence
implChange( sChangeInto );
// put into the "change all" list
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/misc/unolingu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/misc/unolingu.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/misc/unolingu.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/misc/unolingu.cxx Mon Aug 1 04:31:52 2016
@@ -418,7 +418,7 @@ void SvxLinguConfigUpdate::UpdateAll( sa
aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny );
- //! Note 1: the new values are commited when the 'aCfg' object
+ //! Note 1: the new values are committed when the 'aCfg' object
//! gets destroyed.
//! Note 2: the new settings in the configuration get applied
//! because the 'LngSvcMgr' (in linguistic/source/lngsvcmgr.hxx)
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outleeng.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outleeng.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outleeng.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outleeng.cxx Mon Aug 1 04:31:52 2016
@@ -228,7 +228,7 @@ void OutlinerEditEng::SetParaAttribs( sa
pOwner->ImplCheckNumBulletItem( (sal_uInt16)nPara );
// --> OD 2009-03-10 #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
pOwner->ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pOwner->pParaList->GetParagraphCount()) );
// <--
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outliner.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outliner.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outliner.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/outliner/outliner.cxx Mon Aug 1 04:31:52 2016
@@ -334,7 +334,7 @@ void Outliner::SetNumberingStartValue( s
pPara->SetNumberingStartValue( nNumberingStartValue );
// --> OD 2009-03-10 #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
// <--
@@ -362,7 +362,7 @@ void Outliner::SetParaIsNumberingRestart
pPara->SetParaIsNumberingRestart( bParaIsNumberingRestart );
// --> OD 2009-03-10 #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
// <--
@@ -435,7 +435,7 @@ OutlinerParaObject* Outliner::CreatePara
nCount = sal::static_int_cast< sal_uInt16 >(
pParaList->GetParagraphCount() - nStartPara );
- // When a new OutlinerParaObject is created because a paragraph is just beeing deleted,
+ // When a new OutlinerParaObject is created because a paragraph is just being deleted,
// it can happen that the ParaList is not updated yet...
if ( ( nStartPara + nCount ) > pEditEngine->GetParagraphCount() )
nCount = pEditEngine->GetParagraphCount() - nStartPara;
@@ -662,7 +662,7 @@ void Outliner::SetText( const OutlinerPa
}
// --> OD 2009-03-10 #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
ImplCheckParagraphs( 0, (sal_uInt16) (pParaList->GetParagraphCount()) );
// <--
@@ -709,7 +709,7 @@ void Outliner::AddText( const OutlinerPa
DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" );
// --> OD 2009-03-10 #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
// <--
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/rtf/svxrtf.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/rtf/svxrtf.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/rtf/svxrtf.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/rtf/svxrtf.cxx Mon Aug 1 04:31:52 2016
@@ -982,7 +982,7 @@ void SvxRTFParser::AttrGroupEnd() // den
// am Absatzanfang ? eine Position zurueck
sal_uLong nNd = pInsPos->GetNodeIdx();
MovePos( sal_False );
- // if can not move backward then later dont move forward !
+ // if can not move backward then later don't move forward !
bCrsrBack = nNd != pInsPos->GetNodeIdx();
}
@@ -991,7 +991,7 @@ void SvxRTFParser::AttrGroupEnd() // den
( pOld->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
pOld->nSttCnt <= pInsPos->GetCntIdx() ))
#if 0
-//BUG 68555 - dont test for empty paragraph or any range
+//BUG 68555 - don't test for empty paragraph or any range
&& ( nOldSttNdIdx != pInsPos->GetNodeIdx() ||
pOld->nSttCnt != pInsPos->GetCntIdx() ||
!pOld->nSttCnt )
@@ -1005,7 +1005,7 @@ void SvxRTFParser::AttrGroupEnd() // den
if( nOldSttNdIdx == pInsPos->GetNodeIdx() )
{
#if 0
-//BUG 68555 - dont reset pard attrs, if the group not begins not at start of
+//BUG 68555 - don't reset pard attrs, if the group not begins not at start of
// paragraph
// Bereich innerhalb eines Absatzes:
// alle Absatz-Attribute und StyleNo loeschen
Modified: openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unofored.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unofored.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unofored.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unofored.cxx Mon Aug 1 04:31:52 2016
@@ -222,7 +222,7 @@ sal_uInt16 GetSvxEditEngineItemState( Ed
// if we already found an item
if( pParaItem )
{
- // ... and its different to this one than the state is dont care
+ // ... and it's different to this one than the state is don't care
if( *pParaItem != *aAttrib.pAttr )
return SFX_ITEM_DONTCARE;
}
@@ -272,7 +272,7 @@ sal_uInt16 GetSvxEditEngineItemState( Ed
}
else if( bGaps )
{
- // gaps and item not set in paragraph, thats a dont care
+ // gaps and item not set in paragraph, thats a don't care
return SFX_ITEM_DONTCARE;
}
}
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/source/commonembedding/persistence.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/source/commonembedding/persistence.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/source/commonembedding/persistence.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/source/commonembedding/persistence.cxx Mon Aug 1 04:31:52 2016
@@ -80,7 +80,7 @@ uno::Sequence< beans::PropertyValue > Ge
|| aMedDescr[nInd].Name.equalsAscii( "DocumentTitle" )
|| aMedDescr[nInd].Name.equalsAscii( "InteractionHandler" )
|| aMedDescr[nInd].Name.equalsAscii( "JumpMark" )
- // || aMedDescr[nInd].Name.equalsAscii( "Password" ) makes no sence for embedded objects
+ // || aMedDescr[nInd].Name.equalsAscii( "Password" ) makes no sense for embedded objects
|| aMedDescr[nInd].Name.equalsAscii( "Preview" )
|| aMedDescr[nInd].Name.equalsAscii( "ReadOnly" )
|| aMedDescr[nInd].Name.equalsAscii( "StartPresentation" )
@@ -812,7 +812,7 @@ void OCommonEmbeddedObject::StoreDocToSt
if ( !xTempStorage.is() )
throw uno::RuntimeException(); // TODO:
- // object storage must be commited automatically
+ // object storage must be committed automatically
xTempStorage->copyToStorage( xStorage );
}
}
@@ -1221,7 +1221,7 @@ void SAL_CALL OCommonEmbeddedObject::sto
sal_Bool bTryOptimization = sal_False;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- // StoreVisualReplacement and VisualReplacement args have no sence here
+ // StoreVisualReplacement and VisualReplacement args have no sense here
if ( lObjArgs[nInd].Name.equalsAscii( "CanTryOptimization" ) )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1354,7 +1354,7 @@ void SAL_CALL OCommonEmbeddedObject::sto
sal_Bool bTryOptimization = sal_False;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- // StoreVisualReplacement and VisualReplacement args have no sence here
+ // StoreVisualReplacement and VisualReplacement args have no sense here
if ( lObjArgs[nInd].Name.equalsAscii( "CanTryOptimization" ) )
lObjArgs[nInd].Value >>= bTryOptimization;
}
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olecomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olecomponent.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olecomponent.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olecomponent.cxx Mon Aug 1 04:31:52 2016
@@ -444,7 +444,7 @@ OleComponent::OleComponent( const uno::R
OSL_ENSURE( m_pUnoOleObject, "No owner object is provided!" );
HRESULT hr = OleInitialize( NULL );
- OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfuly initialized\n" );
+ OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully initialized\n" );
if ( hr == S_OK || hr == S_FALSE )
m_bOleInitialized = sal_True;
@@ -1554,7 +1554,7 @@ uno::Any SAL_CALL OleComponent::getTrans
if ( FAILED( hr ) || !pDataObject )
throw io::IOException(); // TODO: transport error code
- // The following optimization does not make much sence currently just because
+ // The following optimization does not make much sense currently just because
// only one aspect is supported, and only three formats for the aspect are supported
// and moreover it is not guarantied that the once returned format will be supported further
// example - i52106
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleembed.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleembed.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleembed.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleembed.cxx Mon Aug 1 04:31:52 2016
@@ -328,7 +328,7 @@ sal_Bool OleEmbeddedObject::TryToConvert
xSeekable->seek( 0 );
xLoadable->load( aArgs );
- // the model is successfuly loaded, create a new storage and store the model to the storage
+ // the model is successfully loaded, create a new storage and store the model to the storage
uno::Reference< embed::XStorage > xTmpStorage = CreateTemporarySubstorage( aStorageName );
xStorDoc->storeToStorage( xTmpStorage, uno::Sequence< beans::PropertyValue >() );
xDocument->close( sal_True );
@@ -429,7 +429,7 @@ sal_Bool OleEmbeddedObject::TryToConvert
if ( bResult )
{
- // the conversion was done successfuly, now the additional initializations should happen
+ // the conversion was done successfully, now the additional initializations should happen
MoveListeners();
m_xWrappedObject->setClientSite( m_xClientSite );
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olepersist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olepersist.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olepersist.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/olepersist.cxx Mon Aug 1 04:31:52 2016
@@ -474,7 +474,7 @@ void OleEmbeddedObject::InsertVisualCach
if ( xTempOutStream.is() )
{
// the OlePres stream must have additional header
- // TODO/LATER: might need to be extended in future ( actually makes sence only for SO7 format )
+ // TODO/LATER: might need to be extended in future ( actually makes sense only for SO7 format )
uno::Reference< io::XInputStream > xInCacheStream = xCachedVisualRepresentation->getInputStream();
if ( !xInCacheStream.is() )
throw uno::RuntimeException();
@@ -1485,7 +1485,7 @@ void SAL_CALL OleEmbeddedObject::setPers
catch( uno::Exception& )
{
// TODO/LATER: detect classID of the object if possible
- // means that the object inprocess server could not be successfuly instantiated
+ // means that the object inprocess server could not be successfully instantiated
GetRidOfComponent();
}
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleregister.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleregister.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleregister.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/source/msole/oleregister.cxx Mon Aug 1 04:31:52 2016
@@ -59,7 +59,7 @@ void * SAL_CALL component_getFactory( co
OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
}
#ifdef WNT
- // the following service makes sence only on windows
+ // the following service makes sense only on windows
else if ( aImplName.equals( MSOLEDialogObjectCreator::impl_staticGetImplementationName() ) )
{
xFactory= ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ),
@@ -96,7 +96,7 @@ sal_Bool SAL_CALL component_writeInfo( v
xNewKey->createKey( rServices.getConstArray()[ind] );
#ifdef WNT
- // the following service makes sence only on windows
+ // the following service makes sense only on windows
xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
MSOLEDialogObjectCreator::impl_staticGetImplementationName() +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/EmbedContApp.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/EmbedContApp.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/EmbedContApp.java (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/EmbedContApp.java Mon Aug 1 04:31:52 2016
@@ -457,7 +457,7 @@ public class EmbedContApp extends Applet
{
try {
int nState = m_xEmbedObj.getCurrentState();
- // such a position change make sence only when object is
+ // such a position change make sense only when object is
// either inplace or ui active
if ( nState == EmbedStates.EMBED_INPLACE_ACTIVE
|| nState == EmbedStates.EMBED_UI_ACTIVE )
Modified: openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/NativeView.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/NativeView.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/NativeView.java (original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/test/Container1/NativeView.java Mon Aug 1 04:31:52 2016
@@ -51,7 +51,7 @@ public class NativeView extends java.awt
* Does nothing really.
* We can use our JNI mechanism for an already visible
* canvas only. So we overload the method for showing ( "setVisible()" )
- * and make our intialization there. BUt we try to show an empty clean
+ * and make our initialization there. BUt we try to show an empty clean
* window till there.
*/
public NativeView()
Modified: openoffice/branches/gbuild-reintegration/main/embedserv/source/embed/docholder.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embedserv/source/embed/docholder.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embedserv/source/embed/docholder.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/embedserv/source/embed/docholder.cxx Mon Aug 1 04:31:52 2016
@@ -1170,7 +1170,7 @@ HRESULT DocumentHolder::SetVisArea( cons
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
if ( aArgs[nInd].Name.equalsAscii( "WinExtent" ) )
{
- // should allways be there
+ // should always be there
uno::Sequence< sal_Int32 > aRect(4);
aRect[0] = pRect->left;
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/bibtools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/bibtools.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/bibtools.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/bibtools.hxx Mon Aug 1 04:31:52 2016
@@ -30,7 +30,7 @@ namespace bib
// source in bibbeam.cxx
void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
- // pWindow: just an system window or something wich is child of a system window
+ // pWindow: just an system window or something which is child of a system window
inline void AddToTaskPaneList( Window* pWindowToBeHandled )
{
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/general.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/general.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/general.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/bibliography/general.cxx Mon Aug 1 04:31:52 2016
@@ -851,7 +851,7 @@ sal_Bool BibGeneralPage::HandleShortCutK
DBG_ASSERT( aControls[ nCtrlIndex ].is(), "-BibGeneralPage::HandleShortCutKey(): valid index and no control?" );
uno::Reference< awt::XControl > xControl( aControls[ nCtrlIndex ], UNO_QUERY );
- DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control wich is not a control!" );
+ DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control which is not a control!" );
Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() );
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/dbpilots/groupboxwiz.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/dbpilots/groupboxwiz.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/dbpilots/groupboxwiz.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/dbpilots/groupboxwiz.cxx Mon Aug 1 04:31:52 2016
@@ -255,7 +255,7 @@ namespace dbp
// no need to initialize the list of radios here
// (we're the only one affecting this special setting, so it will be in the same state as last time this
- // page was commited)
+ // page was committed)
implCheckMoveButtons();
}
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/logging/csvformatter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/logging/csvformatter.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/logging/csvformatter.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/logging/csvformatter.cxx Mon Aug 1 04:31:52 2016
@@ -149,7 +149,7 @@ namespace
// special treatment for the last character
if(quote_char==str[str_length-1])
buf.append(quote_char);
- // iterating backwards because the index at which we insert wont be shifted
+ // iterating backwards because the index at which we insert won't be shifted
// when moving that way.
for(sal_Int32 i = str_length; i>=0; )
{
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSFolders.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSFolders.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSFolders.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSFolders.cxx Mon Aug 1 04:31:52 2016
@@ -96,7 +96,7 @@ namespace
if ( pProfileByEnv )
{
sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() );
- // asume that this is fine, no further checks
+ // assume that this is fine, no further checks
}
else
{
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx Mon Aug 1 04:31:52 2016
@@ -190,7 +190,7 @@ namespace connectivity
ProductStruct &m_Product = m_ProductProfileList[index];
if (m_Product.mCurrentProfileName.getLength() != 0)
{
- //default profile setted in mozilla registry
+ //default profile set in mozilla registry
return m_Product.mCurrentProfileName;
}
if (m_Product.mProfileList.size() == 0)
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/ole/unoconversionutilities.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/ole/unoconversionutilities.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/ole/unoconversionutilities.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/ole/unoconversionutilities.hxx Mon Aug 1 04:31:52 2016
@@ -325,7 +325,7 @@ void UnoConversionUtilities<T>::variantT
// the sequence expects. Thus variantToAny produces the correct type
// E.g. An Array object contains VT_I4 and the sequence expects shorts
// than the vartype must be changed. The reason is, you can't specify the
- // type in JavaScript and the script engine determines the type beeing used.
+ // type in JavaScript and the script engine determines the type being used.
switch( ptype.getTypeClass())
{
case TypeClass_CHAR: // could be: new Array( 12, 'w', "w")
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/invite_job.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/invite_job.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/invite_job.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/invite_job.cxx Mon Aug 1 04:31:52 2016
@@ -41,7 +41,7 @@ using ::rtl::OUString;
namespace
{
- // dont show Invitation, when:
+ // don't show Invitation, when:
// -nofirststartwizard commandline switch is present
// [add additional conditions here]
static bool lcl_IsInvitationAllowed()
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/myconfigurationhelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/myconfigurationhelper.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/myconfigurationhelper.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/oooimprovement/myconfigurationhelper.hxx Mon Aug 1 04:31:52 2016
@@ -162,7 +162,7 @@ namespace oooimprovement
* The cached configuration access must be provided here.
*
* @param xCFG
- * the configuration root, where changes should be commited.
+ * the configuration root, where changes should be committed.
*
* @throw css::uno::Any exceptions the underlying configuration can throw.
* E.g. uno::Exception if the provided configuration
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/selectlabeldialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/selectlabeldialog.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/selectlabeldialog.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/selectlabeldialog.cxx Mon Aug 1 04:31:52 2016
@@ -106,7 +106,7 @@ namespace pcr
// and insert all entries below this root into the listbox
if (xSearch.is())
{
- // check wich service the allowed components must suppport
+ // check which service the allowed components must suppport
sal_Int16 nClassId = 0;
try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? SERVICE_COMPONENT_GROUPBOX : SERVICE_COMPONENT_FIXEDTEXT;
Modified: openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/stringrepresentation.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/stringrepresentation.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/stringrepresentation.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/stringrepresentation.cxx Mon Aug 1 04:31:52 2016
@@ -137,7 +137,7 @@ private:
/** converts a string into his constant value if it exists, otherwise the type converter is used.
* \param _rValue the value to be converted
- * \param _ePropertyType teh type of the propery to be converted into
+ * \param _ePropertyType the type of the propery to be converted into
* \return the converted value
*/
uno::Any convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType );
Modified: openoffice/branches/gbuild-reintegration/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/external_deps.lst?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/external_deps.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/external_deps.lst Mon Aug 1 04:31:52 2016
@@ -26,7 +26,6 @@
# The primary fallback site.
# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
-
OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
# Must not fallback to svn
@@ -162,26 +161,26 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENS
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 97262fe54dddaf583eaaee3497a426e1
- name = apr-1.4.5.tar.gz
+ MD5 = 98492e965963f852ab29f9e61b2ad700
+ name = apr-1.5.2.tar.gz
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 666a5d56098a9debf998510e304c8095
- name = apr-util-1.4.1.tar.gz
+ MD5 = 866825c04da827c6e5f53daff5569f42
+ name = apr-util-1.5.4.tar.gz
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
- MD5 = 8127a65e8c3b08856093099b52599c86
- name = libxml2-2.7.8.tar.gz
+ MD5 = daece17e045f1c107610e137ab50c179
+ name = libxml2-2.9.3.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
- MD5 = e61d0364a30146aaa3001296f853b2b9
- name = libxslt-1.1.26.tar.gz
+ MD5 = 9667bf6f9310b957254fdcf6596600b7
+ name = libxslt-1.1.28.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
@@ -228,9 +227,9 @@ if (SYSTEM_EXPAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
- MD5 = ecb2e37e45c9933e2a963cabe03670ab
- name = curl-7.19.7.tar.gz
- URL1 = http://curl.haxx.se/download/curl-7.19.7.tar.gz
+ MD5 = 2feb3767b958add6a177c6602ff21e8c
+ name = curl-7.49.1.tar.gz
+ URL1 = http://curl.haxx.se/download/curl-7.49.1.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES)
@@ -265,9 +264,10 @@ if (RAT_JAR_HOME==BUILD)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
- MD5 = ec1941a74d3ef513c4ce57a9092b74e1
- name = bsh-2.0b5-src.zip
- URL1 = http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/$(name)
+ MD5 = beeca87be45ec87d241ddd0e1bad80c1
+ name = bsh-2.0b6-src.zip
+ URL1 = https://bintray.com/artifact/download/beanshell/Beanshell/org/apache-extras/beanshell/bsh/2.0b6/$(name)
+ URL2 = http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/$(name)
###############################################################################
# Libraries with category B license
@@ -311,9 +311,9 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
- MD5 = 067a04150b1d8b64f7da3019688a7547
- name = nss-3.14.4-with-nspr-4.9.5.tar.gz
- URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_4_RTM/src/$(name)
+ MD5 = 4ec9a36c0f7c9360b149491c013b8d50
+ name = nss-3.25-with-nspr-4.12.tar.gz
+ URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
Modified: openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/basecontainer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/basecontainer.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/basecontainer.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/basecontainer.hxx Mon Aug 1 04:31:52 2016
@@ -198,7 +198,7 @@ class BaseContainer : public BaseLock
of the global instance m_rCache, and will be used to change the
configuration.
- @descr If no exception occures, its guaranteed, that the member m_rFlushCache
+ @descr If no exception occurs, its guaranteed, that the member m_rFlushCache
was initialized right and can be used further.
*/
void impl_initFlushMode()
Modified: openoffice/branches/gbuild-reintegration/main/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl Mon Aug 1 04:31:52 2016
@@ -90,7 +90,7 @@
<xsl:param name="sourceBaseURL" select="'./'" />
<!-- OPTIONAL: (MANDATORY: for session management by URL rewriting)
- Useful for WebApplications: if a HTTP session is not cookie based, URL rewriting is beeing used (the session is appended to the URL).
+ Useful for WebApplications: if a HTTP session is not cookie based, URL rewriting is being used (the session is appended to the URL).
This URL session is used for example when links to graphics are created by XSLT. Otherwise the user havt to log again in for every graphic he liks to see. -->
<xsl:param name="optionalURLSuffix" />
Modified: openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl Mon Aug 1 04:31:52 2016
@@ -287,7 +287,7 @@
Scenarios tabstops
1) style:type of style:tab-stop is 'right' and earlier tabStop is not right
- -> Earlier text-nodes and following text-nodes, will be put into an inner table, with two TD first aligned left, with proceding textnodes, the latter aligned right.
+ -> Earlier text-nodes and following text-nodes, will be put into an inner table, with two TD first aligned left, with proceeding textnodes, the latter aligned right.
2) style:type is 'right' and earlier tabStop is right
-> following text-nodes, will be put into a right aligned TD
Modified: openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl Mon Aug 1 04:31:52 2016
@@ -1975,7 +1975,7 @@
</xsl:variable>
<!-- Numbering is being done by this transformation creating a HTML span representing the number label
The html:span represents the list item/header label (e.g. 1.A.III)
- As the html:span is usually a inline element is formated by CSS as block element to use width upon it,
+ As the html:span is usually a inline element is formatted by CSS as block element to use width upon it,
to disable the caridge return float:left is used and later neglected -->
<xsl:element name="span">
<xsl:if test="$listLevelStyle/@text:style-name">
Modified: openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl Mon Aug 1 04:31:52 2016
@@ -102,7 +102,7 @@
<xsl:param name="sourceBaseURL" select="'./'" />
<!-- OPTIONAL: (MANDATORY: for session management by URL rewriting)
- Useful for WebApplications: if a HTTP session is not cookie based, URL rewriting is beeing used (the session is appended to the URL).
+ Useful for WebApplications: if a HTTP session is not cookie based, URL rewriting is being used (the session is appended to the URL).
This URL session is used for example when links to graphics are created by XSLT. Otherwise the user havt to log again in for every graphic he liks to see. -->
<xsl:param name="optionalURLSuffix" />
Modified: openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk Mon Aug 1 04:31:52 2016
@@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,forui))
$(eval $(call gb_Library_add_package_headers,forui,formula_inc))
-$(eval $(call gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula))
-
$(eval $(call gb_Library_set_include,forui,\
$$(INCLUDE) \
-I$(SRCDIR)/formula/inc \
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerpropertyset.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerpropertyset.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerpropertyset.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerpropertyset.hxx Mon Aug 1 04:31:52 2016
@@ -45,7 +45,7 @@
namespace framework
{
-class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
+class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initialization of mutex member! Must be first of baseclasses.
public ::com::sun::star::lang::XServiceInfo ,
public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OBroadcastHelper ,
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerseparatorpropertyset.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerseparatorpropertyset.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/classes/actiontriggerseparatorpropertyset.hxx Mon Aug 1 04:31:52 2016
@@ -42,7 +42,7 @@
namespace framework
{
-class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
+class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct for right initialization of mutex member! Must be first of baseclasses.
public ::com::sun::star::lang::XServiceInfo ,
public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OBroadcastHelper ,
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/classes/filtercachedata.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/classes/filtercachedata.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/classes/filtercachedata.hxx Mon Aug 1 04:31:52 2016
@@ -74,8 +74,8 @@ namespace framework{
#define PACKAGENAME_TYPEDETECTION_STANDARD DECLARE_ASCII("Office.TypeDetection" ) /// Names of our configuration files.
#define PACKAGENAME_TYPEDETECTION_ADDITIONAL DECLARE_ASCII("Office.TypeDetectionAdditional" )
#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration paths
-#define PROPERTY_SEPERATOR sal_Unicode(',') /// seperator for own formated property strings of types and filters
-#define LIST_SEPERATOR sal_Unicode(';') /// seperator for own formated lists as part of our own formated type- or filter-string
+#define PROPERTY_SEPERATOR sal_Unicode(',') /// seperator for own formatted property strings of types and filters
+#define LIST_SEPERATOR sal_Unicode(';') /// seperator for own formatted lists as part of our own formatted type- or filter-string
#define LOCALE_FALLBACK DECLARE_ASCII("en-US" ) /// fallback, if configuration can't give us current set locale ...
#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
@@ -705,8 +705,8 @@ class DataContainer : private ThreadHelp
@descr We use the ConfigItem mechanism to read/write values from/to configuration.
This implementation could be used to handle standard AND additional filter configurations in the same way.
We set a data container pointer for filling or reading ... this class use it temp.
- After successfuly calling of read(), we can use filled container directly or merge it with an existing one.
- After successfuly calling of write() all values of given data container are flushed to our configuration.
+ After successfully calling of read(), we can use filled container directly or merge it with an existing one.
+ After successfully calling of write() all values of given data container are flushed to our configuration.
@implements -
@base ConfigItem
@@ -730,13 +730,13 @@ class FilterCFGAccess : public ::utl::Co
void write ( DataContainer& rData ,
DataContainer::ECFGType eType ); // write values from given struct to configuration
- static ::rtl::OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties
+ static ::rtl::OUString encodeTypeData ( const FileType& aType ); // build own formatted string of type properties
static void decodeTypeData ( const ::rtl::OUString& sData ,
FileType& aType );
- static ::rtl::OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties
+ static ::rtl::OUString encodeFilterData( const Filter& aFilter ); // build own formatted string of filter properties
static void decodeFilterData( const ::rtl::OUString& sData ,
Filter& aFilter );
- static ::rtl::OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList
+ static ::rtl::OUString encodeStringList( const OUStringList& lList ); // build own formatted string of OUStringList
static OUStringList decodeStringList( const ::rtl::OUString& sValue );
void setProductName ( OUStringHashMap& lUINames );
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/classes/imagewrapper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/classes/imagewrapper.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/classes/imagewrapper.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/classes/imagewrapper.hxx Mon Aug 1 04:31:52 2016
@@ -35,7 +35,7 @@
namespace framework
{
-class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase , // Struct for right initialization of mutex member! Must be first of baseclasses.
public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap,
::com::sun::star::lang::XUnoTunnel >
{
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/classes/protocolhandlercache.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/classes/protocolhandlercache.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/classes/protocolhandlercache.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/classes/protocolhandlercache.hxx Mon Aug 1 04:31:52 2016
@@ -163,8 +163,8 @@ class FWI_DLLPUBLIC HandlerCache
@short implements configuration access for handler configuration
@descr We use the ConfigItem mechanism to read/write values from/to configuration.
We set a data container pointer for filling or reading ... this class use it temp.
- After successfuly calling of read(), we can use filled container directly or merge it with an existing one.
- After successfuly calling of write() all values of given data container are flushed to our configuration -
+ After successfully calling of read(), we can use filled container directly or merge it with an existing one.
+ After successfully calling of write() all values of given data container are flushed to our configuration -
but current implementation doesn't support writeing really.
@base ::utl::ConfigItem
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/basedispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/basedispatcher.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/basedispatcher.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/basedispatcher.hxx Mon Aug 1 04:31:52 2016
@@ -86,7 +86,7 @@ namespace framework{
between these different "loading threads".
This is the reason to implement this dynamicly list.
- @attention I maked class LoaderThreads threadsafe! Using will be easier in a multithreaded environment.
+ @attention I marked class LoaderThreads threadsafe! Using will be easier in a multithreaded environment.
struct DispatchBinding doesn't need that!
*//*-*************************************************************************************************************/
struct LoadBinding
@@ -180,7 +180,7 @@ class LoaderThreads : private ::std::vec
}
//---------------------------------------------------------------------------------------------------------
- /// search for handler thread in list wich match given parameter and delete it
+ /// search for handler thread in list which match given parameter and delete it
inline sal_Bool searchAndForget( const css::uno::Reference < css::frame::XDispatchResultListener >& rListener, LoadBinding& aBinding )
{
ResetableGuard aGuard( m_aLock );
@@ -199,7 +199,7 @@ class LoaderThreads : private ::std::vec
}
//---------------------------------------------------------------------------------------------------------
- /// search for loader thread in list wich match given parameter and delete it
+ /// search for loader thread in list which match given parameter and delete it
inline sal_Bool searchAndForget( const css::uno::Reference< css::frame::XFrameLoader > xLoader, LoadBinding& aBinding )
{
ResetableGuard aGuard( m_aLock );
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/closedispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/closedispatcher.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/closedispatcher.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/closedispatcher.hxx Mon Aug 1 04:31:52 2016
@@ -258,7 +258,7 @@ class CloseDispatcher : public css::lang
/** @short calls XDesktop->terminate().
@descr No office code has to be called
- afterwards! Because the process is dieing ...
+ afterwards! Because the process is dying ...
The only exception is a might be registered
listener at this instance here.
Because he should know, that such things will happen :-)
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/helpagentdispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/helpagentdispatcher.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/helpagentdispatcher.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/helpagentdispatcher.hxx Mon Aug 1 04:31:52 2016
@@ -140,7 +140,7 @@ class HelpAgentDispatcher : public css:
/** @short ensures that the agent's window exists
@descr We create the agent window on demand. But afterwards we hold it alive till
this helpagent dispatcher dies. The agent window will be made visible/hidden
- in case a new dispatch occures or in case the timer expired.
+ in case a new dispatch occurs or in case the timer expired.
@return [sal_Bool]
sal_True in case the member m_xAgentWindow is a valid reference;
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/oxt_handler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/oxt_handler.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/oxt_handler.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/dispatch/oxt_handler.hxx Mon Aug 1 04:31:52 2016
@@ -201,7 +201,7 @@ class Oxt_Handler : // interfaces
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// global uno service factory to create new services
- css::uno::Reference< css::uno::XInterface > m_xSelfHold ; /// we must protect us against dieing during async(!) dispatch() call!
+ css::uno::Reference< css::uno::XInterface > m_xSelfHold ; /// we must protect us against dying during async(!) dispatch() call!
css::uno::Reference< css::frame::XDispatchResultListener > m_xListener ;
}; // class Oxt_Handler
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/helper/persistentwindowstate.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/helper/persistentwindowstate.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/helper/persistentwindowstate.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/helper/persistentwindowstate.hxx Mon Aug 1 04:31:52 2016
@@ -148,7 +148,7 @@ class PersistentWindowState : // inter
needed to create needed uno resources.
@param xFrame
- contains the component, wich must be identified.
+ contains the component, which must be identified.
@return [string]
a module identifier for the current frame component.
@@ -193,7 +193,7 @@ class PersistentWindowState : // inter
@param sModuleName
identifies the application module, where the
- information should be setted on.
+ information should be set on.
@param sWindowState
contains the information about position and size.
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/helper/propertysetcontainer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/helper/propertysetcontainer.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/helper/propertysetcontainer.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/helper/propertysetcontainer.hxx Mon Aug 1 04:31:52 2016
@@ -39,7 +39,7 @@ namespace framework
{
class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer ,
- public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
+ public ThreadHelpBase , // Struct for right initialization of mutex member! Must be first of baseclasses.
public ::cppu::OWeakObject
{
public:
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/helper/titlebarupdate.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/helper/titlebarupdate.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/helper/titlebarupdate.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/helper/titlebarupdate.hxx Mon Aug 1 04:31:52 2016
@@ -197,7 +197,7 @@ class TitleBarUpdate : // interfaces
of our frame.
@param xFrame
- contains the component, wich must be identified.
+ contains the component, which must be identified.
@param rInfo
describe the module in its details.
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/job.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/job.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/job.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/job.hxx Mon Aug 1 04:31:52 2016
@@ -182,7 +182,7 @@ class Job : public css::lang::XTypeProv
indicates in which state the internal job currently exist.
We can use this information to throw any suitable veto exception
- to prevent the environment against dieing or suppress superflous dispose()
+ to prevent the environment against dying or suppress superflous dispose()
calls at the job.
*/
ERunState m_eRunState;
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdata.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdata.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdata.hxx Mon Aug 1 04:31:52 2016
@@ -143,7 +143,7 @@ class JobData : private ThreadHelpBase
};
/** Some jobs can be registered to "logical events", which are generated on demand if another document event
- occures. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance.
+ occurs. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance.
And normaly the original event is transported as parameter set to the executed job. But then such job
can't differ between e.g. "OnNew" and "onDocumentOpened".
That's why we must know, for which type of event the job was really triggered .-)
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdispatch.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdispatch.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdispatch.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/jobs/jobdispatch.hxx Mon Aug 1 04:31:52 2016
@@ -71,7 +71,7 @@ namespace framework{
/**
@short implements a dispatch object for jobs
@descr Such dispatch object will be used by the generic dispatch mechanism if
- an URL "vnd.sun.star.job:alias=<name>" occures.
+ an URL "vnd.sun.star.job:alias=<name>" occurs.
Then an instance of this class will be created and used.
This new instance will be called within his method
dispatch() or dispatchWithNotification() for executing the
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/macros/debug/assertion.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/macros/debug/assertion.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/macros/debug/assertion.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/macros/debug/assertion.hxx Mon Aug 1 04:31:52 2016
@@ -48,7 +48,7 @@
//
// active for "non product":
//
-// 4) LOG_ASSERT( BCONDITION, STEXT ) assert some critical errors wich depend from given condition
+// 4) LOG_ASSERT( BCONDITION, STEXT ) assert some critical errors which depend from given condition
// 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error
// 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition
//
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/queries.h
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/queries.h?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/queries.h (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/queries.h Mon Aug 1 04:31:52 2016
@@ -141,7 +141,7 @@ class QueryBuilder
}
//---------------------------------------------------------------------------------------------------------
- // forget all setted params and start with empty ones
+ // forget all set params and start with empty ones
// Attention: base of query isn't changed!
//---------------------------------------------------------------------------------------------------------
void resetParams()
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/recording/dispatchrecordersupplier.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/recording/dispatchrecordersupplier.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/recording/dispatchrecordersupplier.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/recording/dispatchrecordersupplier.hxx Mon Aug 1 04:31:52 2016
@@ -86,7 +86,7 @@ class DispatchRecorderSupplier : // i
//_______________________________________
/** provided dispatch recorder of this supplier instance
- @life Is controlled from outside. Because this variable is setted
+ @life Is controlled from outside. Because this variable is set
from there and not created internaly. But we release our
reference to it if we die.
*/
Modified: openoffice/branches/gbuild-reintegration/main/framework/inc/services/autorecovery.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/services/autorecovery.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/inc/services/autorecovery.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/inc/services/autorecovery.hxx Mon Aug 1 04:31:52 2016
@@ -128,7 +128,7 @@ struct DispatchParams
/**
implements the functionality of AutoSave and AutoRecovery
of documents - including features of an EmergencySave in
- case a GPF occures.
+ case a GPF occurs.
*/
class AutoRecovery : public css::lang::XTypeProvider
, public css::lang::XServiceInfo
@@ -761,7 +761,7 @@ class AutoRecovery : public css::lang:
only if removing oft he old file was successfully.
If this method returns without an exception - everything
was OK. Otherwhise the info struct can be analyzed to
- get more information, e.g. when the problem occures.
+ get more information, e.g. when the problem occurs.
@param sBackupPath
the base path for saving such temp files.