[openoffice] branch AOO42X updated: Update ParseContext.cxx (#103)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 2fe9d24 Update ParseContext.cxx (#103)
2fe9d24 is described below
commit 2fe9d24adc57252a1a6f8f9dfad5121f115f9607
Author: Matthias Seidel
AuthorDate: Sat Oct 3 23:15:42 2020 +0200
Update ParseContext.cxx (#103)
I think this is only one of those typical typos...
Using OpenGrok could not find any other reference outside this file, but I
am not sure if this would have side effects.
(cherry picked from commit 3d4431b63ef086f459ce0ed2174e6529deef99e4)
---
main/svx/source/form/ParseContext.cxx | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/main/svx/source/form/ParseContext.cxx
b/main/svx/source/form/ParseContext.cxx
index f2d91c3..d64b925 100644
--- a/main/svx/source/form/ParseContext.cxx
+++ b/main/svx/source/form/ParseContext.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -183,7 +183,7 @@ IParseContext::InternationalKeyCode
OSystemParseContext::getIntlKeyCode(const ::
namespace
{
//
-
- ::osl::Mutex& getSafteyMutex()
+ ::osl::Mutex& getSafetyMutex()
{
static ::osl::Mutex s_aSafety;
return s_aSafety;
@@ -216,7 +216,7 @@ namespace
//
-
OParseContextClient::OParseContextClient()
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 1 == osl_incrementInterlockedCount( () ) )
{ // first instance
getSharedContext( new OSystemParseContext );
@@ -227,7 +227,7 @@ OParseContextClient::OParseContextClient()
OParseContextClient::~OParseContextClient()
{
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 0 == osl_decrementInterlockedCount( () ) )
delete getSharedContext(NULL,sal_True);
}
@@ -238,8 +238,3 @@ const OSystemParseContext*
OParseContextClient::getParseContext() const
return getSharedContext();
}
//
-
-
-
-
-
-
[openoffice] branch trunk updated: Update ParseContext.cxx (#103)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3d4431b Update ParseContext.cxx (#103)
3d4431b is described below
commit 3d4431b63ef086f459ce0ed2174e6529deef99e4
Author: Matthias Seidel
AuthorDate: Sat Oct 3 23:15:42 2020 +0200
Update ParseContext.cxx (#103)
I think this is only one of those typical typos...
Using OpenGrok could not find any other reference outside this file, but I
am not sure if this would have side effects.
---
main/svx/source/form/ParseContext.cxx | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/main/svx/source/form/ParseContext.cxx
b/main/svx/source/form/ParseContext.cxx
index f2d91c3..d64b925 100644
--- a/main/svx/source/form/ParseContext.cxx
+++ b/main/svx/source/form/ParseContext.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -183,7 +183,7 @@ IParseContext::InternationalKeyCode
OSystemParseContext::getIntlKeyCode(const ::
namespace
{
//
-
- ::osl::Mutex& getSafteyMutex()
+ ::osl::Mutex& getSafetyMutex()
{
static ::osl::Mutex s_aSafety;
return s_aSafety;
@@ -216,7 +216,7 @@ namespace
//
-
OParseContextClient::OParseContextClient()
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 1 == osl_incrementInterlockedCount( () ) )
{ // first instance
getSharedContext( new OSystemParseContext );
@@ -227,7 +227,7 @@ OParseContextClient::OParseContextClient()
OParseContextClient::~OParseContextClient()
{
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 0 == osl_decrementInterlockedCount( () ) )
delete getSharedContext(NULL,sal_True);
}
@@ -238,8 +238,3 @@ const OSystemParseContext*
OParseContextClient::getParseContext() const
return getSharedContext();
}
//
-
-
-
-
-
-
[openoffice] branch AOO418 updated (7bcdd27 -> 2183b99)
This is an automated email from the ASF dual-hosted git repository. truckman pushed a change to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git. from 7bcdd27 Merge pull request #101 from DonLewisFreeBSD/javadetection new 2a62111 libxml2 bug fixes from upstream new 5661f8d Fix handling of NUL characters in certificate fields new 2183b99 Merge pull request #102 from DonLewisFreeBSD/libxml+serf-418 The 5234 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ext_libraries/serf/NULbytes.patch | 313 + ext_libraries/serf/makefile.mk | 2 +- .../0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch | 32 +++ .../50f06b3efb638efb0abd95dc62dca05ae67882c2.patch | 36 +++ .../7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch | 33 +++ main/libxml2/makefile.mk | 5 +- 6 files changed, 419 insertions(+), 2 deletions(-) create mode 100644 ext_libraries/serf/NULbytes.patch create mode 100644 main/libxml2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch create mode 100644 main/libxml2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch create mode 100644 main/libxml2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 960b059 Fixed typos, removed whitespace
960b059 is described below
commit 960b059c8b1d7dc469c52856163d126e06ac8fea
Author: mseidel
AuthorDate: Sat Oct 3 20:21:43 2020 +0200
Fixed typos, removed whitespace
(cherry picked from commit 97c864ccfe6c563736c463d8df22c104e3b40fee)
---
main/avmedia/source/framework/mediamisc.cxx| 25 +++--
main/avmedia/source/viewer/mediaevent_impl.cxx | 10 +-
main/avmedia/source/viewer/mediawindow.cxx | 13 ++-
.../avmedia/source/viewer/mediawindowbase_impl.cxx | 50 -
.../desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 46
main/desktop/win32/source/guistdio/guistdio.inc| 60 +-
main/desktop/win32/source/setup/setup.cpp | 124 ++---
7 files changed, 165 insertions(+), 163 deletions(-)
diff --git a/main/avmedia/source/framework/mediamisc.cxx
b/main/avmedia/source/framework/mediamisc.cxx
index 1d51809..726e75a 100644
--- a/main/avmedia/source/framework/mediamisc.cxx
+++ b/main/avmedia/source/framework/mediamisc.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -29,16 +29,17 @@ namespace avmedia {
ResMgr* GetResMgr()
{
-static ResMgr* pResMgr = NULL;
+ static ResMgr* pResMgr = NULL;
-if( !pResMgr )
-{
-ByteString aResMgrName( "avmedia" );
+ if( !pResMgr )
+ {
+ ByteString aResMgrName( "avmedia" );
-pResMgr = ResMgr::CreateResMgr(aResMgrName.GetBuffer(),
Application::GetSettings().GetUILocale() );
-}
+ pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(),
Application::GetSettings().GetUILocale() );
+ }
-return pResMgr;
+ return pResMgr;
}
-} // namespace avemdia
+} // namespace avmedia
+
diff --git a/main/avmedia/source/viewer/mediaevent_impl.cxx
b/main/avmedia/source/viewer/mediaevent_impl.cxx
index a5de07b..db0779b 100644
--- a/main/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/main/avmedia/source/viewer/mediaevent_impl.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -215,5 +215,5 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const
::com::sun::star::awt::F
}
} // namespace priv
-} // namespace avemdia
+} // namespace avmedia
diff --git a/main/avmedia/source/viewer/mediawindow.cxx
b/main/avmedia/source/viewer/mediawindow.cxx
index fe2f1eb..3217c54 100644
--- a/main/avmedia/source/viewer/mediawindow.cxx
+++ b/main/avmedia/source/viewer/mediawindow.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 97c864c Fixed typos, removed whitespace
97c864c is described below
commit 97c864ccfe6c563736c463d8df22c104e3b40fee
Author: mseidel
AuthorDate: Sat Oct 3 20:21:43 2020 +0200
Fixed typos, removed whitespace
---
main/avmedia/source/framework/mediamisc.cxx| 25 +++--
main/avmedia/source/viewer/mediaevent_impl.cxx | 10 +-
main/avmedia/source/viewer/mediawindow.cxx | 13 ++-
.../avmedia/source/viewer/mediawindowbase_impl.cxx | 50 -
.../desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 46
main/desktop/win32/source/guistdio/guistdio.inc| 60 +-
main/desktop/win32/source/setup/setup.cpp | 124 ++---
7 files changed, 165 insertions(+), 163 deletions(-)
diff --git a/main/avmedia/source/framework/mediamisc.cxx
b/main/avmedia/source/framework/mediamisc.cxx
index 1d51809..726e75a 100644
--- a/main/avmedia/source/framework/mediamisc.cxx
+++ b/main/avmedia/source/framework/mediamisc.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -29,16 +29,17 @@ namespace avmedia {
ResMgr* GetResMgr()
{
-static ResMgr* pResMgr = NULL;
+ static ResMgr* pResMgr = NULL;
-if( !pResMgr )
-{
-ByteString aResMgrName( "avmedia" );
+ if( !pResMgr )
+ {
+ ByteString aResMgrName( "avmedia" );
-pResMgr = ResMgr::CreateResMgr(aResMgrName.GetBuffer(),
Application::GetSettings().GetUILocale() );
-}
+ pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(),
Application::GetSettings().GetUILocale() );
+ }
-return pResMgr;
+ return pResMgr;
}
-} // namespace avemdia
+} // namespace avmedia
+
diff --git a/main/avmedia/source/viewer/mediaevent_impl.cxx
b/main/avmedia/source/viewer/mediaevent_impl.cxx
index a5de07b..db0779b 100644
--- a/main/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/main/avmedia/source/viewer/mediaevent_impl.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -215,5 +215,5 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const
::com::sun::star::awt::F
}
} // namespace priv
-} // namespace avemdia
+} // namespace avmedia
diff --git a/main/avmedia/source/viewer/mediawindow.cxx
b/main/avmedia/source/viewer/mediawindow.cxx
index fe2f1eb..3217c54 100644
--- a/main/avmedia/source/viewer/mediawindow.cxx
+++ b/main/avmedia/source/viewer/mediawindow.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 53d915a Fixed typos, removed whitespace
53d915a is described below
commit 53d915a9aadc909eb24ce1d40fc104301d7ca7ad
Author: mseidel
AuthorDate: Sat Oct 3 14:37:53 2020 +0200
Fixed typos, removed whitespace
(cherry picked from commit 33608c82206695bbbe0b645fe8a658bc051dbbbe)
---
main/desktop/source/app/lockfile.cxx | 112 ++--
main/desktop/source/migration/migration.cxx| 55 +++---
main/desktop/source/pkgchk/unopkg/unopkg_app.cxx | 99 +-
.../win32/source/guiloader/genericloader.cxx | 98 +-
.../source/layoutmanager/toolbarlayoutmanager.cxx | 201 +++--
main/framework/source/tabwin/tabwindow.cxx | 23 +--
6 files changed, 291 insertions(+), 297 deletions(-)
diff --git a/main/desktop/source/app/lockfile.cxx
b/main/desktop/source/app/lockfile.cxx
index 0758404..b8da3cf 100644
--- a/main/desktop/source/app/lockfile.cxx
+++ b/main/desktop/source/app/lockfile.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -51,29 +51,29 @@ namespace desktop {
// initialize static members...
// lock suffix
const OUString Lockfile::Suffix()
- { return OUString::createFromAscii( "/.lock" ); }
+ { return OUString::createFromAscii( "/.lock" ); }
// values for datafile
const ByteString Lockfile::Group()
-{ return ByteString( "Lockdata" ); }
+ { return ByteString( "Lockdata" ); }
const ByteString Lockfile::Userkey()
-{ return ByteString( "User" ); }
+ { return ByteString( "User" ); }
const ByteString Lockfile::Hostkey()
-{ return ByteString( "Host" ); }
+ { return ByteString( "Host" ); }
const ByteString Lockfile::Stampkey()
-{ return ByteString( "Stamp" ); }
+ { return ByteString( "Stamp" ); }
const ByteString Lockfile::Timekey()
-{ return ByteString( "Time" ); }
+ { return ByteString( "Time" ); }
const ByteString Lockfile::IPCkey()
-{ return ByteString( "IPCServer" ); }
+ { return ByteString( "IPCServer" ); }
Lockfile::Lockfile( bool bIPCserver )
-:m_bIPCserver(bIPCserver)
+ :m_bIPCserver(bIPCserver)
,m_bRemove(sal_False)
-,m_bIsLocked(sal_False)
+ ,m_bIsLocked(sal_False)
{
// build the file-url to use for the lock
OUString aUserPath;
-utl::Bootstrap::locateUserInstallation( aUserPath );
+ utl::Bootstrap::locateUserInstallation( aUserPath );
m_aLockname = aUserPath + Suffix();
// generate ID
@@ -92,11 +92,11 @@ namespace desktop {
// generate date string
char *tmpTime = ctime( );
if (tmpTime != NULL) {
-m_aDate = OUString::createFromAscii( tmpTime );
-sal_Int32 i = m_aDate.indexOf('\n');
-if (i > 0)
-m_aDate = m_aDate.copy(0, i);
-}
+ m_aDate = OUString::createFromAscii( tmpTime );
+ sal_Int32 i = m_aDate.indexOf('\n');
+ if (i > 0)
+ m_aDate = m_aDate.copy(0, i);
+ }
// try to create file
@@ -117,7 +117,7 @@ namespace desktop {
if (m_bIsLocked) {
// lock existed, ask user what to do
if (isStale() ||
-(execWarning != 0 && (*execWarning)( this ))) {
+ (execWarning != 0 && (*execWarning)( this ))) {
// remove file and create new
File::remove( m_aLockname );
File aFile(m_aLockname);
@@ -145,29
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 33608c8 Fixed typos, removed whitespace
33608c8 is described below
commit 33608c82206695bbbe0b645fe8a658bc051dbbbe
Author: mseidel
AuthorDate: Sat Oct 3 14:37:53 2020 +0200
Fixed typos, removed whitespace
---
main/desktop/source/app/lockfile.cxx | 112 ++--
main/desktop/source/migration/migration.cxx| 55 +++---
main/desktop/source/pkgchk/unopkg/unopkg_app.cxx | 99 +-
.../win32/source/guiloader/genericloader.cxx | 98 +-
.../source/layoutmanager/toolbarlayoutmanager.cxx | 201 +++--
main/framework/source/tabwin/tabwindow.cxx | 23 +--
6 files changed, 291 insertions(+), 297 deletions(-)
diff --git a/main/desktop/source/app/lockfile.cxx
b/main/desktop/source/app/lockfile.cxx
index 0758404..b8da3cf 100644
--- a/main/desktop/source/app/lockfile.cxx
+++ b/main/desktop/source/app/lockfile.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -51,29 +51,29 @@ namespace desktop {
// initialize static members...
// lock suffix
const OUString Lockfile::Suffix()
- { return OUString::createFromAscii( "/.lock" ); }
+ { return OUString::createFromAscii( "/.lock" ); }
// values for datafile
const ByteString Lockfile::Group()
-{ return ByteString( "Lockdata" ); }
+ { return ByteString( "Lockdata" ); }
const ByteString Lockfile::Userkey()
-{ return ByteString( "User" ); }
+ { return ByteString( "User" ); }
const ByteString Lockfile::Hostkey()
-{ return ByteString( "Host" ); }
+ { return ByteString( "Host" ); }
const ByteString Lockfile::Stampkey()
-{ return ByteString( "Stamp" ); }
+ { return ByteString( "Stamp" ); }
const ByteString Lockfile::Timekey()
-{ return ByteString( "Time" ); }
+ { return ByteString( "Time" ); }
const ByteString Lockfile::IPCkey()
-{ return ByteString( "IPCServer" ); }
+ { return ByteString( "IPCServer" ); }
Lockfile::Lockfile( bool bIPCserver )
-:m_bIPCserver(bIPCserver)
+ :m_bIPCserver(bIPCserver)
,m_bRemove(sal_False)
-,m_bIsLocked(sal_False)
+ ,m_bIsLocked(sal_False)
{
// build the file-url to use for the lock
OUString aUserPath;
-utl::Bootstrap::locateUserInstallation( aUserPath );
+ utl::Bootstrap::locateUserInstallation( aUserPath );
m_aLockname = aUserPath + Suffix();
// generate ID
@@ -92,11 +92,11 @@ namespace desktop {
// generate date string
char *tmpTime = ctime( );
if (tmpTime != NULL) {
-m_aDate = OUString::createFromAscii( tmpTime );
-sal_Int32 i = m_aDate.indexOf('\n');
-if (i > 0)
-m_aDate = m_aDate.copy(0, i);
-}
+ m_aDate = OUString::createFromAscii( tmpTime );
+ sal_Int32 i = m_aDate.indexOf('\n');
+ if (i > 0)
+ m_aDate = m_aDate.copy(0, i);
+ }
// try to create file
@@ -117,7 +117,7 @@ namespace desktop {
if (m_bIsLocked) {
// lock existed, ask user what to do
if (isStale() ||
-(execWarning != 0 && (*execWarning)( this ))) {
+ (execWarning != 0 && (*execWarning)( this ))) {
// remove file and create new
File::remove( m_aLockname );
File aFile(m_aLockname);
@@ -145,29 +145,29 @@ namespace desktop {
String aLockname = m_aLockname;
[openoffice] 01/01: Update ParseContext.cxx
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-patch-1
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 3f2c418bee7558bb5352601bee3e16f856c2a9d5
Author: Matthias Seidel
AuthorDate: Sat Oct 3 14:19:39 2020 +0200
Update ParseContext.cxx
I think this is only one of those typical typos...
Using OpenGrok could not find any other reference outside this file, but I
am not sure if this would have side effects.
---
main/svx/source/form/ParseContext.cxx | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/main/svx/source/form/ParseContext.cxx
b/main/svx/source/form/ParseContext.cxx
index f2d91c3..d64b925 100644
--- a/main/svx/source/form/ParseContext.cxx
+++ b/main/svx/source/form/ParseContext.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -183,7 +183,7 @@ IParseContext::InternationalKeyCode
OSystemParseContext::getIntlKeyCode(const ::
namespace
{
//
-
- ::osl::Mutex& getSafteyMutex()
+ ::osl::Mutex& getSafetyMutex()
{
static ::osl::Mutex s_aSafety;
return s_aSafety;
@@ -216,7 +216,7 @@ namespace
//
-
OParseContextClient::OParseContextClient()
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 1 == osl_incrementInterlockedCount( () ) )
{ // first instance
getSharedContext( new OSystemParseContext );
@@ -227,7 +227,7 @@ OParseContextClient::OParseContextClient()
OParseContextClient::~OParseContextClient()
{
{
- ::osl::MutexGuard aGuard( getSafteyMutex() );
+ ::osl::MutexGuard aGuard( getSafetyMutex() );
if ( 0 == osl_decrementInterlockedCount( () ) )
delete getSharedContext(NULL,sal_True);
}
@@ -238,8 +238,3 @@ const OSystemParseContext*
OParseContextClient::getParseContext() const
return getSharedContext();
}
//
-
-
-
-
-
-
[openoffice] branch Pilot-Pirx-patch-1 created (now 3f2c418)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git. at 3f2c418 Update ParseContext.cxx This branch includes the following new commits: new 3f2c418 Update ParseContext.cxx The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
