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 984d38c3d8 Fixed typos
984d38c3d8 is described below
commit 984d38c3d8b0ba1155b90e2079b895325a44bba5
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Apr 20 22:24:25 2024 +0200
Fixed typos
(cherry picked from commit 73fec56a8c7e87333c35112dd7464c115a13a8c8)
---
main/sfx2/source/inc/statcach.hxx | 71 ++++++++++++++++++++-------------------
main/tools/source/fsys/dirent.cxx | 22 ++++++------
2 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/main/sfx2/source/inc/statcach.hxx
b/main/sfx2/source/inc/statcach.hxx
index 8179233120..30d131900a 100644
--- a/main/sfx2/source/inc/statcach.hxx
+++ b/main/sfx2/source/inc/statcach.hxx
@@ -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,19 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
#ifndef _SFXSTATCACH_HXX
#define _SFXSTATCACH_HXX
@@ -55,13 +54,13 @@ friend class SfxStateCache;
::com::sun::star::util::URL
aURL;
::com::sun::star::frame::FeatureStateEvent aStatus;
SfxStateCache* pCache;
- const SfxSlot* pSlot;
+ const SfxSlot* pSlot;
public:
BindDispatch_Impl(
const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp,
const
::com::sun::star::util::URL& rURL,
- SfxStateCache* pStateCache, const SfxSlot*
pSlot );
+ SfxStateCache*
pStateCache, const SfxSlot* pSlot );
SFX_DECL_XINTERFACE_XTYPEPROVIDER
@@ -70,24 +69,24 @@ public:
void Release();
const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const;
- void Dispatch( com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron =
sal_False );
+ void Dispatch(
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps,
sal_Bool bForceSynchron = sal_False );
};
class SfxStateCache
{
friend class BindDispatch_Impl;
BindDispatch_Impl* pDispatch;
- sal_uInt16 nId; // Slot-Id
- SfxControllerItem* pInternalController;
- com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
xMyDispatch;
- SfxControllerItem* pController; // Ptr auf 1. gebundenen
Controller (untereinander verkettet)
- SfxSlotServer aSlotServ; // SlotServer,
SlotPtr = 0 -> Nicht auf Stack
- SfxPoolItem* pLastItem; // zuletzt
verschicktes Item, nie -1
- SfxItemState eLastState; // zuletzt verschickter
State
- sal_Bool bCtrlDirty:1; // Controller
aktualisiert?
- sal_Bool bSlotDirty:1; // Funktion gfs.
vorhanden, muss aktualisiert werden
- sal_Bool bItemVisible:1;// item visibility
- sal_Bool bItemDirty; // G"ultigkeit von
pLastItem
+ sal_uInt16 nId; //
Slot-Id
+ SfxControllerItem* pInternalController;
+ com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
xMyDispatch;
+ SfxControllerItem* pController; // Ptr auf 1.
gebundenen Controller (untereinander verkettet)
+ SfxSlotServer aSlotServ; // SlotServer,
SlotPtr = 0 -> Nicht auf Stack
+ SfxPoolItem* pLastItem; // zuletzt
verschicktes Item, nie -1
+ SfxItemState eLastState; // zuletzt
verschickter State
+ sal_Bool bCtrlDirty:1; // Controller
aktualisiert?
+ sal_Bool bSlotDirty:1; // Funktion
ggfs. vorhanden, muss aktualisiert werden
+ sal_Bool bItemVisible:1; // item
visibility
+ sal_Bool bItemDirty; //
Gültigkeit von pLastItem
private:
SfxStateCache( const
SfxStateCache& rOrig ); // n.i.
@@ -99,11 +98,11 @@ public:
sal_uInt16 GetId() const;
- const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat, const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >
& xProv );
- const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat )
- { return GetSlotServer( rDispat,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >
() ); }
+ const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat, const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >
& xProv );
+ const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat )
+ { return GetSlotServer(
rDispat, ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > () ); }
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
GetDispatch() const;
- void Dispatch( const SfxItemSet* pSet, sal_Bool
bForceSynchron = sal_False );
+ void Dispatch( const SfxItemSet*
pSet, sal_Bool bForceSynchron = sal_False );
sal_Bool IsControllerDirty()
const
{ return bCtrlDirty ?
sal_True : sal_False; }
SfxPoolItem* GetItem() const { return pLastItem; }
@@ -113,24 +112,24 @@ public:
void SetCachedState(sal_Bool bAlways
= sal_False);
void DeleteFloatingWindows();
void Invalidate( sal_Bool bWithSlot
);
- void SetVisibleState( sal_Bool bShow=sal_True );
+ void SetVisibleState( sal_Bool
bShow=sal_True );
SfxControllerItem* ChangeItemLink( SfxControllerItem*
pNewBinding );
SfxControllerItem* GetItemLink() const;
- void SetInternalController( SfxControllerItem* pCtrl )
- { DBG_ASSERT( !pInternalController, "Only one
internal controller allowed!" ); pInternalController = pCtrl; }
- void ReleaseInternalController() { pInternalController
= 0; }
- SfxControllerItem* GetInternalController() const { return
pInternalController; }
- com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
- GetInternalDispatch() const
- { return xMyDispatch; }
- void SetInternalDispatch( const
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >& rDisp )
- { xMyDispatch = rDisp; }
+ void SetInternalController(
SfxControllerItem* pCtrl )
+ { DBG_ASSERT(
!pInternalController, "Only one internal controller allowed!" );
pInternalController = pCtrl; }
+ void ReleaseInternalController() {
pInternalController = 0; }
+ SfxControllerItem* GetInternalController() const { return
pInternalController; }
+ com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
+ GetInternalDispatch()
const
+ { return xMyDispatch; }
+ void SetInternalDispatch( const
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >& rDisp )
+ { xMyDispatch = rDisp; }
};
//--------------------------------------------------------------------
-// checks wheather this function is in the stack of active SfxObjectInterface
+// checks whether this function is in the stack of active SfxObjectInterface
//inline sal_Bool SfxStateCache::IsCallable( SfxDispatcher &rDispat )
//{
@@ -147,7 +146,7 @@ inline void SfxStateCache::ClearCache()
//--------------------------------------------------------------------
-// registeres a item representing this function
+// registers an item representing this function
inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem*
pNewBinding )
{
@@ -176,3 +175,5 @@ inline sal_uInt16 SfxStateCache::GetId() const
}
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/tools/source/fsys/dirent.cxx
b/main/tools/source/fsys/dirent.cxx
index e3da349f84..214bd40515 100644
--- a/main/tools/source/fsys/dirent.cxx
+++ b/main/tools/source/fsys/dirent.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,24 +7,21 @@
* 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.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx"
-
#if !defined UNX
#include <io.h>
#include <process.h>
@@ -158,16 +155,16 @@ void FSysRedirector::DoRedirect( String &rPath )
if ( !IsRedirectable_Impl( ByteString( aURL,
osl_getThreadTextEncoding() ) ) )
return;
- // Redirection is acessible only by one thread per time
- // dont move the guard behind the bInRedirection check!!!
+ // Redirection is accessible only by one thread per time
+ // don't move the guard behind the bInRedirection check!!!
// think of nested calls (when called from callback)
vos:: OGuard aGuard( pRedirectMutex );
- // if already in redirection, dont redirect
+ // if already in redirection, don't redirect
if ( bInRedirection )
return;
- // dont redirect on nested calls
+ // don't redirect on nested calls
bInRedirection = sal_True;
// convert to URL
@@ -1463,7 +1460,7 @@ sal_Bool DirEntry::operator==( const DirEntry& rEntry )
const
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
- // test wheather the contents are textual the same
+ // test whether the contents are textual the same
if ( nError && ( nError == rEntry.nError ) )
return sal_True;
@@ -3207,3 +3204,4 @@ void FSysTest()
#endif
+/* vim: set noet sw=4 ts=4: */
