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 [11/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/b...
Modified: openoffice/branches/gbuild-reintegration/main/sal/qa/osl/mutex/osl_Mutex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/qa/osl/mutex/osl_Mutex.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/qa/osl/mutex/osl_Mutex.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/qa/osl/mutex/osl_Mutex.cxx Mon Aug 1 04:31:52 2016
@@ -490,7 +490,7 @@ namespace osl_Mutex
if ( bRes2 == sal_True )
aMutex.release( );
- ASSERT_TRUE(bRes1 == sal_False && bRes2 == sal_True && bRunning == sal_True) << "release Mutex: try to aquire before and after the mutex has been released";
+ ASSERT_TRUE(bRes1 == sal_False && bRes2 == sal_True && bRunning == sal_True) << "release Mutex: try to acquire before and after the mutex has been released";
}
@@ -503,7 +503,7 @@ namespace osl_Mutex
sal_Bool bRes1 = aMutex.release( );
sal_Bool bRes2 = aMutex.release( );
- ASSERT_TRUE(bRes1 == sal_False && bRes2 == sal_False) << "release Mutex: mutex should not be released without aquire, should not release twice. although the behaviour is still under discussion, this test is passed on (LINUX), not passed on (SOLARIS)&(WINDOWS)";
+ ASSERT_TRUE(bRes1 == sal_False && bRes2 == sal_False) << "release Mutex: mutex should not be released without acquire, should not release twice. although the behaviour is still under discussion, this test is passed on (LINUX), not passed on (SOLARIS)&(WINDOWS)";
#endif
}
@@ -625,7 +625,7 @@ namespace osl_Guard
aMutex.release( );
myThread.join( );
- ASSERT_TRUE(bRes == sal_True) << "GuardThread constructor: reference initialization, aquire the mutex before running the thread, then check if it is blocking.";
+ ASSERT_TRUE(bRes == sal_True) << "GuardThread constructor: reference initialization, acquire the mutex before running the thread, then check if it is blocking.";
}
} // namespace osl_Guard
@@ -682,7 +682,7 @@ namespace osl_ClearableGuard
/// it will return sal_False if the aMutex has not been Guarded.
sal_Bool bRes = aMutex.release( );
- ASSERT_TRUE(bRes == sal_True) << "ClearableMutexGuard constructor, test the aquire operation when initilized.";
+ ASSERT_TRUE(bRes == sal_True) << "ClearableMutexGuard constructor, test the acquire operation when initilized.";
}
TEST_F(ClearableGuardConstructor, ctor_002 )
@@ -695,7 +695,7 @@ namespace osl_ClearableGuard
/// it will return sal_False if the aMutex has not been Guarded.
sal_Bool bRes = aMutex.release( );
- ASSERT_TRUE(bRes == sal_True) << "ClearableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.";
+ ASSERT_TRUE(bRes == sal_True) << "ClearableMutexGuard constructor, test the acquire operation when initilized, we use reference constructor this time.";
}
class clear : public ::testing::Test
@@ -806,7 +806,7 @@ namespace osl_ResettableGuard
/// it will return sal_False if the aMutex has not been Guarded.
sal_Bool bRes = aMutex.release( );
- ASSERT_TRUE(bRes == sal_True) << "ResettableMutexGuard constructor, test the aquire operation when initilized.";
+ ASSERT_TRUE(bRes == sal_True) << "ResettableMutexGuard constructor, test the acquire operation when initilized.";
}
TEST_F(ctor, ctor_002 )
@@ -819,7 +819,7 @@ namespace osl_ResettableGuard
/// it will return sal_False if the aMutex has not been Guarded.
sal_Bool bRes = aMutex.release( );
- ASSERT_TRUE(bRes == sal_True) << "ResettableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.";
+ ASSERT_TRUE(bRes == sal_True) << "ResettableMutexGuard constructor, test the acquire operation when initilized, we use reference constructor this time.";
}
@@ -863,7 +863,7 @@ namespace osl_ResettableGuard
myMutexGuard.reset( );
sal_Bool bRes1 = aMutex.release( );
- ASSERT_TRUE(( sal_False == bRes ) && ( sal_True == bRes1 )) << "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without aquire, so it can not passed on (SOLARIS), but not the reason for reset_002";
+ ASSERT_TRUE(( sal_False == bRes ) && ( sal_True == bRes1 )) << "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without acquire, so it can not passed on (SOLARIS), but not the reason for reset_002";
#endif
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/qa/osl/process/osl_Thread.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/qa/osl/process/osl_Thread.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/qa/osl/process/osl_Thread.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/qa/osl/process/osl_Thread.cxx Mon Aug 1 04:31:52 2016
@@ -580,7 +580,7 @@ namespace osl_Thread
myThread* newthread = new myThread();
sal_Bool res1 = newthread->create();
sal_Bool res2 = newthread->create();
- printf("In non pro, an assertion should occured. This behaviour is right.\n");
+ printf("In non pro, an assertion should occurred. This behaviour is right.\n");
termAndJoinThread(newthread);
delete newthread;
Modified: openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_Socket.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_Socket.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_Socket.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_Socket.cxx Mon Aug 1 04:31:52 2016
@@ -824,7 +824,7 @@ namespace osl_SocketAddr
ASSERT_TRUE(saSocketAddr.is( ) == sal_True &&
( saSocketAddr.getPort( ) == IP_PORT_FTP )/*&&
- ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */) << "test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.";
+ ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */) << "test for SocketAddr tcpip specific constructor function: do a constructor using tcpip spec, check the result.";
}
//same as is_002
@@ -833,7 +833,7 @@ namespace osl_SocketAddr
/// tcpip-specif constructor.
::osl::SocketAddr saSocketAddr( aHostIpInval1, IP_PORT_MYPORT2 );
- ASSERT_TRUE(sal_False == saSocketAddr.is( )) << "test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail";
+ ASSERT_TRUE(sal_False == saSocketAddr.is( )) << "test for SocketAddr tcpip specific constructor function: using an invalid IP address, the socketaddr ctors should fail";
}
/** testing the method:
Modified: openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_SocketAddr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_SocketAddr.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_SocketAddr.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/qa/osl/socket/osl_SocketAddr.cxx Mon Aug 1 04:31:52 2016
@@ -198,7 +198,7 @@ namespace osl_SocketAddr
ASSERT_TRUE(saSocketAddr.is( ) == sal_True &&
( saSocketAddr.getPort( ) == IP_PORT_FTP )/*&&
- ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */) << "test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.";
+ ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */) << "test for SocketAddr tcpip specific constructor function: do a constructor using tcpip spec, check the result.";
}
//same as is_002
@@ -207,7 +207,7 @@ namespace osl_SocketAddr
/// tcpip-specif constructor.
::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT2 );
- ASSERT_TRUE(sal_False == saSocketAddr.is( )) << "test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail";
+ ASSERT_TRUE(sal_False == saSocketAddr.is( )) << "test for SocketAddr tcpip specific constructor function: using an invalid IP address, the socketaddr ctors should fail";
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_arena.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_arena.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_arena.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_arena.c Mon Aug 1 04:31:52 2016
@@ -62,7 +62,7 @@ static struct rtl_arena_list_st g_arena_
*
* @internal
*/
-static rtl_arena_type * gp_arena_arena = 0;
+static rtl_arena_type * gp_arena_arena = NULL;
/** gp_machdep_arena
@@ -72,7 +72,7 @@ static rtl_arena_type * gp_arena_arena =
*
* @internal
*/
-static rtl_arena_type * gp_machdep_arena = 0;
+static rtl_arena_type * gp_machdep_arena = NULL;
static void *
@@ -94,7 +94,7 @@ rtl_machdep_pagesize (void);
/** gp_default_arena
*/
-rtl_arena_type * gp_default_arena = 0;
+rtl_arena_type * gp_default_arena = NULL;
/** rtl_arena_init()
@@ -150,7 +150,7 @@ rtl_arena_segment_populate (
sal_Size size = rtl_machdep_pagesize();
span = rtl_machdep_alloc(gp_machdep_arena, &size);
- if (span != 0)
+ if (span != NULL)
{
rtl_arena_segment_type *first, *last, *head;
sal_Size count = size / sizeof(rtl_arena_segment_type);
@@ -173,7 +173,7 @@ rtl_arena_segment_populate (
first->m_type = 0;
}
}
- return (span != 0);
+ return (span != NULL);
}
@@ -190,7 +190,7 @@ rtl_arena_segment_get (
{
rtl_arena_segment_type * head;
- OSL_ASSERT(*ppSegment == 0);
+ OSL_ASSERT(*ppSegment == NULL);
head = &(arena->m_segment_reserve_head);
if ((head->m_snext != head) || rtl_arena_segment_populate (arena))
@@ -232,7 +232,7 @@ rtl_arena_segment_put (
QUEUE_INSERT_HEAD_NAMED(head, (*ppSegment), s);
/* clear */
- (*ppSegment) = 0;
+ (*ppSegment) = NULL;
}
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
@@ -317,7 +317,7 @@ rtl_arena_hash_rescale (
new_bytes = new_size * sizeof(rtl_arena_segment_type*);
new_table = (rtl_arena_segment_type **)rtl_arena_alloc (gp_arena_arena, &new_bytes);
- if (new_table != 0)
+ if (new_table != NULL)
{
rtl_arena_segment_type ** old_table;
sal_Size old_size, i;
@@ -361,7 +361,7 @@ rtl_arena_hash_rescale (
for (i = 0; i < old_size; i++)
{
rtl_arena_segment_type * curr = old_table[i];
- while (curr != 0)
+ while (curr != NULL)
{
rtl_arena_segment_type * next = curr->m_fnext;
rtl_arena_segment_type ** head;
@@ -372,7 +372,7 @@ rtl_arena_hash_rescale (
curr = next;
}
- old_table[i] = 0;
+ old_table[i] = NULL;
}
RTL_MEMORY_LOCK_RELEASE(&(arena->m_lock));
@@ -429,7 +429,7 @@ rtl_arena_hash_remove (
#endif /* OSL_DEBUG_LEVEL */
segpp = &(arena->m_hash_table[RTL_ARENA_HASH_INDEX(arena, addr)]);
- while ((segment = *segpp) != 0)
+ while ((segment = *segpp) != NULL)
{
if (segment->m_addr == addr)
{
@@ -442,8 +442,8 @@ rtl_arena_hash_remove (
segpp = &(segment->m_fnext);
}
- OSL_POSTCOND(segment != 0, "rtl_arena_hash_remove(): bad free.");
- if (segment != 0)
+ OSL_POSTCOND(segment != NULL, "rtl_arena_hash_remove(): bad free.");
+ if (segment != NULL)
{
OSL_POSTCOND(segment->m_size == size, "rtl_arena_hash_remove(): wrong size.");
@@ -490,7 +490,7 @@ rtl_arena_segment_alloc (
{
int index = 0;
- OSL_ASSERT(*ppSegment == 0);
+ OSL_ASSERT(*ppSegment == NULL);
if (!RTL_MEMORY_ISP2(size))
{
int msb = highbit(size);
@@ -528,12 +528,12 @@ rtl_arena_segment_alloc (
}
dequeue_and_leave:
- if (*ppSegment != 0)
+ if (*ppSegment != NULL)
{
/* remove from freelist */
rtl_arena_freelist_remove (arena, (*ppSegment));
}
- return (*ppSegment != 0);
+ return (*ppSegment != NULL);
}
@@ -550,15 +550,15 @@ rtl_arena_segment_create (
rtl_arena_segment_type ** ppSegment
)
{
- OSL_ASSERT((*ppSegment) == 0);
+ OSL_ASSERT((*ppSegment) == NULL);
if (arena->m_source_alloc != 0)
{
rtl_arena_segment_get (arena, ppSegment);
- if (*ppSegment != 0)
+ if (*ppSegment != NULL)
{
- rtl_arena_segment_type * span = 0;
+ rtl_arena_segment_type * span = NULL;
rtl_arena_segment_get (arena, &span);
- if (span != 0)
+ if (span != NULL)
{
/* import new span from source arena */
RTL_MEMORY_LOCK_RELEASE(&(arena->m_lock));
@@ -747,8 +747,8 @@ rtl_arena_activate (
void (SAL_CALL * source_free) (rtl_arena_type *, void *, sal_Size)
)
{
- OSL_ASSERT(arena != 0);
- if (arena != 0)
+ OSL_ASSERT(arena != NULL);
+ if (arena != NULL)
{
(void) snprintf (arena->m_name, sizeof(arena->m_name), "%s", name);
@@ -852,7 +852,7 @@ rtl_arena_deactivate (
/* cleanup still used segment(s) */
for (i = 0, n = arena->m_hash_size; i < n; i++)
{
- while ((segment = arena->m_hash_table[i]) != 0)
+ while ((segment = arena->m_hash_table[i]) != NULL)
{
/* pop from hash table */
arena->m_hash_table[i] = segment->m_fnext, segment->m_fnext = segment->m_fprev = segment;
@@ -998,7 +998,7 @@ SAL_CALL rtl_arena_destroy (
rtl_arena_type * arena
)
{
- if (arena != 0)
+ if (arena != NULL)
{
rtl_arena_deactivate (arena);
rtl_arena_destructor (arena);
@@ -1293,7 +1293,7 @@ rtl_arena_once_init (void)
/* machdep (pseudo) arena */
static rtl_arena_type g_machdep_arena;
- OSL_ASSERT(gp_machdep_arena == 0);
+ OSL_ASSERT(gp_machdep_arena == NULL);
VALGRIND_CREATE_MEMPOOL(&g_machdep_arena, 0, 0);
rtl_arena_constructor (&g_machdep_arena);
@@ -1304,13 +1304,13 @@ rtl_arena_once_init (void)
0, /* no quantum caching */
0, 0, 0 /* no source */
);
- OSL_ASSERT(gp_machdep_arena != 0);
+ OSL_ASSERT(gp_machdep_arena != NULL);
}
{
/* default arena */
static rtl_arena_type g_default_arena;
- OSL_ASSERT(gp_default_arena == 0);
+ OSL_ASSERT(gp_default_arena == NULL);
VALGRIND_CREATE_MEMPOOL(&g_default_arena, 0, 0);
rtl_arena_constructor (&g_default_arena);
@@ -1323,13 +1323,13 @@ rtl_arena_once_init (void)
rtl_machdep_alloc,
rtl_machdep_free
);
- OSL_ASSERT(gp_default_arena != 0);
+ OSL_ASSERT(gp_default_arena != NULL);
}
{
/* arena internal arena */
static rtl_arena_type g_arena_arena;
- OSL_ASSERT(gp_arena_arena == 0);
+ OSL_ASSERT(gp_arena_arena == NULL);
VALGRIND_CREATE_MEMPOOL(&g_arena_arena, 0, 0);
rtl_arena_constructor (&g_arena_arena);
@@ -1342,7 +1342,7 @@ rtl_arena_once_init (void)
rtl_arena_alloc,
rtl_arena_free
);
- OSL_ASSERT(gp_arena_arena != 0);
+ OSL_ASSERT(gp_arena_arena != NULL);
}
}
@@ -1351,7 +1351,7 @@ rtl_arena_init (void)
{
static sal_once_type g_once = SAL_ONCE_INIT;
SAL_ONCE(&g_once, rtl_arena_once_init);
- return (gp_arena_arena != 0);
+ return (gp_arena_arena != NULL);
}
/* ================================================================= */
@@ -1377,7 +1377,7 @@ static void rtl_arena_fini (void);
void
rtl_arena_fini (void)
{
- if (gp_arena_arena != 0)
+ if (gp_arena_arena != NULL)
{
rtl_arena_type * arena, * head;
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_cache.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_cache.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_cache.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_cache.c Mon Aug 1 04:31:52 2016
@@ -80,25 +80,25 @@ static struct rtl_cache_list_st g_cache_
*
* @internal
*/
-static rtl_arena_type * gp_cache_arena = 0;
+static rtl_arena_type * gp_cache_arena = NULL;
/** gp_cache_magazine_cache
* @internal
*/
-static rtl_cache_type * gp_cache_magazine_cache = 0;
+static rtl_cache_type * gp_cache_magazine_cache = NULL;
/** gp_cache_slab_cache
* @internal
*/
-static rtl_cache_type * gp_cache_slab_cache = 0;
+static rtl_cache_type * gp_cache_slab_cache = NULL;
/** gp_cache_bufctl_cache
* @internal
*/
-static rtl_cache_type * gp_cache_bufctl_cache = 0;
+static rtl_cache_type * gp_cache_bufctl_cache = NULL;
/** rtl_cache_init()
@@ -133,7 +133,7 @@ rtl_cache_hash_rescale (
new_bytes = new_size * sizeof(rtl_cache_bufctl_type*);
new_table = (rtl_cache_bufctl_type**)rtl_arena_alloc(gp_cache_arena, &new_bytes);
- if (new_table != 0)
+ if (new_table != NULL)
{
rtl_cache_bufctl_type ** old_table;
sal_Size old_size, i;
@@ -162,7 +162,7 @@ rtl_cache_hash_rescale (
for (i = 0; i < old_size; i++)
{
rtl_cache_bufctl_type * curr = old_table[i];
- while (curr != 0)
+ while (curr != NULL)
{
rtl_cache_bufctl_type * next = curr->m_next;
rtl_cache_bufctl_type ** head;
@@ -173,7 +173,7 @@ rtl_cache_hash_rescale (
curr = next;
}
- old_table[i] = 0;
+ old_table[i] = NULL;
}
RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock));
@@ -222,11 +222,11 @@ rtl_cache_hash_remove (
sal_Size lookups = 0;
ppHead = &(cache->m_hash_table[RTL_CACHE_HASH_INDEX(cache, addr)]);
- while ((bufctl = *ppHead) != 0)
+ while ((bufctl = *ppHead) != NULL)
{
if (bufctl->m_addr == addr)
{
- *ppHead = bufctl->m_next, bufctl->m_next = 0;
+ *ppHead = bufctl->m_next, bufctl->m_next = NULL;
break;
}
@@ -234,7 +234,7 @@ rtl_cache_hash_remove (
ppHead = &(bufctl->m_next);
}
- OSL_ASSERT (bufctl != 0); /* bad free */
+ OSL_ASSERT (bufctl != NULL); /* bad free */
if (lookups > 1)
{
@@ -312,13 +312,13 @@ rtl_cache_slab_create (
rtl_cache_type * cache
)
{
- rtl_cache_slab_type * slab = 0;
+ rtl_cache_slab_type * slab = NULL;
void * addr;
sal_Size size;
size = cache->m_slab_size;
addr = rtl_arena_alloc (cache->m_source, &size);
- if (addr != 0)
+ if (addr != NULL)
{
OSL_ASSERT(size >= cache->m_slab_size);
@@ -334,13 +334,13 @@ rtl_cache_slab_create (
slab = RTL_CACHE_SLAB(addr, cache->m_slab_size);
(void) rtl_cache_slab_constructor (slab, 0);
}
- if (slab != 0)
+ if (slab != NULL)
{
slab->m_data = (sal_uIntPtr)(addr);
/* dynamic freelist initialization */
slab->m_bp = slab->m_data;
- slab->m_sp = 0;
+ slab->m_sp = NULL;
}
else
{
@@ -368,12 +368,12 @@ rtl_cache_slab_destroy (
{
/* cleanup bufctl(s) for free buffer(s) */
sal_Size ntypes = (slab->m_bp - slab->m_data) / cache->m_type_size;
- for (ntypes -= refcnt; slab->m_sp != 0; ntypes--)
+ for (ntypes -= refcnt; slab->m_sp != NULL; ntypes--)
{
rtl_cache_bufctl_type * bufctl = slab->m_sp;
/* pop from freelist */
- slab->m_sp = bufctl->m_next, bufctl->m_next = 0;
+ slab->m_sp = bufctl->m_next, bufctl->m_next = NULL;
/* return bufctl struct to bufctl cache */
rtl_cache_free (gp_cache_bufctl_cache, bufctl);
@@ -411,7 +411,7 @@ rtl_cache_slab_populate (
RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock));
slab = rtl_cache_slab_create (cache);
RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_slab_lock));
- if (slab != 0)
+ if (slab != NULL)
{
/* update buffer start addr w/ current color */
slab->m_bp += cache->m_ncolor;
@@ -427,7 +427,7 @@ rtl_cache_slab_populate (
/* insert onto 'free' queue */
QUEUE_INSERT_HEAD_NAMED(&(cache->m_free_head), slab, slab_);
}
- return (slab != 0);
+ return (slab != NULL);
}
/* ================================================================= */
@@ -441,7 +441,7 @@ rtl_cache_slab_alloc (
rtl_cache_type * cache
)
{
- void * addr = 0;
+ void * addr = NULL;
rtl_cache_slab_type * head;
RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_slab_lock));
@@ -455,7 +455,7 @@ rtl_cache_slab_alloc (
slab = head->m_slab_next;
OSL_ASSERT(slab->m_ntypes < cache->m_ntypes);
- if (slab->m_sp == 0)
+ if (slab->m_sp == NULL)
{
/* initialize bufctl w/ current 'slab->m_bp' */
OSL_ASSERT (slab->m_bp < slab->m_data + cache->m_ntypes * cache->m_type_size + cache->m_ncolor_max);
@@ -464,7 +464,7 @@ rtl_cache_slab_alloc (
/* allocate bufctl */
OSL_ASSERT (cache != gp_cache_bufctl_cache);
bufctl = (rtl_cache_bufctl_type*)rtl_cache_alloc (gp_cache_bufctl_cache);
- if (bufctl == 0)
+ if (bufctl == NULL)
{
/* out of memory */
RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock));
@@ -479,7 +479,7 @@ rtl_cache_slab_alloc (
/* embedded bufctl */
bufctl = (rtl_cache_bufctl_type*)(slab->m_bp);
}
- bufctl->m_next = 0;
+ bufctl->m_next = NULL;
/* update 'slab->m_bp' to next free buffer */
slab->m_bp += cache->m_type_size;
@@ -545,7 +545,7 @@ rtl_cache_slab_free (
if (cache->m_features & RTL_CACHE_FEATURE_HASH)
{
bufctl = rtl_cache_hash_remove (cache, (sal_uIntPtr)(addr));
- slab = (bufctl != 0) ? (rtl_cache_slab_type*)(bufctl->m_slab) : 0;
+ slab = (bufctl != NULL) ? (rtl_cache_slab_type*)(bufctl->m_slab) : 0;
}
else
{
@@ -554,7 +554,7 @@ rtl_cache_slab_free (
slab = RTL_CACHE_SLAB(addr, cache->m_slab_size);
}
- if (slab != 0)
+ if (slab != NULL)
{
/* check for full slab */
if (slab->m_ntypes == cache->m_ntypes)
@@ -605,7 +605,7 @@ rtl_cache_magazine_constructor (void * o
(void) arg; /* unused */
- mag->m_mag_next = 0;
+ mag->m_mag_next = NULL;
mag->m_mag_size = RTL_CACHE_MAGAZINE_SIZE;
mag->m_mag_used = 0;
@@ -624,7 +624,7 @@ rtl_cache_magazine_destructor (void * ob
rtl_cache_magazine_type * mag = (rtl_cache_magazine_type*)(obj);
/* assure removed from queue(s) */
- OSL_ASSERT(mag->m_mag_next == 0);
+ OSL_ASSERT(mag->m_mag_next == NULL);
/* assure no longer referenced */
OSL_ASSERT(mag->m_mag_used == 0);
@@ -645,7 +645,7 @@ rtl_cache_magazine_clear (
for (; mag->m_mag_used > 0; --mag->m_mag_used)
{
void * obj = mag->m_objects[mag->m_mag_used - 1];
- mag->m_objects[mag->m_mag_used - 1] = 0;
+ mag->m_objects[mag->m_mag_used - 1] = NULL;
/* DEBUG ONLY: mark cached object allocated, undefined */
VALGRIND_MEMPOOL_ALLOC(cache, obj, cache->m_type_size);
@@ -697,15 +697,15 @@ rtl_cache_depot_dequeue (
rtl_cache_depot_type * depot
)
{
- rtl_cache_magazine_type * mag = 0;
+ rtl_cache_magazine_type * mag = NULL;
if (depot->m_mag_count > 0)
{
/* dequeue magazine */
- OSL_ASSERT(depot->m_mag_next != 0);
+ OSL_ASSERT(depot->m_mag_next != NULL);
mag = depot->m_mag_next;
depot->m_mag_next = mag->m_mag_next;
- mag->m_mag_next = 0;
+ mag->m_mag_next = NULL;
/* update depot stats */
depot->m_mag_count--;
@@ -731,17 +731,17 @@ rtl_cache_depot_exchange_alloc (
{
rtl_cache_magazine_type * full;
- OSL_ASSERT((empty == 0) || (empty->m_mag_used == 0));
+ OSL_ASSERT((empty == NULL) || (empty->m_mag_used == 0));
/* dequeue full magazine */
full = rtl_cache_depot_dequeue (&(cache->m_depot_full));
- if ((full != 0) && (empty != 0))
+ if ((full != NULL) && (empty != NULL))
{
/* enqueue empty magazine */
rtl_cache_depot_enqueue (&(cache->m_depot_empty), empty);
}
- OSL_ASSERT((full == 0) || (full->m_mag_used > 0));
+ OSL_ASSERT((full == NULL) || (full->m_mag_used > 0));
return (full);
}
@@ -763,17 +763,17 @@ rtl_cache_depot_exchange_free (
{
rtl_cache_magazine_type * empty;
- OSL_ASSERT((full == 0) || (full->m_mag_used > 0));
+ OSL_ASSERT((full == NULL) || (full->m_mag_used > 0));
/* dequeue empty magazine */
empty = rtl_cache_depot_dequeue (&(cache->m_depot_empty));
- if ((empty != 0) && (full != 0))
+ if ((empty != NULL) && (full != NULL))
{
/* enqueue full magazine */
rtl_cache_depot_enqueue (&(cache->m_depot_full), full);
}
- OSL_ASSERT((empty == 0) || (empty->m_mag_used == 0));
+ OSL_ASSERT((empty == NULL) || (empty->m_mag_used == 0));
return (empty);
}
@@ -792,7 +792,7 @@ rtl_cache_depot_populate (
rtl_cache_type * cache
)
{
- rtl_cache_magazine_type * empty = 0;
+ rtl_cache_magazine_type * empty = NULL;
if (cache->m_magazine_cache != 0)
{
@@ -800,13 +800,13 @@ rtl_cache_depot_populate (
RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
empty = (rtl_cache_magazine_type*)rtl_cache_alloc (cache->m_magazine_cache);
RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock));
- if (empty != 0)
+ if (empty != NULL)
{
/* enqueue (new) empty magazine */
rtl_cache_depot_enqueue (&(cache->m_depot_empty), empty);
}
}
- return (empty != 0);
+ return (empty != NULL);
}
/* ================================================================= */
@@ -881,8 +881,8 @@ rtl_cache_activate (
int flags
)
{
- OSL_ASSERT(cache != 0);
- if (cache != 0)
+ OSL_ASSERT(cache != NULL);
+ if (cache != NULL)
{
sal_Size slabsize;
@@ -937,8 +937,8 @@ rtl_cache_activate (
if (cache->m_slab_size > source->m_quantum)
{
- OSL_ASSERT(gp_cache_slab_cache != 0);
- OSL_ASSERT(gp_cache_bufctl_cache != 0);
+ OSL_ASSERT(gp_cache_slab_cache != NULL);
+ OSL_ASSERT(gp_cache_bufctl_cache != NULL);
cache->m_features |= RTL_CACHE_FEATURE_HASH;
cache->m_ntypes = cache->m_slab_size / cache->m_type_size;
@@ -963,7 +963,7 @@ rtl_cache_activate (
/* magazine layer */
if (!(flags & RTL_CACHE_FLAG_NOMAGAZINE))
{
- OSL_ASSERT(gp_cache_magazine_cache != 0);
+ OSL_ASSERT(gp_cache_magazine_cache != NULL);
cache->m_magazine_cache = gp_cache_magazine_cache;
}
@@ -1002,13 +1002,13 @@ rtl_cache_deactivate (
mag_cache = cache->m_magazine_cache, cache->m_magazine_cache = 0;
/* cleanup cpu layer */
- if ((mag = cache->m_cpu_curr) != 0)
+ if ((mag = cache->m_cpu_curr) != NULL)
{
cache->m_cpu_curr = 0;
rtl_cache_magazine_clear (cache, mag);
rtl_cache_free (mag_cache, mag);
}
- if ((mag = cache->m_cpu_prev) != 0)
+ if ((mag = cache->m_cpu_prev) != NULL)
{
cache->m_cpu_prev = 0;
rtl_cache_magazine_clear (cache, mag);
@@ -1016,12 +1016,12 @@ rtl_cache_deactivate (
}
/* cleanup depot layer */
- while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_full))) != 0)
+ while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_full))) != NULL)
{
rtl_cache_magazine_clear (cache, mag);
rtl_cache_free (mag_cache, mag);
}
- while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_empty))) != 0)
+ while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_empty))) != NULL)
{
rtl_cache_magazine_clear (cache, mag);
rtl_cache_free (mag_cache, mag);
@@ -1059,10 +1059,10 @@ rtl_cache_deactivate (
for (i = 0; i < n; i++)
{
rtl_cache_bufctl_type * bufctl;
- while ((bufctl = cache->m_hash_table[i]) != 0)
+ while ((bufctl = cache->m_hash_table[i]) != NULL)
{
/* pop from hash table */
- cache->m_hash_table[i] = bufctl->m_next, bufctl->m_next = 0;
+ cache->m_hash_table[i] = bufctl->m_next, bufctl->m_next = NULL;
/* return to bufctl cache */
rtl_cache_free (gp_cache_bufctl_cache, bufctl);
@@ -1559,7 +1559,7 @@ rtl_cache_depot_wsupdate (
for (; npurge > 0; npurge--)
{
rtl_cache_magazine_type * mag = rtl_cache_depot_dequeue (depot);
- if (mag != 0)
+ if (mag != NULL)
{
RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
rtl_cache_magazine_clear (cache, mag);
@@ -1656,7 +1656,7 @@ rtl_cache_once_init (void)
}
{
/* cache: internal arena */
- OSL_ASSERT(gp_cache_arena == 0);
+ OSL_ASSERT(gp_cache_arena == NULL);
gp_cache_arena = rtl_arena_create (
"rtl_cache_internal_arena",
@@ -1667,16 +1667,16 @@ rtl_cache_once_init (void)
rtl_arena_free,
0 /* flags */
);
- OSL_ASSERT(gp_cache_arena != 0);
+ OSL_ASSERT(gp_cache_arena != NULL);
/* check 'gp_default_arena' initialization */
- OSL_ASSERT(gp_default_arena != 0);
+ OSL_ASSERT(gp_default_arena != NULL);
}
{
/* cache: magazine cache */
static rtl_cache_type g_cache_magazine_cache;
- OSL_ASSERT(gp_cache_magazine_cache == 0);
+ OSL_ASSERT(gp_cache_magazine_cache == NULL);
VALGRIND_CREATE_MEMPOOL(&g_cache_magazine_cache, 0, 0);
(void) rtl_cache_constructor (&g_cache_magazine_cache);
@@ -1692,7 +1692,7 @@ rtl_cache_once_init (void)
gp_default_arena, /* source */
RTL_CACHE_FLAG_NOMAGAZINE /* during bootstrap; activated below */
);
- OSL_ASSERT(gp_cache_magazine_cache != 0);
+ OSL_ASSERT(gp_cache_magazine_cache != NULL);
/* activate magazine layer */
g_cache_magazine_cache.m_magazine_cache = gp_cache_magazine_cache;
@@ -1701,7 +1701,7 @@ rtl_cache_once_init (void)
/* cache: slab (struct) cache */
static rtl_cache_type g_cache_slab_cache;
- OSL_ASSERT(gp_cache_slab_cache == 0);
+ OSL_ASSERT(gp_cache_slab_cache == NULL);
VALGRIND_CREATE_MEMPOOL(&g_cache_slab_cache, 0, 0);
(void) rtl_cache_constructor (&g_cache_slab_cache);
@@ -1717,13 +1717,13 @@ rtl_cache_once_init (void)
gp_default_arena, /* source */
0 /* flags: none */
);
- OSL_ASSERT(gp_cache_slab_cache != 0);
+ OSL_ASSERT(gp_cache_slab_cache != NULL);
}
{
/* cache: bufctl cache */
static rtl_cache_type g_cache_bufctl_cache;
- OSL_ASSERT(gp_cache_bufctl_cache == 0);
+ OSL_ASSERT(gp_cache_bufctl_cache == NULL);
VALGRIND_CREATE_MEMPOOL(&g_cache_bufctl_cache, 0, 0);
(void) rtl_cache_constructor (&g_cache_bufctl_cache);
@@ -1739,7 +1739,7 @@ rtl_cache_once_init (void)
gp_default_arena, /* source */
0 /* flags: none */
);
- OSL_ASSERT(gp_cache_bufctl_cache != 0);
+ OSL_ASSERT(gp_cache_bufctl_cache != NULL);
}
rtl_cache_wsupdate_init();
@@ -1750,7 +1750,7 @@ rtl_cache_init (void)
{
static sal_once_type g_once = SAL_ONCE_INIT;
SAL_ONCE(&g_once, rtl_cache_once_init);
- return (gp_cache_arena != 0);
+ return (gp_cache_arena != NULL);
}
/* ================================================================= */
@@ -1776,37 +1776,37 @@ static void rtl_cache_fini (void);
void
rtl_cache_fini (void)
{
- if (gp_cache_arena != 0)
+ if (gp_cache_arena != NULL)
{
rtl_cache_type * cache, * head;
rtl_cache_wsupdate_fini();
- if (gp_cache_bufctl_cache != 0)
+ if (gp_cache_bufctl_cache != NULL)
{
- cache = gp_cache_bufctl_cache, gp_cache_bufctl_cache = 0;
+ cache = gp_cache_bufctl_cache, gp_cache_bufctl_cache = NULL;
rtl_cache_deactivate (cache);
rtl_cache_destructor (cache);
VALGRIND_DESTROY_MEMPOOL(cache);
}
- if (gp_cache_slab_cache != 0)
+ if (gp_cache_slab_cache != NULL)
{
- cache = gp_cache_slab_cache, gp_cache_slab_cache = 0;
+ cache = gp_cache_slab_cache, gp_cache_slab_cache = NULL;
rtl_cache_deactivate (cache);
rtl_cache_destructor (cache);
VALGRIND_DESTROY_MEMPOOL(cache);
}
- if (gp_cache_magazine_cache != 0)
+ if (gp_cache_magazine_cache != NULL)
{
- cache = gp_cache_magazine_cache, gp_cache_magazine_cache = 0;
+ cache = gp_cache_magazine_cache, gp_cache_magazine_cache = NULL;
rtl_cache_deactivate (cache);
rtl_cache_destructor (cache);
VALGRIND_DESTROY_MEMPOOL(cache);
}
- if (gp_cache_arena != 0)
+ if (gp_cache_arena != NULL)
{
rtl_arena_destroy (gp_cache_arena);
- gp_cache_arena = 0;
+ gp_cache_arena = NULL;
}
RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock));
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_global.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_global.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_global.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/alloc_global.c Mon Aug 1 04:31:52 2016
@@ -83,7 +83,7 @@ static rtl_cache_type * g_alloc_table[RT
0,
};
-static rtl_arena_type * gp_alloc_arena = 0;
+static rtl_arena_type * gp_alloc_arena = NULL;
/* ================================================================= *
*
@@ -96,7 +96,7 @@ rtl_memory_once_init (void)
{
{
/* global memory arena */
- OSL_ASSERT(gp_alloc_arena == 0);
+ OSL_ASSERT(gp_alloc_arena == NULL);
gp_alloc_arena = rtl_arena_create (
"rtl_alloc_arena",
@@ -107,7 +107,7 @@ rtl_memory_once_init (void)
rtl_arena_free,
0 /* flags */
);
- OSL_ASSERT(gp_alloc_arena != 0);
+ OSL_ASSERT(gp_alloc_arena != NULL);
}
{
sal_Size size;
@@ -137,7 +137,7 @@ rtl_memory_init (void)
{
static sal_once_type g_once = SAL_ONCE_INIT;
SAL_ONCE(&g_once, rtl_memory_once_init);
- return (gp_alloc_arena != 0);
+ return (gp_alloc_arena != NULL);
}
/* ================================================================= */
@@ -171,18 +171,18 @@ rtl_memory_fini (void)
/* cleanup g_alloc_caches */
for (i = 0, n = RTL_MEMORY_CACHED_SIZES; i < n; i++)
{
- if (g_alloc_caches[i] != 0)
+ if (g_alloc_caches[i] != NULL)
{
rtl_cache_destroy (g_alloc_caches[i]);
- g_alloc_caches[i] = 0;
+ g_alloc_caches[i] = NULL;
}
}
/* cleanup gp_alloc_arena */
- if (gp_alloc_arena != 0)
+ if (gp_alloc_arena != NULL)
{
rtl_arena_destroy (gp_alloc_arena);
- gp_alloc_arena = 0;
+ gp_alloc_arena = NULL;
}
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/byteseq.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/byteseq.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/byteseq.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/byteseq.c Mon Aug 1 04:31:52 2016
@@ -55,7 +55,7 @@ void SAL_CALL rtl_byte_sequence_referenc
{
pNew = (sal_Sequence *)rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nElements );
- if ( pNew != 0 )
+ if ( pNew != NULL )
rtl_copyMemory( pNew->elements, pSequence->elements, nElements );
if (! osl_decrementInterlockedCount( &pSequence->nRefCount ))
@@ -66,7 +66,7 @@ void SAL_CALL rtl_byte_sequence_referenc
pNew = (sal_Sequence *)rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE );
}
- if ( pNew != 0 )
+ if ( pNew != NULL )
{
pNew->nRefCount = 1;
pNew->nElements = nElements;
@@ -94,7 +94,7 @@ void SAL_CALL rtl_byte_sequence_realloc(
{
pNew = (sal_Sequence *)rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nSize );
- if ( pNew != 0 )
+ if ( pNew != NULL )
{
if (nSize > nElements)
{
@@ -117,7 +117,7 @@ void SAL_CALL rtl_byte_sequence_realloc(
pSequence, SAL_SEQUENCE_HEADER_SIZE + nSize );
}
- if ( pSequence != 0 )
+ if ( pSequence != NULL )
{
pSequence->nRefCount = 1;
pSequence->nElements = nSize;
@@ -136,7 +136,7 @@ void SAL_CALL rtl_byte_sequence_acquire(
//==================================================================================================
void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence )
{
- if ( pSequence != 0 )
+ if ( pSequence != NULL )
{
if (! osl_decrementInterlockedCount( &(pSequence->nRefCount )) )
{
@@ -152,14 +152,14 @@ void SAL_CALL rtl_byte_sequence_construc
if( *ppSequence )
{
rtl_byte_sequence_release( *ppSequence );
- *ppSequence = 0;
+ *ppSequence = NULL;
}
if( nLength )
{
*ppSequence = (sal_Sequence *) rtl_allocateZeroMemory( SAL_SEQUENCE_HEADER_SIZE + nLength );
- if ( *ppSequence != 0 )
+ if ( *ppSequence != NULL )
{
(*ppSequence)->nRefCount = 1;
(*ppSequence)->nElements = nLength;
@@ -179,12 +179,12 @@ void SAL_CALL rtl_byte_sequence_construc
if( *ppSequence )
{
rtl_byte_sequence_release( *ppSequence );
- *ppSequence = 0;
+ *ppSequence = NULL;
}
*ppSequence = (sal_Sequence *) rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nLength );
- if ( *ppSequence != 0 )
+ if ( *ppSequence != NULL )
{
(*ppSequence)->nRefCount = 1;
(*ppSequence)->nElements = nLength;
@@ -196,7 +196,7 @@ void SAL_CALL rtl_byte_sequence_construc
sal_Sequence **ppSequence, const sal_Int8 *pData , sal_Int32 nLength )
{
rtl_byte_sequence_constructNoDefault( ppSequence , nLength );
- if ( *ppSequence != 0 )
+ if ( *ppSequence != NULL )
rtl_copyMemory( (*ppSequence)->elements, pData, nLength );
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/locale.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/locale.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/locale.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/locale.c Mon Aug 1 04:31:52 2016
@@ -225,7 +225,7 @@ sal_Bool rtl_hashtable_find(RTL_HASHTABL
*/
static void rtl_locale_once_init (void)
{
- OSL_ASSERT(g_pLocaleTable == 0);
+ OSL_ASSERT(g_pLocaleTable == NULL);
rtl_hashtable_init(&g_pLocaleTable, 1);
}
@@ -233,7 +233,7 @@ static int rtl_locale_init (void)
{
static sal_once_type g_once = SAL_ONCE_INIT;
SAL_ONCE(&g_once, rtl_locale_once_init);
- return (g_pLocaleTable != 0);
+ return (g_pLocaleTable != NULL);
}
/*************************************************************************
@@ -248,10 +248,10 @@ static void rtl_locale_fini (void);
void rtl_locale_fini (void)
{
- if (g_pLocaleTable != 0)
+ if (g_pLocaleTable != NULL)
{
rtl_hashtable_destroy (g_pLocaleTable);
- g_pLocaleTable = 0;
+ g_pLocaleTable = NULL;
}
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/rtl_process.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/rtl_process.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/rtl_process.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/rtl_process.c Mon Aug 1 04:31:52 2016
@@ -28,7 +28,7 @@
void SAL_CALL rtl_getGlobalProcessId( sal_uInt8 *pTargetUUID )
{
- static sal_uInt8 *pUuid = 0;
+ static sal_uInt8 *pUuid = NULL;
if( ! pUuid )
{
osl_acquireMutex( * osl_getGlobalMutex() );
Modified: openoffice/branches/gbuild-reintegration/main/sal/rtl/source/tres.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/rtl/source/tres.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/rtl/source/tres.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/rtl/source/tres.c Mon Aug 1 04:31:52 2016
@@ -169,7 +169,7 @@ rtl_TestResult* rtl_tres_create( const s
rtl_TestResult_Data ) );
/* initialize members... */
pData->m_funcs = &trVTable; /* ...vtableptr to vtbladr */
- pData->m_externaldata = 0; /* ...external data pointer */
+ pData->m_externaldata = NULL; /* ...external data pointer */
/* allocate memory for state structure and initialize members */
pData->m_state = rtl_tres_create_funcstate( meth );
@@ -192,7 +192,7 @@ rtl_TestResult* rtl_tres_create( const s
*/
rtl_FuncState* SAL_CALL rtl_tres_create_funcstate( const sal_Char* meth )
{
- rtl_FuncState* pStat = 0; /* status structure */
+ rtl_FuncState* pStat = NULL; /* status structure */
/* allocate memory for status structure */
pStat = (rtl_FuncState*) malloc( sizeof( struct _rtl_FuncState ) );
@@ -202,11 +202,11 @@ rtl_FuncState* SAL_CALL rtl_tres_create_
pStat->m_next = pStat; /* init ptr to next struct */
pStat->m_prev = pStat; /* init ptr to prev struct */
- pStat->m_name = 0; /* init name */
+ pStat->m_name = NULL; /* init name */
pStat->m_flags = 0; /* init flags */
pStat->m_start = rtl_tres_timer(); /* init start milliseconds */
pStat->m_stop = 0; /* init stop milliseconds */
- pStat->m_cmp = 0; /* init ptr to msg struct */
+ pStat->m_cmp = NULL; /* init ptr to msg struct */
rtl_string_newFromStr( &pStat->m_name, meth );/* copy meth to name */
/* set ok flag initially */
@@ -310,7 +310,7 @@ rtl_CmpState* SAL_CALL rtl_tres_create_c
{
pStat->m_next = pStat; /* init next with this */
pStat->m_prev = pStat; /* init prev with this */
- pStat->m_msg = 0;
+ pStat->m_msg = NULL;
pStat->m_stat = state; /* boolean state */
rtl_string_newFromStr( &pStat->m_msg, msg ); /* copy message */
}
@@ -334,7 +334,7 @@ void SAL_CALL rtl_tres_destroy( rtl_Test
/* free allocted memory and reinitialize to zero */
/* to be able to prevent dangling pointer access*/
- free( pData ); pData = 0;
+ free( pData ); pData = NULL;
}
/**
@@ -391,11 +391,11 @@ void SAL_CALL rtl_tres_destroy_funcstate
if ( plink->m_name )
{
rtl_string_release( plink->m_name );
- plink->m_name = 0;
+ plink->m_name = NULL;
}
plink->m_flags = 0;
free( plink );
- plink = 0;
+ plink = NULL;
}
/**
@@ -412,10 +412,10 @@ void SAL_CALL rtl_tres_destroy_cmpstate(
if ( plink->m_msg )
{
rtl_string_release( plink->m_msg );
- plink->m_msg = 0;
+ plink->m_msg = NULL;
}
free( plink );
- plink = 0;
+ plink = NULL;
}
/**
* central function to call in tests
Modified: openoffice/branches/gbuild-reintegration/main/sal/textenc/tencinfo.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/textenc/tencinfo.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/textenc/tencinfo.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/textenc/tencinfo.c Mon Aug 1 04:31:52 2016
@@ -201,7 +201,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEnc
case 238: eTextEncoding = RTL_TEXTENCODING_MS_1250; break; /* EASTEUROPE_CHARSET */
case 255: eTextEncoding = RTL_TEXTENCODING_IBM_850; break; /* OEM_CHARSET */
default: eTextEncoding = RTL_TEXTENCODING_DONTKNOW; break;
- };
+ }
return eTextEncoding;
}
Modified: openoffice/branches/gbuild-reintegration/main/sal/workben/t_readline.c
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sal/workben/t_readline.c?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sal/workben/t_readline.c (original)
+++ openoffice/branches/gbuild-reintegration/main/sal/workben/t_readline.c Mon Aug 1 04:31:52 2016
@@ -39,21 +39,21 @@ int main (int argc, char ** argv)
oslFileError result;
oslFileHandle hFile = 0;
- rtl_uString * pSystemPath = 0;
- rtl_uString * pFileUrl = 0;
+ rtl_uString * pSystemPath = NULL;
+ rtl_uString * pFileUrl = NULL;
rtl_uString_newFromAscii (&pSystemPath, argv[1]);
result = osl_getFileURLFromSystemPath (pSystemPath, &pFileUrl);
- rtl_uString_release (pSystemPath), pSystemPath = 0;
+ rtl_uString_release (pSystemPath), pSystemPath = NULL;
if (result != osl_File_E_None)
return (result);
result = osl_openFile (pFileUrl, &hFile, osl_File_OpenFlag_Read);
- rtl_uString_release (pFileUrl), pFileUrl = 0;
+ rtl_uString_release (pFileUrl), pFileUrl = NULL;
if (result == osl_File_E_None)
{
- sal_Sequence * pBuffer = 0;
+ sal_Sequence * pBuffer = NULL;
for ( ;; )
{
sal_Int32 i, n;
@@ -71,7 +71,7 @@ int main (int argc, char ** argv)
printf("\n");
}
- rtl_byte_sequence_release (pBuffer), pBuffer = 0;
+ rtl_byte_sequence_release (pBuffer), pBuffer = NULL;
(void) osl_closeFile (hFile);
}
}
Modified: openoffice/branches/gbuild-reintegration/main/sc/inc/compressedarray.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/inc/compressedarray.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/inc/compressedarray.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/inc/compressedarray.hxx Mon Aug 1 04:31:52 2016
@@ -434,7 +434,7 @@ public:
// === ScBitMaskCompressedArray ==============================================
-/** The data type represents bits, managable by bitwise operations.
+/** The data type represents bits, manageable by bitwise operations.
*/
template< typename A, typename D > class ScBitMaskCompressedArray : public ScCompressedArray<A,D>
Modified: openoffice/branches/gbuild-reintegration/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/inc/document.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/inc/document.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/inc/document.hxx Mon Aug 1 04:31:52 2016
@@ -1432,7 +1432,7 @@ public:
SCROW GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize = true) const;
// returns whether to export a Default style for this col/row or not
- // nDefault is setted to one position in the current row/col where the Default style is
+ // nDefault is set to one position in the current row/col where the Default style is
sal_Bool GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault);
sal_Bool GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault);
Modified: openoffice/branches/gbuild-reintegration/main/sc/inc/stringutil.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/inc/stringutil.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/inc/stringutil.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/inc/stringutil.hxx Mon Aug 1 04:31:52 2016
@@ -25,8 +25,9 @@
#define SC_STRINGUTIL_HXX
#include "rtl/ustring.hxx"
+#include "scdllapi.h"
-class ScStringUtil
+class SC_DLLPUBLIC ScStringUtil
{
public:
/**
Modified: openoffice/branches/gbuild-reintegration/main/sc/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/prj/build.lst?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/prj/build.lst Mon Aug 1 04:31:52 2016
@@ -48,6 +48,7 @@ sc sc\addin\datefunc nmake - all sc_
sc sc\addin\rot13 nmake - all sc_adrot sc_add sc_sdi sc_inc NULL
sc sc\addin\util nmake - all sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL
sc sc\util nmake - all sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_sidebar sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
+sc sc\test nmake - all sc_test sc_util NULL
# remarked due to the fact, key press is need in this test.
# sc sc\qa\complex\calcPreview nmake - all qa_calcpreview NULL
Modified: openoffice/branches/gbuild-reintegration/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java Mon Aug 1 04:31:52 2016
@@ -83,7 +83,7 @@ public class CheckXCellRangesQuery /* ex
System.out.println( "creating a Spreadsheet document" );
m_xSheetDoc = SOF.createCalcDoc(null);
} catch ( com.sun.star.uno.Exception e ) {
- // Some exception occures.FAILED
+ // Some exception occured.FAILED
e.printStackTrace( );
fail( "Couldn?t create document");
}
Modified: openoffice/branches/gbuild-reintegration/main/sc/qa/complex/dataPilot/CheckDataPilot.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/qa/complex/dataPilot/CheckDataPilot.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/qa/complex/dataPilot/CheckDataPilot.java (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/qa/complex/dataPilot/CheckDataPilot.java Mon Aug 1 04:31:52 2016
@@ -195,7 +195,7 @@ public class CheckDataPilot {
System.out.println( "Creating a Spreadsheet document" );
xSheetDoc = SOF.createCalcDoc(null);
} catch (com.sun.star.uno.Exception e) {
- // Some exception occures.FAILED
+ // Some exception occured.FAILED
e.printStackTrace();
throw new StatusException( "Couldn't create document", e );
}
Modified: openoffice/branches/gbuild-reintegration/main/sc/qa/complex/sc/CalcRTL.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/qa/complex/sc/CalcRTL.java?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/qa/complex/sc/CalcRTL.java (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/qa/complex/sc/CalcRTL.java Mon Aug 1 04:31:52 2016
@@ -232,7 +232,7 @@ public class CalcRTL /* extends ComplexT
System.out.println("creating a sheetdocument");
xSheetDoc = SOF.createCalcDoc(null);
} catch (com.sun.star.uno.Exception e) {
- // Some exception occures.FAILED
+ // Some exception occured.FAILED
worked = false;
e.printStackTrace(/*(PrintWriter) log*/ System.out);
}
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/core/data/column2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/core/data/column2.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/core/data/column2.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/core/data/column2.cxx Mon Aug 1 04:31:52 2016
@@ -442,7 +442,7 @@ long ScColumn::GetNeededSize( SCROW nRow
SfxItemSet* pSet = new SfxItemSet( pEngine->GetEmptyItemSet() );
pPattern->FillEditItemSet( pSet, pCondSet );
-// no longer needed, are setted with the text (is faster)
+// no longer needed, are set with the text (is faster)
// pEngine->SetDefaults( pSet );
if ( ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) {
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/core/data/tabprotection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/core/data/tabprotection.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/core/data/tabprotection.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/core/data/tabprotection.cxx Mon Aug 1 04:31:52 2016
@@ -194,7 +194,7 @@ bool ScTableProtectionImpl::hasPasswordH
Sequence<sal_Int8> ScTableProtectionImpl::getPasswordHash(ScPasswordHash eHash) const
{
if (mbEmptyPass)
- // Flaged as empty.
+ // Flagged as empty.
return Sequence<sal_Int8>();
if (maPassText.Len())
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/interpr1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/interpr1.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/interpr1.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/interpr1.cxx Mon Aug 1 04:31:52 2016
@@ -1679,15 +1679,16 @@ void ScInterpreter::ScRandom()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pfg", "ScInterpreter::ScRandom" );
- static rtlRandomPool aPool = rtl_random_createPool();
static sal_Bool SqSeeded = sal_False;
static sal_uInt32 ScCNG, ScXS = 362436069;
// Seeding for the PRNG
if (SqSeeded == sal_False) {
+ rtlRandomPool aPool = rtl_random_createPool();
rtl_random_getBytes(aPool, &ScCNG, sizeof(ScCNG));
rtl_random_getBytes(aPool, &nScRandomQ,
sizeof(nScRandomQ[0]) * SCRANDOMQ_SIZE);
+ rtl_random_destroyPool(aPool);
SqSeeded = sal_True;
}
PushDouble(static_cast<double>(KISS) / SAL_MAX_UINT32);
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/stringutil.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/stringutil.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/stringutil.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/core/tool/stringutil.cxx Mon Aug 1 04:31:52 2016
@@ -45,6 +45,7 @@ bool ScStringUtil::parseSimpleNumber(
const sal_Unicode* p = rStr.getStr();
sal_Int32 nPosDSep = -1, nPosGSep = -1;
sal_uInt32 nDigitCount = 0;
+ bool haveSeenDigit = false;
for (sal_Int32 i = 0; i < n; ++i)
{
@@ -57,6 +58,7 @@ bool ScStringUtil::parseSimpleNumber(
{
// this is a digit.
aBuf.append(c);
+ haveSeenDigit = true;
++nDigitCount;
}
else if (c == dsep)
@@ -81,8 +83,8 @@ bool ScStringUtil::parseSimpleNumber(
{
// this is a group (thousand) separator.
- if (i == 0)
- // not allowed as the first character.
+ if (!haveSeenDigit)
+ // not allowed before digits.
return false;
if (nPosDSep >= 0)
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/filter/excel/xetable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/filter/excel/xetable.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/filter/excel/xetable.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/filter/excel/xetable.cxx Mon Aug 1 04:31:52 2016
@@ -1877,7 +1877,7 @@ void XclExpRow::Finalize( const ScfUInt1
// *** Fill gaps with BLANK/MULBLANK cell records *** ---------------------
- /* This is needed because nonexistant cells in Calc are not formatted at all,
+ /* This is needed because nonexistent cells in Calc are not formatted at all,
but in Excel they would have the column default format. Blank cells that
are equal to the respective column default are removed later in this function. */
if( !mbAlwaysEmpty )
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/filter/xml/xmlexprt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/filter/xml/xmlexprt.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/filter/xml/xmlexprt.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/filter/xml/xmlexprt.cxx Mon Aug 1 04:31:52 2016
@@ -1643,7 +1643,7 @@ void ScXMLExport::_ExportContent()
sal_Int32 nShapesCount(0);
sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
CollectSharedData(nTableCount, nShapesCount, nCellCount);
- DBG_ERROR("no shared data setted");
+ DBG_ERROR("no shared data set");
}
ScXMLExportDatabaseRanges aExportDatabaseRanges(*this);
if (!GetModel().is())
@@ -1864,7 +1864,7 @@ void ScXMLExport::_ExportStyles( sal_Boo
sal_Int32 nShapesCount(0);
sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
CollectSharedData(nTableCount, nShapesCount, nCellCount);
- //DBG_ERROR("no shared data setted");
+ //DBG_ERROR("no shared data set");
}
ScXMLStyleExport aStylesExp(*this, rtl::OUString(), GetAutoStylePool().get());
if (GetModel().is())
@@ -2445,7 +2445,7 @@ void ScXMLExport::_ExportAutoStyles()
sal_Int32 nShapesCount(0);
sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
CollectSharedData(nTableCount, nShapesCount, nCellCount);
- //DBG_ERROR("no shared data setted");
+ //DBG_ERROR("no shared data set");
}
sal_Int32 nTableCount(xIndex->getCount());
pCellStyles->AddNewTable(nTableCount - 1);
Modified: openoffice/branches/gbuild-reintegration/main/sc/source/ui/vba/vbarange.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/source/ui/vba/vbarange.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/source/ui/vba/vbarange.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sc/source/ui/vba/vbarange.cxx Mon Aug 1 04:31:52 2016
@@ -3966,7 +3966,7 @@ ScVbaRange::setRowHeight( const uno::Any
}
return;
}
- double nHeight = 0; // Incomming height is in points
+ double nHeight = 0; // Incoming height is in points
_rowheight >>= nHeight;
nHeight = lcl_Round2DecPlaces( nHeight );
RangeHelper thisRange( mxRange );
Modified: openoffice/branches/gbuild-reintegration/main/scp2/macros/macro.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scp2/macros/macro.pl?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scp2/macros/macro.pl (original)
+++ openoffice/branches/gbuild-reintegration/main/scp2/macros/macro.pl Mon Aug 1 04:31:52 2016
@@ -265,7 +265,7 @@ sub startup_check
usage() if $i<2;
usage() if "$outfile" eq "";
if ( -f "$outfile" ) {
- # changed script - run allways
+ # changed script - run always
return if (stat($0))[9] > (stat("$outfile"))[9] ;
open OLDFILE, "$outfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
Modified: openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp Mon Aug 1 04:31:52 2016
@@ -1643,6 +1643,9 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWi
#ifdef BUNDLE_NSS_LIBS
STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
+#ifdef LINUX
+STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
+#endif
STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
@@ -2034,7 +2037,7 @@ File gid_File_Lib_Apr
#ifdef MACOSX
Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
#elif FREEBSD
- Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
+ Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5));
#else
Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
#endif
@@ -2053,7 +2056,7 @@ File gid_File_Lib_AprUtil
#ifdef MACOSX
Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
#elif FREEBSD
- Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
+ Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5));
#else
Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
#endif
Modified: openoffice/branches/gbuild-reintegration/main/scripting/source/provider/MasterScriptProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scripting/source/provider/MasterScriptProvider.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scripting/source/provider/MasterScriptProvider.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/scripting/source/provider/MasterScriptProvider.cxx Mon Aug 1 04:31:52 2016
@@ -207,7 +207,7 @@ throw ( Exception, RuntimeException )
}
else // no args
{
- // use either scriping context or maybe zero args?
+ // use either scripting context or maybe zero args?
invokeArgs = Sequence< Any >( 0 ); // no arguments
}
m_sAargs = invokeArgs;
Modified: openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.cxx Mon Aug 1 04:31:52 2016
@@ -688,7 +688,7 @@ LocaleItem* StringResourceImpl::getItemF
}
// Returns the LocalItem for a given locale, if it exists, otherwise NULL
-// This method performes a closest match search, at least the language must match
+// This method performs a closest match search, at least the language must match
LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& locale )
{
LocaleItem* pRetItem = NULL;
Modified: openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/scripting/source/stringresource/stringresource.hxx Mon Aug 1 04:31:52 2016
@@ -160,7 +160,7 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException);
// Returns the LocalItem for a given locale, if it exists, otherwise NULL
- // This method performes a closest match search, at least the language must match
+ // This method performs a closest match search, at least the language must match
LocaleItem* getClosestMatchItemForLocale( const ::com::sun::star::lang::Locale& locale );
void implSetCurrentLocale( const ::com::sun::star::lang::Locale& locale,
sal_Bool FindClosestMatch, sal_Bool bUseDefaultIfNoMatch )
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/core/drawdoc2.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/core/drawdoc2.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/core/drawdoc2.cxx Mon Aug 1 04:31:52 2016
@@ -1545,7 +1545,7 @@ sal_uInt16 SdDrawDocument::InsertPageSet
String aNotesPageName = sNotesPageName;
// Gather some information about the standard page and the notes page
- // that are to be inserted. This makes sure that there is allways one
+ // that are to be inserted. This makes sure that there is always one
// standard page followed by one notes page.
if (ePageKind == PK_NOTES)
{
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/filter/xml/sdxmlwrp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/filter/xml/sdxmlwrp.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/filter/xml/sdxmlwrp.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/filter/xml/sdxmlwrp.cxx Mon Aug 1 04:31:52 2016
@@ -723,7 +723,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& n
nError = ERRCODE_IO_BROKENPACKAGE;
break;
}
- // fall through intented
+ // fall through intended
default:
{
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly!
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/accessibility/AccessibleViewForwarder.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/accessibility/AccessibleViewForwarder.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/accessibility/AccessibleViewForwarder.cxx Mon Aug 1 04:31:52 2016
@@ -33,7 +33,7 @@
namespace accessibility {
-/** For the time beeing, the implementation of this class will not use the
+/** For the time being, the implementation of this class will not use the
member mrDevice. Instead the device is retrieved from the view
every time it is used. This is necessary because the device has to stay
up-to-date with the current view and the class has to stay compatible.
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/sdmod2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/sdmod2.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/sdmod2.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/sdmod2.cxx Mon Aug 1 04:31:52 2016
@@ -133,7 +133,7 @@ static SdPage* GetCurrentPage( sd::ViewS
// which all use the new possibility of setting the visualized page at the SdrOutliner.
// if all else failed, geht the current page from the object that is
- // currently formated from the document
+ // currently formatted from the document
if(!pPage)
{
const SdrTextObj* pTextObj = (pViewSh && pViewSh->GetDoc()) ? pViewSh->GetDoc()->GetFormattingTextObj() : NULL;
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/func/futext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/func/futext.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/func/futext.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/func/futext.cxx Mon Aug 1 04:31:52 2016
@@ -900,7 +900,7 @@ sal_Bool FuText::MouseButtonUp(const Mou
// #107235#
// Analog to the else case below, for vertical simple click texts
- // one of the defaulted setted items from ImpSetAttributesForNewTextObject
+ // one of the defaulted set items from ImpSetAttributesForNewTextObject
// needs to be adapted to non-block mode. This could have been done with the
// #104122#, but was obviously overseen.
const SfxItemSet& rSet = mpView->GetDefaultAttr();
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx Mon Aug 1 04:31:52 2016
@@ -134,7 +134,7 @@ protected:
index has the special value ACCESSIBLE_SELECTION_CHILD_ALL.
Selecting or deselecting a child sets or resets the
<const>SELECTED</const> state and selects or deslects the UNO shape
- beeing made accessible by the child.
+ being made accessible by the child.
@param nAccessibleChildIndex
Index of the child to select or deselect. If the parameter has
the value ACCESSIBLE_SELECTION_CHILD_ALL then all children are
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx Mon Aug 1 04:31:52 2016
@@ -222,7 +222,7 @@ private:
sal_uInt32 mnClientId;
/** 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.
*/
@@ -230,7 +230,7 @@ private:
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 sal_True, if the object is disposed or in the course
of being disposed. Otherwise, sal_False is returned.
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx Mon Aug 1 04:31:52 2016
@@ -301,7 +301,7 @@ private:
::Window* mpContentWindow;
/** 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.
*/
@@ -309,7 +309,7 @@ private:
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 sal_True, if the object is disposed or in the course
of being disposed. Otherwise, sal_False is returned.
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleTreeNode.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleTreeNode.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleTreeNode.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/AccessibleTreeNode.hxx Mon Aug 1 04:31:52 2016
@@ -248,7 +248,7 @@ protected:
virtual ~AccessibleTreeNode (void);
/** 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.
*/
@@ -256,7 +256,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 sal_True, if the object is disposed or in the course
of being disposed. Otherwise, sal_False is returned.
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/GraphicViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/GraphicViewShell.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/GraphicViewShell.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/GraphicViewShell.hxx Mon Aug 1 04:31:52 2016
@@ -63,7 +63,7 @@ public:
virtual ~GraphicViewShell (void);
- /** This method is overloaded in order to have the layer mode allways
+ /** This method is overloaded in order to have the layer mode always
active.
*/
virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive);
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/ViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/ViewShell.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/ViewShell.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/ViewShell.hxx Mon Aug 1 04:31:52 2016
@@ -85,7 +85,7 @@ class ZoomList;
<p>Despite its name this class is not a descendant of SfxViewShell
but of SfxShell. Its name expresses the fact that it acts like a
- view shell. Beeing a stacked shell rather then being an actual view shell
+ view shell. Being a stacked shell rather then being an actual view shell
there can be several instances of this class that
<ul>
<li>all are based on the same view shell and thus show the same
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/taskpane/TitledControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/taskpane/TitledControl.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/taskpane/TitledControl.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/taskpane/TitledControl.hxx Mon Aug 1 04:31:52 2016
@@ -65,7 +65,7 @@ public:
The typical action of the click handler is to expand the control.
@param eType
Type of the title bar. This specifies how the title bar
- will be formated. For more information see TitleBar.
+ will be formatted. For more information see TitleBar.
*/
TitledControl (
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx Mon Aug 1 04:31:52 2016
@@ -1357,7 +1357,7 @@ bool NormalModeHandler::ProcessButtonDow
case BUTTON_DOWN | LEFT_BUTTON | DOUBLE_CLICK | OVER_SELECTED_PAGE:
case BUTTON_DOWN | LEFT_BUTTON | DOUBLE_CLICK | OVER_UNSELECTED_PAGE:
- // A double click allways shows the selected slide in the center
+ // A double click always shows the selected slide in the center
// pane in an edit view.
SetCurrentPage(rDescriptor.mpHitDescriptor);
SwitchView(rDescriptor.mpHitDescriptor);
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx Mon Aug 1 04:31:52 2016
@@ -88,7 +88,7 @@ public:
/** Return the model to which the pages belong for which the called
cache manages the previews. Different caches that belong to the
- same model but have different preview sizes may acces previews of
+ same model but have different preview sizes may access previews of
each other in order to create fast previews of the previews.
*/
virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) = 0;
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx Mon Aug 1 04:31:52 2016
@@ -105,7 +105,7 @@ public:
/** Invalidate the preview bitmaps for all slides that belong to the
specified document. This is necessary after model changes that
- affect e.g. page number fiels.
+ affect e.g. page number fields.
*/
void InvalidateAllPreviewBitmaps (DocumentKey pDocument);
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx Mon Aug 1 04:31:52 2016
@@ -57,7 +57,7 @@ class SlideSorterController;
has to be done explicitly by calling the
CurrentSlideManager::SetCurrentSlide() method.
- Indices of pages relate allways to the number of all pages in the model
+ Indices of pages relate always to the number of all pages in the model
(as returned by GetPageCount()) not just the selected pages.
*/
class PageSelector : private ::boost::noncopyable
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx Mon Aug 1 04:31:52 2016
@@ -541,7 +541,7 @@ bool SlideSorter::RelocateToWindow (::Wi
// For accessibility we have to shortly hide the content window. This
// triggers the construction of a new accessibility object for the new
- // view shell. (One is created earlier while the construtor of the base
+ // view shell. (One is created earlier while the constructor of the base
// class is executed. But because at that time the correct
// accessibility object can not be constructed we do that now.)
if (mpContentWindow.get() !=NULL)
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Mon Aug 1 04:31:52 2016
@@ -197,7 +197,7 @@ void SlideSorterViewShell::Initialize (v
// For accessibility we have to shortly hide the content window.
// This triggers the construction of a new accessibility object for
- // the new view shell. (One is created earlier while the construtor
+ // the new view shell. (One is created earlier while the constructor
// of the base class is executed. At that time the correct
// accessibility object can not be constructed.)
SharedSdWindow pWindow (mpSlideSorter->GetContentWindow());
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/unoidl/unolayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/unoidl/unolayer.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/unoidl/unolayer.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/unoidl/unolayer.hxx Mon Aug 1 04:31:52 2016
@@ -89,7 +89,7 @@ public:
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
- /** Not implemented. Allways throws an exception.
+ /** Not implemented. Always throws an exception.
@raises NoSupportException.
*/
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/drviewsa.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/drviewsa.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/drviewsa.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/drviewsa.cxx Mon Aug 1 04:31:52 2016
@@ -765,7 +765,7 @@ void DrawViewShell::GetStatusBarState(Sf
// Display of current page and layer.
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) )
{
- // Allways show the slide/page number.
+ // Always show the slide/page number.
String aString (SdResId( STR_SD_PAGE ));
aString += sal_Unicode(' ');
aString += UniString::CreateFromInt32( maTabControl.GetCurPageId() );
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/grviewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/grviewsh.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/grviewsh.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/grviewsh.cxx Mon Aug 1 04:31:52 2016
@@ -84,7 +84,7 @@ void GraphicViewShell::ChangeEditMode (
bool )
{
// There is no page tab that could be shown instead of the layer tab.
- // Therefore we have it allways visible regardless of what the caller
+ // Therefore we have it always visible regardless of what the caller
// said. (We have to change the callers behaviour, of course.)
DrawViewShell::ChangeEditMode (eMode, true);
}
Modified: openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/sdwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/sdwindow.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/sdwindow.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/sdwindow.cxx Mon Aug 1 04:31:52 2016
@@ -925,7 +925,7 @@ void Window::DataChanged( const DataChan
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
// When the screen zoom factor has changed then reset the zoom
- // factor of the frame to allways display the whole page.
+ // factor of the frame to always display the whole page.
const AllSettings* pOldSettings = rDCEvt.GetOldSettings ();
const AllSettings& rNewSettings = GetSettings ();
if (pOldSettings)