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 91b903bcde Cleanup
91b903bcde is described below
commit 91b903bcde20e14f6641fa38c10f3f33bae03eda
Author: mseidel <[email protected]>
AuthorDate: Mon Aug 18 14:48:11 2025 +0200
Cleanup
(cherry picked from commit 02097bf99fbfc8939803e62d669b58dade6a1a6c)
---
main/sw/source/ui/inc/abstract.hxx | 11 +++-----
main/sw/source/ui/inc/actctrl.hxx | 19 +++++++-------
main/sw/source/ui/inc/addrdlg.hxx | 3 ++-
main/sw/source/ui/inc/annotsh.hxx | 9 ++++---
main/sw/source/ui/inc/ascfldlg.hxx | 7 +++---
main/sw/source/ui/inc/autoedit.hxx | 6 ++---
main/sw/source/ui/inc/barcfg.hxx | 7 +++---
main/sw/source/ui/inc/basesh.hxx | 51 +++++++++++++++++++-------------------
main/sw/source/ui/inc/beziersh.hxx | 3 ++-
main/sw/source/ui/inc/bmpwin.hxx | 30 +++++++++++-----------
main/sw/source/ui/inc/bookctrl.hxx | 10 ++++----
main/sw/source/ui/inc/bookmark.hxx | 22 ++++++----------
12 files changed, 85 insertions(+), 93 deletions(-)
diff --git a/main/sw/source/ui/inc/abstract.hxx
b/main/sw/source/ui/inc/abstract.hxx
index 512f26021a..78ffa6fd21 100644
--- a/main/sw/source/ui/inc/abstract.hxx
+++ b/main/sw/source/ui/inc/abstract.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _ABSTRACT_HXX
#define _ABSTRACT_HXX
@@ -37,13 +36,9 @@
#include <vcl/button.hxx>
#endif
-
-/*-----------------22.02.97 15.06-------------------
-
---------------------------------------------------*/
-class SwInsertAbstractDlg : public SfxModalDialog
+class SwInsertAbstractDlg : public SfxModalDialog
{
- FixedLine aFL;
+ FixedLine aFL;
FixedText aLevelFT;
NumericField aLevelNF;
FixedText aParaFT;
@@ -64,3 +59,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/actctrl.hxx
b/main/sw/source/ui/inc/actctrl.hxx
index 8940f75bea..8e19bdb6df 100644
--- a/main/sw/source/ui/inc/actctrl.hxx
+++ b/main/sw/source/ui/inc/actctrl.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _ACTCTRL_HXX
#define _ACTCTRL_HXX
@@ -76,19 +75,21 @@ public:
{SetForbiddenChars(String::CreateFromAscii(" .<>"));}
};
/* -----------------25.06.2003 15:55-----------------
- call a link when KEY_RETURN is pressed
+ call a link when KEY_RETURN is pressed
--------------------------------------------------*/
class SW_DLLPUBLIC ReturnActionEdit : public Edit
{
- Link aReturnActionLink;
+ Link aReturnActionLink;
public:
- ReturnActionEdit( Window* pParent, const ResId& rResId)
- : Edit(pParent, rResId){}
- ~ReturnActionEdit();
- virtual void KeyInput( const KeyEvent& );
+ ReturnActionEdit( Window* pParent, const ResId& rResId)
+ : Edit(pParent, rResId){}
+ ~ReturnActionEdit();
+ virtual void KeyInput( const KeyEvent& );
- void SetReturnActionLink(const Link& rLink)
- { aReturnActionLink = rLink;}
+ void SetReturnActionLink(const Link& rLink)
+ { aReturnActionLink = rLink;}
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/addrdlg.hxx
b/main/sw/source/ui/inc/addrdlg.hxx
index 2142afdca0..b120c63add 100644
--- a/main/sw/source/ui/inc/addrdlg.hxx
+++ b/main/sw/source/ui/inc/addrdlg.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _ADDRDLG_HXX
#define _ADDRDLG_HXX
@@ -34,3 +33,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/annotsh.hxx
b/main/sw/source/ui/inc/annotsh.hxx
index 521babcbbd..8c55bd21f3 100644
--- a/main/sw/source/ui/inc/annotsh.hxx
+++ b/main/sw/source/ui/inc/annotsh.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _SWANNOTSH_HXX
#define _SWANNOTSH_HXX
@@ -39,7 +38,7 @@ public:
SwAnnotationShell(SwView&);
virtual ~SwAnnotationShell();
- void StateDisableItems(SfxItemSet &);
+ void StateDisableItems(SfxItemSet &);
void Exec(SfxRequest &);
void GetState(SfxItemSet &);
@@ -64,11 +63,13 @@ public:
void InsertSymbol(SfxRequest& rReq);
void ExecSearch(SfxRequest&, sal_Bool bNoMessage =
sal_False);
- void StateSearch(SfxItemSet &);
+ void StateSearch(SfxItemSet &);
virtual ::svl::IUndoManager*
- GetUndoManager();
+ GetUndoManager();
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/ascfldlg.hxx
b/main/sw/source/ui/inc/ascfldlg.hxx
index c73dad08ea..b2a09d4686 100644
--- a/main/sw/source/ui/inc/ascfldlg.hxx
+++ b/main/sw/source/ui/inc/ascfldlg.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _ASCFLDLG_HXX
#define _ASCFLDLG_HXX
#include <vcl/fixed.hxx>
@@ -38,7 +37,7 @@ class SwDocShell;
class SwAsciiFilterDlg : public SfxModalDialog
{
- FixedLine aFL;
+ FixedLine aFL;
FixedText aCharSetFT;
SvxTextEncodingBox aCharSetLB;
FixedText aFontFT;
@@ -68,6 +67,6 @@ public:
void FillOptions( SwAsciiOptions& rOptions );
};
-
-
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/autoedit.hxx
b/main/sw/source/ui/inc/autoedit.hxx
index 973e46264b..cd54a8b749 100644
--- a/main/sw/source/ui/inc/autoedit.hxx
+++ b/main/sw/source/ui/inc/autoedit.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _AUTOEDIT_HXX
#define _AUTOEDIT_HXX
@@ -27,7 +26,6 @@
#include <vcl/edit.hxx>
#endif
-
class AutoEdit : public Edit
{
public:
@@ -39,6 +37,6 @@ protected:
// Implementieriung im autocorr.cxx
-
-
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/barcfg.hxx b/main/sw/source/ui/inc/barcfg.hxx
index 0f81ce74d1..a93a000b0a 100644
--- a/main/sw/source/ui/inc/barcfg.hxx
+++ b/main/sw/source/ui/inc/barcfg.hxx
@@ -19,14 +19,13 @@
*
*************************************************************/
-
#ifndef SW_BARCFG_HXX
#define SW_BARCFG_HXX
#include <unotools/configitem.hxx>
class SwToolbarConfigItem : public utl::ConfigItem
{
- sal_Int32 aTbxIdArray[5];
+ sal_Int32 aTbxIdArray[5];
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
@@ -37,7 +36,9 @@ public:
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence<
rtl::OUString >& aPropertyNames );
- void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
+ void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/basesh.hxx b/main/sw/source/ui/inc/basesh.hxx
index b8b4dfbe01..d3ceadda3f 100644
--- a/main/sw/source/ui/inc/basesh.hxx
+++ b/main/sw/source/ui/inc/basesh.hxx
@@ -19,11 +19,9 @@
*
*************************************************************/
-
#ifndef _SWBASESH_HXX
#define _SWBASESH_HXX
-
#include <shellid.hxx>
#define _SVSTDARR_USHORTSSORT
@@ -45,10 +43,10 @@ class Graphic;
struct DBTextStruct_Impl;
class SwBaseShell: public SfxShell
{
- SwView &rView;
+ SwView &rView;
// DragModus
- static FlyMode eFrameMode;
+ static FlyMode eFrameMode;
// Bug 75078 - if in GetState the asynch call of GetGraphic returns
// synch, the set the state directly into
the itemset
@@ -67,43 +65,43 @@ protected:
inline void SetGetStateSet( SfxItemSet* p ) {
pGetStateSet = p; }
inline sal_Bool AddGrfUpdateSlot( sal_uInt16 nSlot ){
return aGrfUpdateSlots.Insert( nSlot ); }
- DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* );
+ DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl,
DBTextStruct_Impl* );
- void InsertURLButton( const String& rURL,
const String& rTarget, const String& rTxt );
+ void InsertURLButton( const String& rURL,
const String& rTarget, const String& rTxt );
void InsertTable( SfxRequest& _rRequest );
public:
SwBaseShell(SwView &rShell);
- virtual ~SwBaseShell();
+ virtual ~SwBaseShell();
SFX_DECL_INTERFACE(SW_BASESHELL)
TYPEINFO();
- void ExecDelete(SfxRequest &);
+ void ExecDelete(SfxRequest &);
- void ExecClpbrd(SfxRequest &);
- void StateClpbrd(SfxItemSet &);
+ void ExecClpbrd(SfxRequest &);
+ void StateClpbrd(SfxItemSet &);
- void ExecUndo(SfxRequest &);
- void StateUndo(SfxItemSet &);
+ void ExecUndo(SfxRequest &);
+ void StateUndo(SfxItemSet &);
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
- void StateStyle(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void StateStyle(SfxItemSet &);
void ExecuteGallery(SfxRequest&);
void GetGalleryState(SfxItemSet&);
- void ExecDlg(SfxRequest &);
+ void ExecDlg(SfxRequest &);
- void StateStatusLine(SfxItemSet &rSet);
- void ExecTxtCtrl(SfxRequest& rReq);
- void GetTxtFontCtrlState(SfxItemSet& rSet);
- void GetTxtCtrlState(SfxItemSet& rSet);
+ void StateStatusLine(SfxItemSet &rSet);
+ void ExecTxtCtrl(SfxRequest& rReq);
+ void GetTxtFontCtrlState(SfxItemSet& rSet);
+ void GetTxtCtrlState(SfxItemSet& rSet);
void GetBorderState(SfxItemSet &rSet);
- void GetBckColState(SfxItemSet &rSet);
+ void GetBckColState(SfxItemSet &rSet);
- void ExecBckCol(SfxRequest& rReq);
+ void ExecBckCol(SfxRequest& rReq);
void SetWrapMode( sal_uInt16 nSlot );
void StateDisableItems(SfxItemSet &);
@@ -113,11 +111,12 @@ public:
void ExecField(SfxRequest& rReq);
- static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit
Update!
- static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; }
- static FlyMode GetFrmMode() { return eFrameMode; }
+ static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit
Update!
+ static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; }
+ static FlyMode GetFrmMode() { return eFrameMode; }
};
-
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/beziersh.hxx
b/main/sw/source/ui/inc/beziersh.hxx
index 258e282541..130f751ee0 100644
--- a/main/sw/source/ui/inc/beziersh.hxx
+++ b/main/sw/source/ui/inc/beziersh.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _SWBEZIERSH_HXX
#define _SWBEZIERSH_HXX
@@ -38,3 +37,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/bmpwin.hxx b/main/sw/source/ui/inc/bmpwin.hxx
index 10235b93f0..6824fccda8 100644
--- a/main/sw/source/ui/inc/bmpwin.hxx
+++ b/main/sw/source/ui/inc/bmpwin.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _BMPWIN_HXX
#define _BMPWIN_HXX
@@ -33,33 +31,35 @@
#include <vcl/window.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Extended Page fuer Grafiken
+ Description: Extended page for graphics
--------------------------------------------------------------------*/
class BmpWindow : public Window
{
private:
- Graphic aGraphic;
- BitmapEx aBmp;
- BitmapEx aBmpHC;
+ Graphic aGraphic;
+ BitmapEx aBmp;
+ BitmapEx aBmpHC;
- sal_Bool bHorz : 1;
- sal_Bool bVert : 1;
- sal_Bool bGraphic : 1;
- sal_Bool bLeftAlign : 1;
+ sal_Bool bHorz : 1;
+ sal_Bool bVert : 1;
+ sal_Bool bGraphic : 1;
+ sal_Bool bLeftAlign : 1;
- void Paint(const Rectangle& rRect);
+ void Paint(const Rectangle& rRect);
public:
BmpWindow(Window* pPar, sal_uInt16 nId,
- const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx&
rBmpHC);
+ const Graphic& rGraphic, const BitmapEx& rBmp,
const BitmapEx& rBmpHC);
BmpWindow(Window* pParent, const ResId rResId) :
- Window(pParent, rResId),
- bHorz(sal_False), bVert(sal_False),bGraphic(sal_False),
bLeftAlign(sal_True) {}
+ Window(pParent, rResId),
+ bHorz(sal_False), bVert(sal_False),bGraphic(sal_False),
bLeftAlign(sal_True) {}
~BmpWindow();
void MirrorVert(sal_Bool bMirror) { bVert = bMirror; Invalidate(); }
void MirrorHorz(sal_Bool bMirror) { bHorz = bMirror; Invalidate(); }
- void SetGraphic(const Graphic& rGrf);
+ void SetGraphic(const Graphic& rGrf);
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/bookctrl.hxx
b/main/sw/source/ui/inc/bookctrl.hxx
index 8a0cf5467a..3489803c4a 100644
--- a/main/sw/source/ui/inc/bookctrl.hxx
+++ b/main/sw/source/ui/inc/bookctrl.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _BOOKCTRL_HXX
#define _BOOKCTRL_HXX
@@ -32,12 +31,12 @@
class SwBookmarkControl : public SfxStatusBarControl
{
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void Command( const CommandEvent& rCEvt );
public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const
SfxPoolItem* pState );
- virtual void Paint( const UserDrawEvent& rEvt );
+ virtual void Paint( const UserDrawEvent& rEvt );
SFX_DECL_STATUSBAR_CONTROL();
@@ -45,8 +44,9 @@ public:
~SwBookmarkControl();
private:
- String sPageNumber;
+ String sPageNumber;
};
-
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/bookmark.hxx
b/main/sw/source/ui/inc/bookmark.hxx
index 8e09c00728..7b21eff087 100644
--- a/main/sw/source/ui/inc/bookmark.hxx
+++ b/main/sw/source/ui/inc/bookmark.hxx
@@ -19,26 +19,21 @@
*
*************************************************************/
-
#ifndef _BOOKMARK_HXX
#define _BOOKMARK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
+#ifndef _BUTTON_HXX // autogen
#include <vcl/button.hxx>
#endif
-#include "swlbox.hxx" // SwComboBox
+#include "swlbox.hxx" // SwComboBox
class SwWrtShell;
class SfxRequest;
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
class BookmarkCombo : public SwComboBox
{
sal_uInt16 GetFirstSelEntryPos() const;
@@ -55,21 +50,18 @@ public:
static const String aForbiddenChars;
};
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
class SwInsertBookmarkDlg: public SvxStandardDialog
{
- FixedLine aBookmarkFl;
+ FixedLine aBookmarkFl;
BookmarkCombo aBookmarkBox;
OKButton aOkBtn;
CancelButton aCancelBtn;
PushButton aDeleteBtn;
String sRemoveWarning;
- SwWrtShell &rSh;
- SfxRequest& rReq;
+ SwWrtShell &rSh;
+ SfxRequest& rReq;
DECL_LINK( ModifyHdl, BookmarkCombo * );
DECL_LINK( DeleteHdl, Button * );
@@ -77,8 +69,10 @@ class SwInsertBookmarkDlg: public SvxStandardDialog
virtual void Apply();
public:
- SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq );
+ SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq
);
~SwInsertBookmarkDlg();
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
