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 d11ac732c2 Fix typo (vaild), cleanup
new 3b301a1163 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/openoffice into trunk
d11ac732c2 is described below
commit d11ac732c2ba6981498374757fddc29abbf2b738
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Feb 16 15:31:42 2025 +0100
Fix typo (vaild), cleanup
---
main/autodoc/source/parser/cpp/defdescr.hxx | 25 ++--
main/sal/inc/osl/socket.h | 24 ++--
main/sw/source/core/frmedt/fefly1.cxx | 135 ++++++++++-----------
.../star/reflection/InvalidTypeNameException.idl | 13 +-
main/vcl/inc/unx/wmadaptor.hxx | 100 +++++++--------
main/vcl/unx/generic/fontmanager/parseAFM.hxx | 4 +-
6 files changed, 141 insertions(+), 160 deletions(-)
diff --git a/main/autodoc/source/parser/cpp/defdescr.hxx
b/main/autodoc/source/parser/cpp/defdescr.hxx
index 7fa62eba17..2eb364d3f8 100644
--- a/main/autodoc/source/parser/cpp/defdescr.hxx
+++ b/main/autodoc/source/parser/cpp/defdescr.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,26 +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.
- *
+ *
*************************************************************/
-
-
#ifndef ADC_CPP_DEFDESCR_HXX
#define ADC_CPP_DEFDESCR_HXX
-
-
-
namespace cpp
{
@@ -54,11 +49,11 @@ class DefineDescription
const str_vector & i_rDefinition );
~DefineDescription();
- /// Only vaild if (eDefineType == type_define) else returns "".
+ // Only valid if (eDefineType == type_define) else returns "".
void GetDefineText(
csv::StreamStr & o_rText ) const;
- /// Only vaild if (eDefineType == type_macro) else returns "".
+ // Only valid if (eDefineType == type_macro) else returns "".
void GetMacroText(
csv::StreamStr & o_rText,
const StringVector &
@@ -75,9 +70,6 @@ class DefineDescription
E_DefineType eDefineType;
};
-
-
-
// IMPLEMENTATION
inline uintt
DefineDescription::ParamCount() const
@@ -86,8 +78,7 @@ inline DefineDescription::E_DefineType
DefineDescription::DefineType() const
{ return eDefineType; }
-
-
-
} // end namespace cpp
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sal/inc/osl/socket.h b/main/sal/inc/osl/socket.h
index ce2fbbc910..06c4c98fd8 100644
--- a/main/sal/inc/osl/socket.h
+++ b/main/sal/inc/osl/socket.h
@@ -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,20 +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 _OSL_SOCKET_H_
#define _OSL_SOCKET_H_
@@ -48,7 +46,6 @@ extern "C" {
*/
typedef struct oslSocketAddrImpl * oslSocketAddr;
-
/**
Represents the address-family of a socket
*/
@@ -311,7 +308,7 @@ oslSocketResult SAL_CALL
osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r
oslSocketResult SAL_CALL osl_setAddrOfSocketAddr( oslSocketAddr Addr,
sal_Sequence *pByteSeq );
/** Returns the addr field in the struct sockaddr.
- @param ppByteSeq out parameter. After the call, *ppByteSeq contains the
ipadrress
+ @param ppByteSeq out parameter. After the call, *ppByteSeq contains the
ipaddress
in network byteorder. *ppByteSeq may be 0 in case of
an invalid socket handle.
@return <code>osl_Socket_Ok</code> or <code>osl_Socket_Error</code>
*/
@@ -417,7 +414,7 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily Family,
/** Retrieves the Address of the local end of the socket.
Note that a socket must be bound or connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
@@ -425,7 +422,7 @@ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket
Socket);
/** Retrieves the Address of the remote end of the socket.
Note that a socket must be connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
@@ -764,7 +761,6 @@ sal_Bool SAL_CALL osl_enableNonBlockingMode(oslSocket
Socket,
*/
sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket);
-
/** Queries the socket for its type.
@return one of:
<ul>
@@ -809,7 +805,6 @@ void SAL_CALL osl_destroySocketSet(oslSocketSet Set);
*/
void SAL_CALL osl_clearSocketSet(oslSocketSet Set);
-
/** Adds a socket to the set.
@param Set the set were the socket is added.
@param Socket the socket to be added.
@@ -864,7 +859,6 @@ void SAL_CALL osl_closeSocket(oslSocket Socket);
*/
sal_Int32 SAL_CALL osl_readSocket( oslSocket Socket, void *pBuffer, sal_Int32
nSize );
-
/** Writes n bytes from pBuffer to the stream. The method avoids
incomplete writes due to packet boundaries.
@param pBuffer contains the data to be written.
@@ -877,10 +871,10 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket,
const void *pBuffer, sal_I
/**@} end section oslSocket
*/
-
-
#ifdef __cplusplus
}
#endif
#endif /* _OSL_SOCKET_H_ */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/frmedt/fefly1.cxx
b/main/sw/source/core/frmedt/fefly1.cxx
index 5a3442d61f..c011e17238 100644
--- a/main/sw/source/core/frmedt/fefly1.cxx
+++ b/main/sw/source/core/frmedt/fefly1.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,20 +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.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -60,7 +58,7 @@
#include <ndtxt.hxx>
#include <edimp.hxx>
#include <swtable.hxx>
-#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
+#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
#include <ndgrf.hxx>
#include <flyfrms.hxx>
#include <flypos.hxx>
@@ -110,22 +108,22 @@ sal_Bool lcl_SetNewFlyPos( const SwNode& rNode,
SwFmtAnchor& rAnchor,
}
else
{
- const SwCntntNode *pCntNd = rNode.GetCntntNode();
+ const SwCntntNode *pCntNd = rNode.GetCntntNode();
const SwCntntFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm(
pCntNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False ) : 0;
const SwPageFrm *pPg = pCFrm ? pCFrm->FindPageFrm() : 0;
rAnchor.SetPageNum( pPg ? pPg->GetPhyPageNum() : 1 );
- rAnchor.SetType( FLY_AT_PAGE );
+ rAnchor.SetType( FLY_AT_PAGE );
}
return bRet;
}
sal_Bool lcl_FindAnchorPos(
- SwEditShell& rEditShell,
- SwDoc& rDoc,
- const Point& rPt,
- const SwFrm& rFrm,
- SfxItemSet& rSet )
+ SwEditShell& rEditShell,
+ SwDoc& rDoc,
+ const Point& rPt,
+ const SwFrm& rFrm,
+ SfxItemSet& rSet )
{
sal_Bool bRet = sal_True;
SwFmtAnchor aNewAnch( (SwFmtAnchor&)rSet.Get( RES_ANCHOR ) );
@@ -136,13 +134,13 @@ sal_Bool lcl_FindAnchorPos(
Point aTmpPnt( rPt );
switch( nNew )
{
- case FLY_AS_CHAR: // sollte der nicht auch mit hinein?
- case FLY_AT_PARA:
- case FLY_AT_CHAR: // LAYER_IMPL
- {
- //Ausgehend von der linken oberen Ecke des Fly den
- //dichtesten CntntFrm suchen.
- const SwFrm* pFrm = rFrm.IsFlyFrm() ?
((SwFlyFrm&)rFrm).GetAnchorFrm()
+ case FLY_AS_CHAR: // sollte der nicht auch mit hinein?
+ case FLY_AT_PARA:
+ case FLY_AT_CHAR: // LAYER_IMPL
+ {
+ // Ausgehend von der linken oberen Ecke des Fly den
+ // dichtesten CntntFrm suchen.
+ const SwFrm* pFrm = rFrm.IsFlyFrm() ?
((SwFlyFrm&)rFrm).GetAnchorFrm()
: &rFrm;
pNewAnch = ::FindAnchor( pFrm, aTmpPnt );
if( pNewAnch->IsProtected() )
@@ -151,9 +149,9 @@ sal_Bool lcl_FindAnchorPos(
break;
}
- SwPosition aPos( *((SwCntntFrm*)pNewAnch)->GetNode() );
- if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
- {
+ SwPosition aPos( *((SwCntntFrm*)pNewAnch)->GetNode() );
+ if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
+ {
// es muss ein TextNode gefunden werden, denn nur in diesen
// ist ein Inhaltsgebundene Frames zu verankern
SwCrsrMoveState aState( MV_SETONLYTEXT );
@@ -180,8 +178,8 @@ sal_Bool lcl_FindAnchorPos(
case FLY_AT_FLY: // LAYER_IMPL
{
- //Ausgehend von der linken oberen Ecke des Fly den
- //dichtesten SwFlyFrm suchen.
+ // Ausgehend von der linken oberen Ecke des Fly den
+ // dichtesten SwFlyFrm suchen.
SwCrsrMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( rDoc.GetNodes() );
aTmpPnt.X() -= 1;
//nicht im Fly landen!!
@@ -199,10 +197,10 @@ sal_Bool lcl_FindAnchorPos(
}
}
- aNewAnch.SetType( nNew = FLY_AT_PAGE );
+ aNewAnch.SetType( nNew = FLY_AT_PAGE );
// no break
- case FLY_AT_PAGE:
+ case FLY_AT_PAGE:
pNewAnch = rFrm.FindPageFrm();
aNewAnch.SetPageNum( pNewAnch->GetPhyPageNum() );
break;
@@ -219,9 +217,9 @@ sal_Bool lcl_FindAnchorPos(
//! also used in unoframe.cxx
//
sal_Bool lcl_ChkAndSetNewAnchor(
- SwEditShell& rEditShell,
- const SwFlyFrm& rFly,
- SfxItemSet& rSet )
+ SwEditShell& rEditShell,
+ const SwFlyFrm& rFly,
+ SfxItemSet& rSet )
{
const SwFrmFmt& rFmt = *rFly.GetFmt();
const SwFmtAnchor &rOldAnch = rFmt.GetAnchor();
@@ -235,8 +233,8 @@ sal_Bool lcl_ChkAndSetNewAnchor(
SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
#ifdef DBG_UTIL
- ASSERT( !(nNew == FLY_AT_PAGE &&
- (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld ) &&
+ ASSERT( !(nNew == FLY_AT_PAGE &&
+ (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld )
&&
pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
"Unerlaubter Ankerwechsel in Head/Foot." );
#endif
@@ -252,11 +250,11 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool
bNew )
// !!Rahmen immer selektieren, wenn sie nicht selektiert sind.
// - Es kann ein neuer 'alter' sein weil der Anker gewechselt
wurde.
// - 'alte' Rahmen sind vorher immer selektiert denn sonst wird nix
- // an ihnen veraendert.
+ // an ihnen verändert.
// Der Rahmen darf nicht per Dokumentposition selektiert werden,
weil er
// auf jedenfall selektiert sein muss!
- SwViewImp *pImpl = Imp();
- if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
+ SwViewImp *pImpl = Imp();
+ if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
{
ASSERT( rFrm.IsFlyFrm(), "SelectFlyFrm will einen Fly" );
@@ -266,20 +264,20 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool
bNew )
return;
//Damit der Anker ueberhaupt noch gepaintet wird.
- if( rFrm.IsFlyInCntFrm() && rFrm.GetAnchorFrm() )
- rFrm.GetAnchorFrm()->SetCompletePaint();
+ if( rFrm.IsFlyInCntFrm() && rFrm.GetAnchorFrm() )
+ rFrm.GetAnchorFrm()->SetCompletePaint();
- // --> OD 2004-06-11 #i28701# - no format at all.
-// //Hier wurde immer kalkuliert. Leider ist der Sonderfall Fly in Fly
mit
-// //Spalten u.U. sehr kritisch wenn der innenliegende zuerst formatiert
-// //wird. Um kein Risiko einzugehen entschaerfen wir nur diesen
Sonderfall.
-// if( !rFrm.GetAnchorFrm()->IsInFly() )
-// rFrm.Calc();
+ // --> OD 2004-06-11 #i28701# - no format at all.
+// //Hier wurde immer kalkuliert. Leider ist der Sonderfall Fly in
Fly mit
+// //Spalten u.U. sehr kritisch wenn der innenliegende zuerst
formatiert
+// //wird. Um kein Risiko einzugehen entschärfen wir nur diesen
Sonderfall.
+// if( !rFrm.GetAnchorFrm()->IsInFly() )
+// rFrm.Calc();
- if( pImpl->GetDrawView()->AreObjectsMarked() )
- pImpl->GetDrawView()->UnmarkAll();
+ if( pImpl->GetDrawView()->AreObjectsMarked() )
+ pImpl->GetDrawView()->UnmarkAll();
- pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
+ pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
pImpl->GetPageView(), sal_False,
sal_False );
KillPams();
ClearMark();
@@ -1038,8 +1036,8 @@ void SwFEShell::SetPageObjsNewPage( SvPtrarr& rFillArr,
int nOffset )
SwFmtAnchor aNewAnchor( pFmt->GetAnchor() );
if ((FLY_AT_PAGE != aNewAnchor.GetAnchorId()) ||
0 >= ( nNewPage = aNewAnchor.GetPageNum() +
nOffset ) )
- // chaos::Anchor wurde veraendert oder
ungueltige SeitenNummer,
- // also nicht veraendern !!
+ // chaos::Anchor wurde verändert oder ungültige
SeitenNummer,
+ // also nicht verändern !!
continue;
if( sal_uInt16(nNewPage) > nMaxPage )
@@ -1104,8 +1102,8 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet )
const
if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) )
return sal_False;
- //Und die Attribute durchschaufeln. Unerlaubte Attribute entfernen, dann
- //alle restlichen Attribute besorgen und eintragen.
+ // Und die Attribute durchschaufeln. Unerlaubte Attribute entfernen,
dann
+ // alle restlichen Attribute besorgen und eintragen.
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False, &pItem ) )
{
@@ -1115,7 +1113,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet )
const
if ( FLY_AT_PAGE != eType )
{
// OD 12.11.2003 #i22341# - content anchor of anchor item is
needed.
- // Thus, don't overwrite anchor item by default contructed anchor
item.
+ // Thus, don't overwrite anchor item by default constructed anchor
item.
//rSet.Put( SwFmtAnchor( eType ) );
if ( FLY_AS_CHAR == eType )
{
@@ -1633,7 +1631,7 @@ const uno::Reference < embed::XEmbeddedObject >
SwFEShell::GetOleRef() const
xObj = pNd->GetOLEObj().GetOleRef();
}
return xObj;
-}
+}
String SwFEShell::GetUniqueGrfName() const
@@ -2081,7 +2079,7 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
{
String aString = (*aIt)->GetName();
- /* rFmt is not a vaild successor or predecessor of
+ /* rFmt is not a valid successor or predecessor of
itself */
if (aString != rReference && aString != rFmt.GetName())
{
@@ -2208,7 +2206,7 @@ void SwFEShell::SetObjDescription( const String&
rDescription )
void SwFEShell::AlignFormulaToBaseline( const uno::Reference <
embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly )
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
SvGlobalName aCLSID( xObj->getClassID() );
const bool bStarMath = ( SotExchange::IsMath( aCLSID ) != 0 );
ASSERT( bStarMath, "AlignFormulaToBaseline should only be called for Math
objects" );
@@ -2226,7 +2224,7 @@ void SwFEShell::AlignFormulaToBaseline( const
uno::Reference < embed::XEmbeddedO
if ( pFly && pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
{
// get baseline from Math object
- uno::Any aBaseline;
+ uno::Any aBaseline;
if( svt::EmbeddedObjectRef::TryRunningState( xObj ) )
{
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(),
uno::UNO_QUERY );
@@ -2259,23 +2257,22 @@ void SwFEShell::AlignFormulaToBaseline( const
uno::Reference < embed::XEmbeddedO
SwFmtVertOrient aVert( rVert );
aVert.SetPos( -nBaseline );
aVert.SetVertOrient( com::sun::star::text::VertOrientation::NONE );
-
+
pFrmFmt->LockModify();
pFrmFmt->SetFmtAttr( aVert );
pFrmFmt->UnlockModify();
pFly->InvalidatePos();
- }
+ }
}
-
void SwFEShell::AlignAllFormulasToBaseline()
{
- StartAllAction();
+ StartAllAction();
- SwStartNode *pStNd;
- SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
- while ( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
- {
+ SwStartNode *pStNd;
+ SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(),
1 );
+ while ( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
+ {
++aIdx;
SwOLENode *pOleNode = dynamic_cast< SwOLENode * >( &aIdx.GetNode() );
if ( pOleNode )
@@ -2287,10 +2284,12 @@ void SwFEShell::AlignAllFormulasToBaseline()
if ( SotExchange::IsMath( aCLSID ) )
AlignFormulaToBaseline( xObj );
}
- }
+ }
- aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
- }
+ aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
+ }
- EndAllAction();
+ EndAllAction();
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
b/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index 5d4232559b..0460d8d6e8 100644
--- a/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -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,21 +7,19 @@
* 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 __com_sun_star_reflection_InvaildTypeNameException_idl__
+#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
#define __com_sun_star_reflection_InvalidTypeNameException_idl__
#ifndef __com_sun_star_uno_Exception_idl__
@@ -43,7 +41,6 @@ published exception InvalidTypeNameException :
com::sun::star::uno::Exception
{
};
-
//=============================================================================
}; }; }; };
diff --git a/main/vcl/inc/unx/wmadaptor.hxx b/main/vcl/inc/unx/wmadaptor.hxx
index c22bb34bfa..22a2ccf444 100644
--- a/main/vcl/inc/unx/wmadaptor.hxx
+++ b/main/vcl/inc/unx/wmadaptor.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,20 +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 _VCL_WMADAPTOR_HXX_
#define _VCL_WMADAPTOR_HXX_
@@ -97,7 +95,7 @@ public:
WIN_ICONS,
WIN_WORKSPACE_NAMES,
WIN_CLIENT_LIST,
-
+
// atoms for general WM hints
WM_STATE,
MOTIF_WM_HINTS,
@@ -124,7 +122,7 @@ public:
};
/*
- * flags for frame decoration
+ * flags for frame decoration
*/
static const int decoration_Title = 0x00000001;
static const int decoration_Border = 0x00000002;
@@ -135,7 +133,7 @@ public:
static const int decoration_All = 0x10000000;
/*
- * window type
+ * window type
*/
enum WMWindowType
{
@@ -171,8 +169,8 @@ protected:
bool getNetWmName();
/*
- * returns whether this instance is useful
- * only useful for createWMAdaptor
+ * returns whether this instance is useful
+ * only useful for createWMAdaptor
*/
virtual bool isValid() const;
@@ -181,19 +179,19 @@ public:
virtual ~WMAdaptor();
/*
- * creates a vaild WMAdaptor instance for the SalDisplay
+ * creates a valid WMAdaptor instance for the SalDisplay
*/
static WMAdaptor* createWMAdaptor( SalDisplay* );
/*
- * may return an empty string if the window manager could
- * not be identified.
+ * may return an empty string if the window manager could
+ * not be identified.
*/
const String& getWindowManagerName() const
{ return m_aWMName; }
/*
- * gets the number of workareas
+ * gets the number of workareas
*/
int getWorkAreaCount() const
{ return m_aWMWorkAreas.size(); }
@@ -207,22 +205,22 @@ public:
*/
int getWindowWorkArea( XLIB_Window aWindow ) const;
/*
- * gets the specified workarea
+ * gets the specified workarea
*/
const Rectangle& getWorkArea( int n ) const
{ return m_aWMWorkAreas[n]; }
-
+
/*
* attempt to switch the desktop to a certain workarea
* if bConsiderWM is true, then on some WMs the call will not result in
any action
*/
void switchToWorkArea( int nWorkArea, bool bConsiderWM = true ) const;
-
+
/*
- * sets window title
+ * sets window title
*/
virtual void setWMName( X11SalFrame* pFrame, const String& rWMName ) const;
-
+
/*
* set NET_WM_PID
*/
@@ -232,26 +230,26 @@ public:
* set WM_CLIENT_MACHINE
*/
virtual void setClientMachine( X11SalFrame* pFrame ) const;
-
+
virtual void answerPing( X11SalFrame*, XClientMessageEvent* ) const;
/*
- * maximizes frame
- * maximization can be toggled in either direction
- * to get the original position and size
- * use maximizeFrame( pFrame, false, false )
+ * maximizes frame
+ * maximization can be toggled in either direction
+ * to get the original position and size
+ * use maximizeFrame( pFrame, false, false )
*/
virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true,
bool bVertical = true ) const;
/*
- * start/stop fullscreen mode on a frame
+ * start/stop fullscreen mode on a frame
*/
virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const;
/*
- * tell whether legacy partial full screen handling is necessary
- * see #i107249#: NET_WM_STATE_FULLSCREEN is not well defined, but de
facto
- * modern WM's interpret it the "right" way, namely they make "full
screen"
- * taking twin view or Xinerama into account and honor the positioning
hints
- * to see which screen actually was meant to use for fullscreen.
+ * tell whether legacy partial full screen handling is necessary
+ * see #i107249#: NET_WM_STATE_FULLSCREEN is not well defined, but de facto
+ * modern WM's interpret it the "right" way, namely they make "full screen"
+ * taking twin view or Xinerama into account and honor the positioning
hints
+ * to see which screen actually was meant to use for fullscreen.
*/
bool isLegacyPartialFullscreen() const
{ return m_bLegacyPartialFullscreen; }
@@ -268,55 +266,55 @@ public:
* set _NET_WM_USER_TIME property, if NetWM
*/
virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const;
-
+
/*
- * tells whether fullscreen mode is supported by WM
+ * tells whether fullscreen mode is supported by WM
*/
bool supportsFullScreen() const { return m_aWMAtoms[
NET_WM_STATE_FULLSCREEN ] != 0; }
/*
- * shade/unshade frame
+ * shade/unshade frame
*/
virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const;
/*
- * set hints what decoration is needed;
- * must be called before showing the frame
+ * set hints what decoration is needed;
+ * must be called before showing the frame
*/
virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType
eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const;
/*
- * tells whether there is WM support for splash screens
+ * tells whether there is WM support for splash screens
*/
bool supportsSplash() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_SPLASH
] != 0; }
/*
- * tells whteher there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR
+ * tells whether there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR
*/
bool supportsToolbar() const { return m_aWMAtoms[
NET_WM_WINDOW_TYPE_TOOLBAR ] != 0; }
/*
- * enables always on top or equivalent if possible
+ * enables always on top or equivalent if possible
*/
virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const;
/*
- * tells whether enableAlwaysOnTop actually works with this WM
+ * tells whether enableAlwaysOnTop actually works with this WM
*/
bool isAlwaysOnTopOK() const { return m_bEnableAlwaysOnTopWorks; }
-
+
/*
- * handle WM messages (especially WM state changes)
+ * handle WM messages (especially WM state changes)
*/
virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent*
pEvent ) const;
-
+
/*
* called by SalFrame::Show: time to update state properties
*/
virtual void frameIsMapping( X11SalFrame* ) const;
/*
- * gets a WM atom
+ * gets a WM atom
*/
Atom getAtom( WMAtom eAtom ) const
{ return m_aWMAtoms[ eAtom ]; }
@@ -333,23 +331,25 @@ public:
{ return m_nInitWinGravity; }
/*
- * expected behaviour is that the WM will not allow transient
- * windows to get stacked behind the windows they are transient for
+ * expected behavior is that the WM will not allow transient
+ * windows to get stacked behind the windows they are transient for
*/
bool isTransientBehaviourAsExpected() const
{ return m_bTransientBehaviour; }
/*
- * changes the transient hint of a window to reference frame
- * if reference frame is NULL the root window is used instead
+ * changes the transient hint of a window to reference frame
+ * if reference frame is NULL the root window is used instead
*/
void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame*
pReferenceFrame ) const;
-
+
/* set fullscreen monitor range; takes X11 window as input since it is
also used by gtk plugin
*/
- virtual void setFullScreenMonitors( XLIB_Window i_aWindow, sal_Int32
i_nScreen );
+ virtual void setFullScreenMonitors( XLIB_Window i_aWindow, sal_Int32
i_nScreen );
};
} // namespace
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/unx/generic/fontmanager/parseAFM.hxx
b/main/vcl/unx/generic/fontmanager/parseAFM.hxx
index 35277905b5..fcd8bf6e02 100644
--- a/main/vcl/unx/generic/fontmanager/parseAFM.hxx
+++ b/main/vcl/unx/generic/fontmanager/parseAFM.hxx
@@ -73,7 +73,7 @@
*
* There is a procedure in parseAFM.c, called parseFile, that can be
* called from any application wishing to get information from the AFM File.
- * This procedure expects 3 parameters: a vaild file descriptor, a pointer
+ * This procedure expects 3 parameters: a valid file descriptor, a pointer
* to a (FontInfo *) variable (for which space will be allocated and then
* will be filled in with the data requested), and a mask specifying
* which data from the AFM File should be saved in the FontInfo structure.
@@ -128,7 +128,7 @@ namespace psp {
* parser went on. This could include problems like the count for any given
* section does not add up to how many entries there actually were, or
* there was a key that was not recognized. The return record may contain
- * vaild data or it may not.
+ * valid data or it may not.
*
* earlyEOF means that an End of File was encountered before expected. This
* may mean that the AFM file had been truncated, or improperly formed.
