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 537d918930 Fixed typos, cleanup
537d918930 is described below
commit 537d918930a77db9c28916ebc25c79ea73c289a1
Author: mseidel <[email protected]>
AuthorDate: Sat Sep 6 16:44:43 2025 +0200
Fixed typos, cleanup
---
main/canvas/inc/canvas/base/bitmapcanvasbase.hxx | 4 +--
main/dbaccess/source/core/api/RowSetBase.hxx | 9 +++---
.../inc/framework/statusbarconfiguration.hxx | 17 ++++++-----
main/framework/inc/framework/titlehelper.hxx | 14 ++++-----
.../inc/framework/toolboxconfiguration.hxx | 27 +++++++++--------
main/framework/inc/framework/undomanagerhelper.hxx | 6 ++--
main/sdext/source/presenter/PresenterTimer.cxx | 35 ++--------------------
main/sw/source/core/access/accdoc.hxx | 8 ++---
8 files changed, 47 insertions(+), 73 deletions(-)
diff --git a/main/canvas/inc/canvas/base/bitmapcanvasbase.hxx
b/main/canvas/inc/canvas/base/bitmapcanvasbase.hxx
index 9714095eea..c8896d537c 100644
--- a/main/canvas/inc/canvas/base/bitmapcanvasbase.hxx
+++ b/main/canvas/inc/canvas/base/bitmapcanvasbase.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
#define INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
@@ -128,3 +126,5 @@ namespace canvas
}
#endif /* INCLUDED_CANVAS_BITMAPCANVASBASE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/dbaccess/source/core/api/RowSetBase.hxx
b/main/dbaccess/source/core/api/RowSetBase.hxx
index 56c02bb42b..b6ddc2579e 100644
--- a/main/dbaccess/source/core/api/RowSetBase.hxx
+++ b/main/dbaccess/source/core/api/RowSetBase.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef DBACCESS_CORE_API_ROWSETBASE_HXX
#define DBACCESS_CORE_API_ROWSETBASE_HXX
@@ -125,7 +124,7 @@ namespace dbaccess
typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
::osl::Mutex*
m_pMutex; // this the mutex form the rowset itself
::osl::Mutex
m_aRowCountMutex, // mutex for rowcount changes
-
// we need a extra mutex for columns to prevend deadlock when
setting new values
+
// we need an extra mutex for columns to prevent deadlock when
setting new values
// for a row
m_aColumnsMutex;
@@ -265,7 +264,7 @@ namespace dbaccess
count.
@precond
- Our mutext is locked.
+ Our mutex is locked.
*/
sal_Int32 impl_getRowCount() const;
@@ -447,7 +446,7 @@ namespace dbaccess
*/
void firePropertyChange();
- /** use this one to store the inde of the changed column values
+ /** use this one to store the index of the changed column values
*/
::std::vector<sal_Int32>& getChangedColumns() const;
::std::vector<com::sun::star::uno::Any>& getChangedBookmarks() const;
@@ -457,3 +456,5 @@ namespace dbaccess
} // end of namespace
#endif // DBACCESS_CORE_API_ROWSETBASE_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/inc/framework/statusbarconfiguration.hxx
b/main/framework/inc/framework/statusbarconfiguration.hxx
index fa567b2641..8d8f81638d 100644
--- a/main/framework/inc/framework/statusbarconfiguration.hxx
+++ b/main/framework/inc/framework/statusbarconfiguration.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
@@ -41,7 +40,7 @@ struct FWE_DLLPUBLIC StatusBarItemDescriptor
{
String aURL; // URL command
to dispatch
long nItemBits; // properties
for this statusbar item (WinBits)
- long nWidth; // width of a
statusbar item
+ long nWidth; // width of a
statusbar item
long nOffset; // offset
public:
@@ -65,17 +64,19 @@ class FWE_DLLPUBLIC StatusBarConfiguration
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const StatusBarDescriptor& aItems
);
- static sal_Bool LoadStatusBar(
+ static sal_Bool LoadStatusBar(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& xInputStream,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration );
+ const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& xInputStream,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration );
- static sal_Bool StoreStatusBar(
+ static sal_Bool StoreStatusBar(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream >& xOutputStream,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration );
+ const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream >& xOutputStream,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration );
};
} // namespace framework
#endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/inc/framework/titlehelper.hxx
b/main/framework/inc/framework/titlehelper.hxx
index 271c5ec749..c1ab42d798 100644
--- a/main/framework/inc/framework/titlehelper.hxx
+++ b/main/framework/inc/framework/titlehelper.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _FRAMEWORK_TITLEHELPER_HXX_
#define _FRAMEWORK_TITLEHELPER_HXX_
@@ -92,9 +90,9 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
/** set an outside component which uses this container and must be set
as source of all broadcasted messages, exceptions.
- It's holded weak only so we do not need any complex dispose
sessions.
+ It's held weak only so we do not need any complex dispose sessions.
- Note: Passing NULL as parameter will be alloed. It will reset the
internal
+ Note: Passing NULL as parameter will be allowed. It will reset the
internal
member reference only.
@param xOwner
@@ -103,12 +101,12 @@ class FWE_DLLPUBLIC TitleHelper : private
::cppu::BaseMutex
void setOwner (const css::uno::Reference< css::uno::XInterface >&
xOwner);
//---------------------------------------
- /** set an outside component which provides the righht string and
number for
+ /** set an outside component which provides the right string and
number for
an untitled component.
- It's holded weak only so we do not need any complex dispose
sessions.
+ It's held weak only so we do not need any complex dispose sessions.
- Note: Passing NULL as parameter will be alloed. It will reset the
internal
+ Note: Passing NULL as parameter will be allowed. It will reset the
internal
member reference only.
@param xNumbers
@@ -222,3 +220,5 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
} // namespace framework
#endif // _FRAMEWORK_TITLEHELPER_HXX_
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/inc/framework/toolboxconfiguration.hxx
b/main/framework/inc/framework/toolboxconfiguration.hxx
index 1e77e6310d..37e33900a1 100644
--- a/main/framework/inc/framework/toolboxconfiguration.hxx
+++ b/main/framework/inc/framework/toolboxconfiguration.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
#define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
@@ -42,20 +41,22 @@ namespace framework
class FWE_DLLPUBLIC ToolBoxConfiguration
{
- public:
- // #110897#
- static sal_Bool LoadToolBox(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& rInputStream,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
-
- // #110897#
- static sal_Bool StoreToolBox(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream >& rOutputStream,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess >& rToolbarConfiguration );
+ public:
+ // #110897#
+ static sal_Bool LoadToolBox(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& rInputStream,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
+
+ // #110897#
+ static sal_Bool StoreToolBox(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream >& rOutputStream,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess >& rToolbarConfiguration );
};
} // namespace framework
#endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/inc/framework/undomanagerhelper.hxx
b/main/framework/inc/framework/undomanagerhelper.hxx
index 07e1aa2168..f8d899d51c 100644
--- a/main/framework/inc/framework/undomanagerhelper.hxx
+++ b/main/framework/inc/framework/undomanagerhelper.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef FRAMEWORK_UNDOMANAGERHELPER_HXX
#define FRAMEWORK_UNDOMANAGERHELPER_HXX
@@ -87,7 +85,7 @@ namespace framework
/** helper class for implementing an XUndoManager
Several of the methods of the class take an IMutexGuard instance. It
is assumed that this guard has a lock on
- its mutext at the moment the method is entered. The lock will be
released before any notifications to the
+ its mutex at the moment the method is entered. The lock will be
released before any notifications to the
registered XUndoManagerListeners happen.
The following locking strategy is used for this mutex:
@@ -155,3 +153,5 @@ namespace framework
//......................................................................................................................
#endif // FRAMEWORK_UNDOMANAGERHELPER_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/presenter/PresenterTimer.cxx
b/main/sdext/source/presenter/PresenterTimer.cxx
index b243fda777..1ededc0823 100644
--- a/main/sdext/source/presenter/PresenterTimer.cxx
+++ b/main/sdext/source/presenter/PresenterTimer.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -73,7 +71,6 @@ public:
-
/** Queue all scheduled tasks and process them when their time has come.
*/
class TimerScheduler
@@ -125,7 +122,6 @@ private:
-
bool GetDateTime (oslDateTime& rDateTime);
} // end of anonymous namespace
@@ -141,7 +137,6 @@ sal_Int32 PresenterTimer::ScheduleSingleTaskRelative (
-
sal_Int32 PresenterTimer::ScheduleSingleTaskAbsolute (
const Task& rTask,
const TimeValue& rDueTime)
@@ -153,7 +148,6 @@ sal_Int32 PresenterTimer::ScheduleSingleTaskAbsolute (
-
sal_Int32 PresenterTimer::ScheduleRepeatedTask (
const Task& rTask,
const sal_Int64 nDelay,
@@ -176,7 +170,6 @@ sal_Int32 PresenterTimer::ScheduleRepeatedTask (
-
void PresenterTimer::CancelTask (const sal_Int32 nTaskId)
{
return TimerScheduler::Instance()->CancelTask(nTaskId);
@@ -184,7 +177,6 @@ void PresenterTimer::CancelTask (const sal_Int32 nTaskId)
-
//===== TimerScheduler ========================================================
::boost::shared_ptr<TimerScheduler> TimerScheduler::mpInstance;
@@ -214,7 +206,6 @@ sal_Int32 TimerScheduler::mnTaskId =
PresenterTimer::NotAValidTaskId;
-
void TimerScheduler::Release (void)
{
::osl::MutexGuard aGuard (maInstanceMutex);
@@ -223,7 +214,6 @@ void TimerScheduler::Release (void)
-
TimerScheduler::TimerScheduler (void)
: maTaskContainerMutex(),
maScheduledTasks(),
@@ -235,7 +225,6 @@ TimerScheduler::TimerScheduler (void)
-
TimerScheduler::~TimerScheduler (void)
{
}
@@ -252,7 +241,6 @@ SharedTimerTask TimerScheduler::CreateTimerTask (
-
void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask)
{
if (rpTask.get() == NULL)
@@ -272,7 +260,6 @@ void TimerScheduler::ScheduleTask (const SharedTimerTask&
rpTask)
-
void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
{
// Set of scheduled tasks is sorted after their due times, not their
@@ -313,7 +300,6 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
-
void SAL_CALL TimerScheduler::run (void)
{
while (mbIsRunning)
@@ -326,7 +312,7 @@ void SAL_CALL TimerScheduler::run (void)
break;
}
- // Restrict access to the maScheduledTasks member to one, mutext
+ // Restrict access to the maScheduledTasks member to one, mutex
// guarded, block.
SharedTimerTask pTask;
sal_Int64 nDifference = 0;
@@ -392,7 +378,6 @@ void SAL_CALL TimerScheduler::run (void)
-
void SAL_CALL TimerScheduler::onTerminated (void)
{
Release();
@@ -400,7 +385,6 @@ void SAL_CALL TimerScheduler::onTerminated (void)
-
bool TimerScheduler::GetCurrentTime (TimeValue& rCurrentTime)
{
TimeValue aSystemTime;
@@ -411,7 +395,6 @@ bool TimerScheduler::GetCurrentTime (TimeValue&
rCurrentTime)
-
sal_Int64 TimerScheduler::GetTimeDifference (
const TimeValue& rTargetTime,
const TimeValue& rCurrentTime)
@@ -421,7 +404,6 @@ sal_Int64 TimerScheduler::GetTimeDifference (
-
void TimerScheduler::ConvertToTimeValue (
TimeValue& rTimeValue,
const sal_Int64 nTimeDifference)
@@ -432,7 +414,6 @@ void TimerScheduler::ConvertToTimeValue (
-
sal_Int64 TimerScheduler::ConvertFromTimeValue (
const TimeValue& rTimeValue)
{
@@ -441,7 +422,6 @@ sal_Int64 TimerScheduler::ConvertFromTimeValue (
-
//===== TimerTask =============================================================
namespace {
@@ -463,7 +443,6 @@ TimerTask::TimerTask (
-
//===== PresenterTimer ========================================================
@@ -489,7 +468,6 @@ TimerTask::TimerTask (
-
PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>&
rxContext)
: PresenterClockTimerInterfaceBase(m_aMutex),
maListeners(),
@@ -510,7 +488,6 @@ PresenterClockTimer::PresenterClockTimer (const
Reference<XComponentContext>& rx
-
PresenterClockTimer::~PresenterClockTimer (void)
{
if (mnTimerTaskId != PresenterTimer::NotAValidTaskId)
@@ -527,7 +504,6 @@ PresenterClockTimer::~PresenterClockTimer (void)
-
void PresenterClockTimer::AddListener (const SharedListener& rListener)
{
osl::MutexGuard aGuard (maMutex);
@@ -546,7 +522,6 @@ void PresenterClockTimer::AddListener (const
SharedListener& rListener)
-
void PresenterClockTimer::RemoveListener (const SharedListener& rListener)
{
osl::MutexGuard aGuard (maMutex);
@@ -571,7 +546,6 @@ void PresenterClockTimer::RemoveListener (const
SharedListener& rListener)
-
oslDateTime PresenterClockTimer::GetCurrentTime (void)
{
TimeValue aCurrentTime;
@@ -583,7 +557,6 @@ oslDateTime PresenterClockTimer::GetCurrentTime (void)
-
sal_Int64 PresenterClockTimer::GetTimeDifference (
const oslDateTime& rNow,
const oslDateTime& rThen)
@@ -601,7 +574,6 @@ sal_Int64 PresenterClockTimer::GetTimeDifference (
-
void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime)
{
css::uno::Reference<css::awt::XRequestCallback> xRequestCallback;
@@ -637,7 +609,6 @@ void PresenterClockTimer::CheckCurrentTime (const
TimeValue& rCurrentTime)
-
//----- XCallback -------------------------------------------------------------
void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData)
@@ -669,6 +640,6 @@ void SAL_CALL PresenterClockTimer::notify (const
css::uno::Any& rUserData)
}
}
-
-
} } // end of namespace ::sdext::presenter
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/access/accdoc.hxx
b/main/sw/source/core/access/accdoc.hxx
index a334485195..7869142d9e 100644
--- a/main/sw/source/core/access/accdoc.hxx
+++ b/main/sw/source/core/access/accdoc.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _ACCDOC_HXX
#define _ACCDOC_HXX
#ifndef _ACCCONTEXT_HXX
@@ -48,7 +47,7 @@ class SwAccessibleDocumentBase : public
SwAccessibleContext
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> mxParent;
- Window* mpChildWin; // protected by solar mutext
+ Window* mpChildWin; // protected by solar mutex
using SwAccessibleFrame::SetVisArea;
@@ -116,7 +115,6 @@ public:
};
-
/**
* access to an accessible Writer document
*/
@@ -132,7 +130,7 @@ class SwAccessibleDocument : public
SwAccessibleDocumentBase,
protected:
// Set states for getAccessibleStateSet.
- // This drived class additinaly sets MULTISELECTABLE(1)
+ // This derived class additionally sets MULTISELECTABLE(1)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
virtual ~SwAccessibleDocument();
@@ -235,3 +233,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
