diff options
Diffstat (limited to 'sw/source/ui/inc')
194 files changed, 1388 insertions, 1754 deletions
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 9800783c2e48..cabf71ac46c1 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwDropDownField; class SwField; @@ -67,5 +66,6 @@ public: }; } //namespace sw - #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/SidebarWindowsConsts.hxx b/sw/source/ui/inc/SidebarWindowsConsts.hxx index 378b2be0790a..5df62bdee181 100644 --- a/sw/source/ui/inc/SidebarWindowsConsts.hxx +++ b/sw/source/ui/inc/SidebarWindowsConsts.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: $ - * - * $Revision: $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -39,3 +36,5 @@ const sal_Int8 ANCHORLINE_WIDTH = 1; } } // end of namespace sw::sidebarwindows #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index b45dd1a6cd2d..0d3cf88faac2 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define SW_SPELL_DIALOG_CHILD_WINDOW_HXX #include <svx/SpellDialogChildWindow.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif class SwWrtShell; struct SpellState; @@ -74,3 +73,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index c1dcc3676447..e5d6030be989 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,10 +39,6 @@ namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } - -/* -----------------------------2002/06/21 12:07------------------------------ - - ---------------------------------------------------------------------------*/ class SwXFilterOptions : public ::cppu::WeakImplHelper5< ::com::sun::star::beans::XPropertyAccess, ::com::sun::star::ui::dialogs::XExecutableDialog, @@ -111,3 +108,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 4dd8f3a56b65..755d30b61503 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,22 +30,12 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif - - -/*-----------------22.02.97 15.06------------------- ---------------------------------------------------*/ class SwInsertAbstractDlg : public SfxModalDialog { FixedLine aFL; @@ -71,3 +62,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d1e9a3d82907..f28bd79ec8e5 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,15 +28,12 @@ #ifndef _ACTCTRL_HXX #define _ACTCTRL_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" /*-------------------------------------------------------------------- - Beschreibung: numerische Eingabe + Description: numerical input --------------------------------------------------------------------*/ - class SW_DLLPUBLIC NumEditAction: public NumericField { Link aActionLink; @@ -52,8 +50,8 @@ public: }; -/* -----------------21.04.98 08:11------------------- - * Edit, dass keine Spaces akzeptiert +/* -------------------------------------------------- + * Edit that doesn't accept spaces * --------------------------------------------------*/ class SW_DLLPUBLIC NoSpaceEdit : public Edit { @@ -69,8 +67,8 @@ public: const String& GetForbiddenChars(){return sForbiddenChars;} }; -/* -----------------21.04.98 08:33------------------- - * Kein Space und kein Punkt +/* -------------------------------------------------- + * No space and no full stop * --------------------------------------------------*/ class TableNameEdit : public NoSpaceEdit { @@ -79,7 +77,8 @@ public: NoSpaceEdit(pWin, rResId) {SetForbiddenChars(String::CreateFromAscii(" .<>"));} }; -/* -----------------25.06.2003 15:55----------------- + +/* -------------------------------------------------- call a link when KEY_RETURN is pressed --------------------------------------------------*/ class SW_DLLPUBLIC ReturnActionEdit : public Edit @@ -96,3 +95,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx index 9e8370d1e2fc..de798ad12f5d 100644 --- a/sw/source/ui/inc/addrdlg.hxx +++ b/sw/source/ui/inc/addrdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index ee8d8e9ccf17..b70b23d6f8ed 100755..100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,11 +31,13 @@ #include <sfx2/shell.hxx> #include "shellid.hxx" #include "swmodule.hxx" +#include <unotools/caserotate.hxx> class SwView; class SwAnnotationShell: public SfxShell { SwView& rView; + RotateTransliteration m_aRotateCase; public: SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL) @@ -59,6 +62,7 @@ public: void StateClpbrd(SfxItemSet &rSet); void ExecTransliteration(SfxRequest &); + void ExecRotateTransliteration(SfxRequest &); void ExecUndo(SfxRequest &rReq); void StateUndo(SfxItemSet &rSet); @@ -76,3 +80,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index edf7014a4e4f..5de05376a882 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -30,148 +30,99 @@ #include "rcid.hrc" -// Default Bitmap fuer ToolBox -#define BMP_FEHLT (RC_APP_BEGIN + 1) - // Document-Icon -#define RC_DOC_ICON (RC_APP_BEGIN + 2) +#define RC_DOC_ICON (RC_APP_BEGIN + 2) -//Soll das Clipboard fuer andere Applikationen... -#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) +// Should the clipboard for other applications... +#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) -#define STR_CANTCREATE (RC_APP_BEGIN + 4) -#define STR_CANTOPEN (RC_APP_BEGIN + 5) +#define STR_CANTCREATE (RC_APP_BEGIN + 4) +#define STR_CANTOPEN (RC_APP_BEGIN + 5) // Messages -#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) -#define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7) - -//Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist. -#define RID_SW_NAME ( RC_APP_BEGIN + 8) -#define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9) - - -#define STR_UNBENANNT (RC_APP_BEGIN + 13) -#define STR_VERSION (RC_APP_BEGIN + 14) -#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) -#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) - -// Bitmap fuer die NumerierungsVorlagen im Organizer -#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) -#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18) - -// Strings fuer Bereiche in der Konfiguration -#define STR_GRP_FILE (RC_APP_BEGIN + 56) -#define STR_GRP_EDIT (RC_APP_BEGIN + 57) -#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) -#define STR_GRP_VIEW (RC_APP_BEGIN + 59) -#define STR_GRP_INSERT (RC_APP_BEGIN + 60) -#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) -#define STR_GRP_STYLE (RC_APP_BEGIN + 62) -#define STR_GRP_TEXT (RC_APP_BEGIN + 63) -#define STR_GRP_FRAME (RC_APP_BEGIN + 64) -#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) -#define STR_GRP_TABLE (RC_APP_BEGIN + 66) -#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) -#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) -#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) -#define STR_GRP_MISC (RC_APP_BEGIN + 70) -#define STR_GRP_MACRO (RC_APP_BEGIN + 71) -#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) -#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) -#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) -#define STR_PAGEBREAK (RC_APP_BEGIN + 75) -#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) -#define STR_WESTERN_FONT (RC_APP_BEGIN + 77) -#define STR_CJK_FONT (RC_APP_BEGIN + 78) -//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) -#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80) -#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82) -#define DLG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 83) -#define ST_MERGE_SOURCE_UNAVAILABLE 1 -#define PB_MERGE_OK 2 -#define PB_MERGE_CANCEL 3 -#define IMG_MERGE 4 -#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) - -#define STR_ENV_TITLE (RC_APP_BEGIN + 91) -#define STR_LAB_TITLE (RC_APP_BEGIN + 92) - -#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) - -#define RID_SW_ERRHDL (RC_APP_BEGIN + 95) - -#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1) -#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) - - -// Ids fuer die einzelnen PopUpMenues -//#define MN_WIZARD (RC_APP_BEGIN + 9) -//#define MN_INDEX (RC_APP_BEGIN + 10) -//#define MN_FILE (RC_APP_BEGIN + 11) -//#define MN_EDIT (RC_APP_BEGIN + 12) -//#define MN_VIEW (RC_APP_BEGIN + 13) -//#define MN_INS (RC_APP_BEGIN + 14) -//#define MN_TEXT (RC_APP_BEGIN + 15) -//#define MN_FORMAT (RC_APP_BEGIN + 16) -#define MN_FORMAT_STYLE (RC_APP_BEGIN + 17) -#define MN_FORMAT_ALGN (RC_APP_BEGIN + 18) -#define MN_FORMAT_LINESPACE (RC_APP_BEGIN + 19) -//#define MN_EXTRA (RC_APP_BEGIN + 20) -//#define MN_WIN (RC_APP_BEGIN + 21) -//#define MN_HELP (RC_APP_BEGIN + 22) -#define MN_FORMAT_FRM_HORZ (RC_APP_BEGIN + 23) -//#define MN_FORMAT_FRM_VERT (RC_APP_BEGIN + 24) -//#define MN_PICKLIST (RC_APP_BEGIN + 25) -//#define MN_WINLIST (RC_APP_BEGIN + 26) -//#define MN_MACRO (RC_APP_BEGIN + 27) -//#define MN_FORMAT_HIERARCHY (RC_APP_BEGIN + 28) -#define MN_CELL (RC_APP_BEGIN + 29) -//#define MN_HELP_TIP (RC_APP_BEGIN + 30) -//#define MN_HELP_SEARCH (RC_APP_BEGIN + 31) -//#define MN_HELP_ACTIVE (RC_APP_BEGIN + 32) -//#define MN_HELP_INDEX (RC_APP_BEGIN + 33) -//#define MN_OBJECT (RC_APP_BEGIN + 34) -//#define MN_DATABASE (RC_APP_BEGIN + 35) -//#define MN_DIRSUBMENU (RC_APP_BEGIN + 36) -//#define MN_MAIL (RC_APP_BEGIN + 37) -#define MN_WRAP (RC_APP_BEGIN + 38) -#define MN_SUB_TBLROW (RC_APP_BEGIN + 39) -#define MN_SUB_TBLCOL (RC_APP_BEGIN + 40) -//#define MN_SUB_AUTOFORMAT (RC_APP_BEGIN + 41) -//#define MN_SUB_TOOLBAR (RC_APP_BEGIN + 42) -//#define MN_SUB_FIELD (RC_APP_BEGIN + 43) -//#define MN_SUB_GRAPHIC (RC_APP_BEGIN + 44) -//#define MN_SUB_TEMPLATES (RC_APP_BEGIN + 45) -#define MN_SUB_ARRANGE (RC_APP_BEGIN + 46) - -//#define MN_SUB_UPDATE (RC_APP_BEGIN + 48) -//#define MN_SUB_MIRROR (RC_APP_BEGIN + 49) -#define MN_SUB_ALIGN (RC_APP_BEGIN + 50) -//#define MN_SUB_OPTIONS (RC_APP_BEGIN + 51) -//#define MN_SUB_SENDTO (RC_APP_BEGIN + 52) -//#define MN_SUB_REVISE (RC_APP_BEGIN + 53) -//#define MN_TEMPLATES (RC_APP_BEGIN + 54) -//#define MN_FILE_PORT (RC_APP_BEGIN + 55) -//#define MN_EDIT_PORT (RC_APP_BEGIN + 56) -//#define MN_VIEW_PORT (RC_APP_BEGIN + 57) -//#define MN_INS_PORT (RC_APP_BEGIN + 58) -//#define MN_FORMAT_PORT (RC_APP_BEGIN + 59) -//#define MN_EXTRA_PORT (RC_APP_BEGIN + 60) -//#define MN_WIN_PORT (RC_APP_BEGIN + 61) -//#define MN_HELP_PORT (RC_APP_BEGIN + 62) -//#define MN_SUB_TRANSLITERATE (RC_APP_BEGIN + 63) -//#define MN_SUB_MACRO (RC_APP_BEGIN + 64) +#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) +#define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7) + +// For the interface because the RID_APP_BEGIN is now Desktop. +#define RID_SW_NAME ( RC_APP_BEGIN + 8) +#define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9) + + +#define STR_UNBENANNT (RC_APP_BEGIN + 13) +#define STR_VERSION (RC_APP_BEGIN + 14) +#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) +#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) + +// Bitmap for the numbering style in organizer +#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) + +// Strings for regions in the configuration +#define STR_GRP_FILE (RC_APP_BEGIN + 56) +#define STR_GRP_EDIT (RC_APP_BEGIN + 57) +#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) +#define STR_GRP_VIEW (RC_APP_BEGIN + 59) +#define STR_GRP_INSERT (RC_APP_BEGIN + 60) +#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) +#define STR_GRP_STYLE (RC_APP_BEGIN + 62) +#define STR_GRP_TEXT (RC_APP_BEGIN + 63) +#define STR_GRP_FRAME (RC_APP_BEGIN + 64) +#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) +#define STR_GRP_TABLE (RC_APP_BEGIN + 66) +#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) +#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) +#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) +#define STR_GRP_MISC (RC_APP_BEGIN + 70) +#define STR_GRP_MACRO (RC_APP_BEGIN + 71) +#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) +#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) +#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) +#define STR_PAGEBREAK (RC_APP_BEGIN + 75) +#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) +#define STR_WESTERN_FONT (RC_APP_BEGIN + 77) +#define STR_CJK_FONT (RC_APP_BEGIN + 78) +#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80) +#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82) +#define DLG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 83) + +#define ST_MERGE_SOURCE_UNAVAILABLE 1 +#define PB_MERGE_OK 2 +#define PB_MERGE_CANCEL 3 +#define IMG_MERGE 4 + +#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) + +#define STR_ENV_TITLE (RC_APP_BEGIN + 91) +#define STR_LAB_TITLE (RC_APP_BEGIN + 92) + +#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) + +#define RID_SW_ERRHDL (RC_APP_BEGIN + 95) + +#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1) +#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) + + +// Ids for all the PopUpMenues +#define MN_FORMAT_STYLE (RC_APP_BEGIN + 17) +#define MN_FORMAT_ALGN (RC_APP_BEGIN + 18) +#define MN_FORMAT_LINESPACE (RC_APP_BEGIN + 19) +#define MN_FORMAT_FRM_HORZ (RC_APP_BEGIN + 23) +#define MN_CELL (RC_APP_BEGIN + 29) +#define MN_WRAP (RC_APP_BEGIN + 38) +#define MN_SUB_TBLROW (RC_APP_BEGIN + 39) +#define MN_SUB_TBLCOL (RC_APP_BEGIN + 40) +#define MN_SUB_ARRANGE (RC_APP_BEGIN + 46) + +#define MN_SUB_ALIGN (RC_APP_BEGIN + 50) #define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100) #define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102) #define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103) // --> OD 2008-04-14 #outlinelevel# #define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) -// <-- //#outline level,zhaojianwei -#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) -#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) +#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) +#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) //<-end,zhaojianwei #define APP_ACT_END STR_FDLG_STYLE diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 9fc1b98d044a..763eaba3e55c 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _ASCFLDLG_HXX #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/basedlgs.hxx> #include <svx/txencbox.hxx> @@ -76,3 +75,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 535bc04bf9ca..a7a0be298634 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _AUTOEDIT_HXX #define _AUTOEDIT_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif class AutoEdit : public Edit @@ -41,10 +40,11 @@ protected: virtual void KeyInput( const KeyEvent& rEvent ); }; -// Implementieriung im autocorr.cxx +// Implementation in autocorr.cxx #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx index 6b88039eddbe..cb5f06a76b47 100644 --- a/sw/source/ui/inc/barcfg.hxx +++ b/sw/source/ui/inc/barcfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index 03e183b81116..5b85afcd7649 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <shellid.hxx> -#define _SVSTDARR_USHORTSSORT #define _SVSTDARR_USHORTS #include <tools/link.hxx> #include <vcl/timer.hxx> @@ -39,6 +39,7 @@ #include <svl/svstdarr.hxx> #include <mdiexp.hxx> +#include <set> class SwWrtShell; class SwCrsrShell; @@ -51,15 +52,15 @@ class SwBaseShell: public SfxShell { SwView &rView; - // DragModus + // DragMode static FlyMode eFrameMode; // Bug 75078 - if in GetState the asynch call of GetGraphic returns // synch, the set the state directly into the itemset SfxItemSet* pGetStateSet; - //Update-Timer fuer Graphic - SvUShortsSort aGrfUpdateSlots; + // Update-Timer for graphic + std::set<sal_uInt16> aGrfUpdateSlots; DECL_LINK( GraphicArrivedHdl, SwCrsrShell* ); @@ -69,7 +70,7 @@ protected: inline SwView& GetView() { return rView; } inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline sal_Bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } + inline sal_Bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); @@ -117,7 +118,7 @@ public: void ExecField(SfxRequest& rReq); - static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit Update! + static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); // with update! static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; } static FlyMode GetFrmMode() { return eFrameMode; } @@ -125,3 +126,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/ui/inc/beziersh.hxx index c9c88adb441e..1fa2750c0433 100644 --- a/sw/source/ui/inc/beziersh.hxx +++ b/sw/source/ui/inc/beziersh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index aa7c6287de8d..15b9e6b534eb 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,24 +29,18 @@ #ifndef _BMPWIN_HXX #define _BMPWIN_HXX -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif -#ifndef _BITMAPEX_HXX #include <vcl/bitmapex.hxx> -#endif #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; sal_Bool bHorz : 1; sal_Bool bVert : 1; @@ -56,7 +51,7 @@ private: public: BmpWindow(Window* pPar, sal_uInt16 nId, - const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC); + const Graphic& rGraphic, const BitmapEx& rBmp); BmpWindow(Window* pParent, const ResId rResId) : Window(pParent, rResId), bHorz(sal_False), bVert(sal_False),bGraphic(sal_False), bLeftAlign(sal_True) {} @@ -67,3 +62,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index 8955276579fb..0f9e96f50d73 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 3b53b3f1bd77..effdba914367 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,19 +31,13 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "swlbox.hxx" // SwComboBox class SwWrtShell; class SfxRequest; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class BookmarkCombo : public SwComboBox { sal_uInt16 GetFirstSelEntryPos() const; @@ -59,10 +54,6 @@ public: static const String aForbiddenChars; }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwInsertBookmarkDlg: public SvxStandardDialog { FixedLine aBookmarkFl; @@ -86,3 +77,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 8c6c53744ad4..9ff55fde5d2b 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,21 +30,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class SwWrtShell; @@ -90,3 +83,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 17cb80f3b518..70f39be1b7e0 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,10 @@ #define _CAPTION_HXX #include <tools/string.hxx> -//#ifndef _STREAM_HXX //autogen -//#include <tools/stream.hxx> -//#endif #include <tools/globname.hxx> #include <SwCapObjType.hxx> #include "swdllapi.h" -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC InsCaptionOpt { private: @@ -55,7 +49,7 @@ private: String sSeparator; String sCharacterStyle; - sal_Bool bIgnoreSeqOpts; // wird nicht gespeichert + sal_Bool bIgnoreSeqOpts; // is not being saved sal_Bool bCopyAttributes; // -""- public: @@ -116,3 +110,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgdesc.hxx b/sw/source/ui/inc/cfgdesc.hxx index 6a45826c9019..8ecc19a00b5c 100644 --- a/sw/source/ui/inc/cfgdesc.hxx +++ b/sw/source/ui/inc/cfgdesc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,5 +66,6 @@ inline String SwCfgDesc::GetFuncText() const { return aFuncText; } inline String SwCfgDesc::GetMacro() const { return aFuncText; } inline String SwCfgDesc::GetLib() const { return aLibName; } - #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h index 71f061e7b094..d4602a2e89e5 100644 --- a/sw/source/ui/inc/cfgid.h +++ b/sw/source/ui/inc/cfgid.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ #define CFG_SWGLOBAL_MENU (SFX_ITEMTYPE_SW_BEGIN +29) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 2b98f70cbdca..3181aeb64bac 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ class SwWriterApp; class SwModule; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 class SwTestTabPage; #endif class SwAddPrinterTabPage; @@ -50,9 +51,8 @@ class SwDocEditDialog; SfxPrinter* GetPrt( ViewShell* ); void SetPrt( SfxPrinter* ); - /*--------OS 12.01.95 ----------------------------------- -Item fuer Einstellungsdialog - Dokumentanzeige +Item for settings dialog - document view --------------------------------------------------------- */ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem { @@ -87,8 +87,9 @@ public: void operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; + /*--------OS 12.01.95 ----------------------------------- -Item fuer Einstellungsdialog, Elementeseite +Item for settings dialog, element page --------------------------------------------------------- */ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem { @@ -127,10 +128,10 @@ public: void FillViewOptions( SwViewOption& rVOpt) const; }; + /*--------OS 12.01.95 ----------------------------------- -Item fuer Einstellungsdialog - Drucker/Zusaetze +Item for settings dialog - printer/add ons --------------------------------------------------------- */ - class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData { friend class SwAddPrinterTabPage; @@ -175,11 +176,9 @@ public: }; - /*--------OS 12.01.95 ----------------------------------- -Item fuer Einstellungsdialog, ShadowCursorSeite +Item for settings dialog, ShadowCursorPage --------------------------------------------------------- */ - class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem { sal_uInt8 eMode; @@ -204,9 +203,10 @@ public: void SetOn( sal_Bool bFlag ) { bOn = bFlag; } }; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 + /*--------OS 12.01.95 ----------------------------------- -Item fuer Einstellungsdialog - Testeinstellungen +Item for settings dialog - test settings --------------------------------------------------------- */ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem { @@ -239,4 +239,4 @@ public: #endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index 210f81907cc5..d5201d780bdd 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,20 +29,13 @@ #define _CHANGEDB_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> #include "dbtree.hxx" -#include <vcl/fixed.hxx> class SwFldMgr; class SwView; @@ -49,9 +43,8 @@ class SwWrtShell; struct SwDBData; /*-------------------------------------------------------------------- - Beschreibung: Datenbank an Feldern austauschen + Description: exchange database at fields --------------------------------------------------------------------*/ - class SwChangeDBDlg: public SvxStandardDialog { FixedLine aDBListFL; @@ -66,10 +59,8 @@ class SwChangeDBDlg: public SvxStandardDialog OKButton aOKBT; CancelButton aCancelBT; HelpButton aHelpBT; -// PushButton aChangeBT; ImageList aImageList; - ImageList aImageListHC; SwWrtShell *pSh; SwFldMgr *pMgr; @@ -90,3 +81,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index 15050f946227..4b6de648be57 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,3 +34,4 @@ void SwInsertChart( Window *pParent, SfxBindings *pBindings ); #endif /*_CHARTINS_HXX*/ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index 6a6bfe0f9a97..70b4e4385ab6 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 300874ffaeb6..b16579833101 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,37 +29,21 @@ #define _SWCHARDLG_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwView; class SvxMacroItem; -/*-------------------------------------------------------------------- - Beschreibung: Der Tabdialog Traeger der TabPages - --------------------------------------------------------------------*/ - class SwCharDlg: public SfxTabDialog { SwView& rView; @@ -73,10 +58,6 @@ public: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); }; -/*-----------------14.08.96 11.03------------------- - Beschreibung: Tabpage fuer URL-Attribut ---------------------------------------------------*/ - class SwCharURLPage : public SfxTabPage { FixedLine aURLFL; @@ -117,3 +98,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index d263be129b56..9c1a3fca65cb 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,32 +30,24 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> #include "tox.hxx" -#include <tools/list.hxx> #include <toxmgr.hxx> #include <svx/checklbx.hxx> #include <tools/resary.hxx> #include <svtools/svtreebx.hxx> #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> + #define TOX_PAGE_SELECT 1 #define TOX_PAGE_ENTRY 2 #define TOX_PAGE_STYLES 3 @@ -88,3 +81,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx index 22cd2b6ff507..f8d194a5fe7e 100644 --- a/sw/source/ui/inc/colex.hxx +++ b/sw/source/ui/inc/colex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,6 @@ class SwColMgr; class SfxItemSet; -/* -----------------------------08.02.2002 11:32------------------------------ - - ---------------------------------------------------------------------------*/ class SW_DLLPUBLIC SwPageExample : public SvxPageWindow { public: @@ -48,10 +46,9 @@ public: void UpdateExample( const SfxItemSet& rSet ); }; -/* -----------------------------08.02.2002 11:34------------------------------ - ---------------------------------------------------------------------------*/ class SwTextGridItem; + class SW_DLLPUBLIC SwPageGridExample : public SwPageExample { SwTextGridItem* pGridItem; @@ -68,9 +65,6 @@ public: ~SwPageGridExample(); void UpdateExample( const SfxItemSet& rSet ); }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwColExample : public SwPageExample { @@ -94,9 +88,6 @@ public: } }; -/*-----------------25.10.96 08.23------------------- - ---------------------------------------------------*/ class SW_DLLPUBLIC SwColumnOnlyExample : public Window { private: @@ -116,3 +107,5 @@ public: }; #endif // _COLEX_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index 0d9ebdf5123c..da8eae13d554 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,8 +36,7 @@ SW_DLLPUBLIC void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth); class SW_DLLPUBLIC SwColMgr { public: - // lActWidth wird aus den Edits des Seitendialogs - // direkt uebergeben + // lActWidth is passed directly from the page dialogs edits SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); ~SwColMgr(); @@ -55,7 +55,8 @@ public: inline sal_Bool HasLine() const; inline void SetNoLine(); - inline void SetLineWidthAndColor(sal_uLong nWidth, const Color& rCol); + void SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nWidth, const Color& rCol); + inline ::editeng::SvxBorderStyle GetLineStyle() const; inline sal_uLong GetLineWidth() const; inline const Color& GetLineColor() const; @@ -80,29 +81,31 @@ private: sal_uInt16 nWidth; }; -// INLINE METHODE -------------------------------------------------------- - +// INLINE METHOD -------------------------------------------------------- inline sal_uInt16 SwColMgr::GetCount() const { return aFmtCol.GetNumCols(); } -inline void SwColMgr::SetLineWidthAndColor(sal_uLong nLWidth, const Color& rCol) + +inline ::editeng::SvxBorderStyle SwColMgr::GetLineStyle() const { - aFmtCol.SetLineWidth(nLWidth); - aFmtCol.SetLineColor(rCol); + return aFmtCol.GetLineStyle(); } inline sal_uLong SwColMgr::GetLineWidth() const { return aFmtCol.GetLineWidth(); } + inline const Color& SwColMgr::GetLineColor() const { return aFmtCol.GetLineColor(); } + inline SwColLineAdj SwColMgr::GetAdjust() const { return aFmtCol.GetLineAdj(); } + inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) { aFmtCol.SetLineAdj(eAdj); @@ -115,6 +118,7 @@ inline void SwColMgr::SetAutoWidth(sal_Bool bOn, sal_uInt16 nGutterWidth) { aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth); } + inline void SwColMgr::NoCols() { aFmtCol.GetColumns().DeleteAndDestroy(0, aFmtCol.GetColumns().Count()); @@ -123,9 +127,12 @@ inline sal_Bool SwColMgr::HasLine() const { return GetAdjust() != COLADJ_NONE; } + inline void SwColMgr::SetNoLine() { SetAdjust(COLADJ_NONE); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 86c10c647836..b36e0623e719 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,28 +30,14 @@ #define _COLUMN_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svtools/valueset.hxx> #include <sfx2/basedlgs.hxx> @@ -63,9 +50,6 @@ const int nMaxCols = 99; class SwColMgr; class SwWrtShell; class SwColumnPage; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ class SwColumnDlg : public SfxModalDialog { @@ -103,9 +87,6 @@ public: SwWrtShell& GetWrtShell() { return rWrtShell; } }; -/*-----------------07.03.97 08.26------------------- - ---------------------------------------------------*/ class ColumnValueSet : public ValueSet { public: @@ -118,7 +99,7 @@ class ColumnValueSet : public ValueSet }; /*-------------------------------------------------------------------- - Beschreibung: Spaltendialog jetzt als TabPage + Description: column dialog now as TabPage --------------------------------------------------------------------*/ class SwColumnPage : public SfxTabPage { @@ -149,13 +130,15 @@ class SwColumnPage : public SfxTabPage FixedLine aFLLineType; FixedText aLineTypeLbl; LineListBox aLineTypeDLB; + FixedText aLineWidthLbl; + MetricField aLineWidthEdit; + FixedText aLineColorLbl; + ColorListBox aLineColorDLB; FixedText aLineHeightLbl; MetricField aLineHeightEdit; FixedText aLinePosLbl; ListBox aLinePosDLB; - FixedLine aVertFL; - FixedLine aPropertiesFL; FixedText aTextDirectionFT; ListBox aTextDirectionLB; @@ -225,3 +208,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 739a27e309cc..c2d20960e810 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ /************************************************************************* |* -|* Rechteck zeichnen +|* draw rectangle |* \************************************************************************/ @@ -47,7 +48,7 @@ public: virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Funktion aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function virtual void Deactivate(); }; @@ -55,3 +56,4 @@ public: #endif // _CONARC_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 20b9cf798f77..092b5708e2c5 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ class SfxRequest; /************************************************************************* |* -|* Rechteck zeichnen +|* draw rectangle |* \************************************************************************/ @@ -55,7 +56,7 @@ class ConstCustomShape : public SwDrawBase virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function rtl::OUString GetShapeType() const; static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq ); @@ -70,3 +71,4 @@ class ConstCustomShape : public SwDrawBase #endif // _SW_CONRECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index 1cbd29d52a78..8287d54665c9 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,16 +28,10 @@ #ifndef _CONDEDTI_HXX #define _CONDEDTI_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/transfer.hxx> #include "swdllapi.h" -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { sal_Bool bBrackets, bEnableDrop; @@ -55,18 +50,4 @@ public: #endif - - - - - - - - - - - - - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index db62dc3deada..c38ade37abf3 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ public: // Mouse- & Key-Events virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function virtual void CreateDefaultObject(); }; @@ -45,3 +46,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 3733c7a71b61..bf90080bbd21 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ /************************************************************************* |* -|* Basisklasse fuer alle Funktionen +|* base class for all functions |* \************************************************************************/ @@ -47,9 +48,10 @@ public: virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function }; #endif // _CONPOLY_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 0280cf173a00..a04087e58951 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ /************************************************************************* |* -|* Rechteck zeichnen +|* draw rectangle |* \************************************************************************/ @@ -51,10 +52,11 @@ class ConstRectangle : public SwDrawBase virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function }; #endif // _SW_CONRECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index c7bc20ebb65b..0a994c0f0a9d 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <limits.h> // USHRT_MAX #include "swcont.hxx" -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif class SwWrtShell; class SwContentArr; @@ -42,7 +41,7 @@ class SwTOXBase; class SwRedline; //---------------------------------------------------------------------------- -// Hilfsklassen +// helper classes //---------------------------------------------------------------------------- class SwPopup : public PopupMenu @@ -170,29 +169,28 @@ public: const SwTOXBase* GetTOXBase() const {return pBase;} }; /* - class ContentType enthaelt Informationen zu einer Inhaltsform - Das MemberArray wird nur gefuellt, wenn der Inhalt mit GetMember - angefordert wird. Es wird nach Invalidate() nur dann neu geladen, - wenn der Inhalt erneut ausgelesen werden soll. + class ContentType contains information to one type of content. + MemberArray is only populated if the content is requested by + GetMember. It is reloaded after Invalidate() only if the content + should be read again. */ //---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- class SwContentType : public SwTypeNumber { SwWrtShell* pWrtShell; - SwContentArr* pMember; // Array fuer Inhalte - String sContentTypeName; // Name der Inhaltsform - String sSingleContentTypeName; // Name der Inhaltsform, Singular - String sTypeToken; // Anhaengsel fuer URL - sal_uInt16 nMemberCount; // Inhaltsanzahl - sal_uInt16 nContentType; // Id der Inhaltsform + SwContentArr* pMember; // array for content + String sContentTypeName; // name of content type + String sSingleContentTypeName; // name of content type, singular + String sTypeToken; // attachment for URL + sal_uInt16 nMemberCount; // content count + sal_uInt16 nContentType; // content type's Id sal_uInt8 nOutlineLevel; - sal_Bool bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? - sal_Bool bIsInternalDrag:1; // koennen die Inhalte verschoben werden? + sal_Bool bMemberFilled : 1; // has content already been inserted? + sal_Bool bIsInternalDrag:1; // can content be relocated? sal_Bool bDataValid : 1; // - sal_Bool bEdit: 1; // kann diese Type bearbeitet werden ? - sal_Bool bDelete: 1; // kann diese Type geloescht werden ? + sal_Bool bEdit: 1; // can this type be edited? + sal_Bool bDelete: 1; // can this type be deleted? protected: void RemoveNewline(String&); public: @@ -215,7 +213,7 @@ public: Invalidate(); } - void Invalidate(); // nur nMemberCount wird neu gelesen + void Invalidate(); // only nMemberCount is read again sal_Bool IsEditable() const {return bEdit;} sal_Bool IsDeletable() const {return bDelete;} @@ -223,3 +221,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 10e222b3787b..3659f847ab01 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,6 +31,8 @@ #include <svtools/svtreebx.hxx> #include "swcont.hxx" +#include <map> + class SwWrtShell; class SwContentType; class SwNavigationPI; @@ -70,10 +73,12 @@ class SwContentTree : public SvTreeListBox String sPostItHide; String sPostItDelete; - SwWrtShell* pHiddenShell; // gedropptes Doc - SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View + SwWrtShell* pHiddenShell; // dropped Doc + SwWrtShell* pActiveShell; // the active or a const. open view SwNavigationConfig* pConfig; + std::map< void*, sal_Bool > mOutLineNodeMap; + sal_Int32 nActiveBlock; sal_uInt16 nHiddenBlock; sal_uInt16 nRootType; @@ -103,7 +108,6 @@ class SwContentTree : public SvTreeListBox using SvListView::Select; protected: -// virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -191,7 +195,6 @@ public: SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} DECL_LINK( ContentDoubleClickHdl, SwContentTree * ); -// DECL_LINK( PopupHdl, Menu* ); DECL_LINK( TimerUpdate, Timer * ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); @@ -204,7 +207,7 @@ public: //---------------------------------------------------------------------------- -// TreeListBox fuer Globaldokumente +// TreeListBox for global documents //---------------------------------------------------------------------------- class SwLBoxString : public SvLBoxString @@ -232,9 +235,9 @@ private: ImageList aEntryImages; SwWrtShell* pActiveShell; // - SvLBoxEntry* pEmphasisEntry; // Drag'n Drop-Emphasis - SvLBoxEntry* pDDSource; // Quelle beim DnD - SwGlblDocContents* pSwGlblDocContents; // Array mit sortierten Inhalten + SvLBoxEntry* pEmphasisEntry; // Drag'n Drop emphasis + SvLBoxEntry* pDDSource; // source for Drag'n Drop + SwGlblDocContents* pSwGlblDocContents; // array with sorted content Window* pDefParentWin; SwGlblDocContent* pDocContent; @@ -332,3 +335,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index fc1879bc4f2d..3fc218459f68 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _SW_CONVERT_HXX #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <sfx2/basedlgs.hxx> #include <textcontrolcombo.hxx> @@ -89,3 +88,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index edb8590d5c8f..dcbda5163ead 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,25 +30,15 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> @@ -104,8 +95,8 @@ class SwCaptionDialog : public SvxStandardDialog SwCaptionPreview aPrevWin; - SwView &rView; //Suchen per aktive ::com::sun::star::sdbcx::View vermeiden. - SwFldMgr *pMgr; //Ptr um das include zu sparen + SwView &rView; // search per active, avoid ::com::sun::star::sdbcx::View + SwFldMgr *pMgr; // pointer to save the include SelectionType eType; String sCharacterStyle; @@ -127,6 +118,7 @@ class SwCaptionDialog : public SvxStandardDialog void CheckButtonWidth(); void ApplyCaptionOrder(); //#i61007# order of captions + static String our_aSepTextSave; // Save caption separator text public: SwCaptionDialog( Window *pParent, SwView &rV ); ~SwCaptionDialog(); @@ -135,3 +127,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx index 2e82249b84b9..f8da4b00c8d9 100644 --- a/sw/source/ui/inc/dbconfig.hxx +++ b/sw/source/ui/inc/dbconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 4cc46b7ff964..9b7485cf9a62 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,18 +30,10 @@ #define _DBINSDLG_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svmedit.hxx> #include <sfx2/basedlgs.hxx> @@ -167,7 +160,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem virtual void Commit(); void Load(); - // setze die Tabellen - Eigenschaften + // set the tables - properties void SetTabSet(); public: @@ -186,3 +179,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index 44236edf7b00..090654b3f55c 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,6 @@ class SwWrtShell; class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { ImageList aImageList; - ImageList aImageListHC; Image aDBBMP; Image aTableBMP; Image aQueryBMP; @@ -84,3 +84,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 2c8e9cdf02c7..95a5864ef9d1 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> @@ -84,3 +83,4 @@ private: //member #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx index ebd9731c5e0a..7be3129b8a5b 100644 --- a/sw/source/ui/inc/dialmgr.hxx +++ b/sw/source/ui/inc/dialmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,6 +35,7 @@ // forward --------------------------------------------------------------- class ResMgr; + struct SwDialogsResMgr { static ResMgr* GetResMgr(); @@ -46,3 +48,4 @@ struct SwDialogsResMgr #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx index 7804773be5ff..172ca409317a 100644 --- a/sw/source/ui/inc/docfnote.hxx +++ b/sw/source/ui/inc/docfnote.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index b45700534d48..a2a3433fe66e 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,17 +30,14 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include "docstat.hxx" /*-------------------------------------------------------------------- - Beschreibung: DocInfo jetzt als Page + Description: DocInfo now as page --------------------------------------------------------------------*/ - class SwDocStatPage: public SfxTabPage { public: @@ -69,6 +67,8 @@ private: FixedInfo aWordNo; FixedText aCharLbl; FixedInfo aCharNo; + FixedText aCharExclSpacesLbl; + FixedInfo aCharExclSpacesNo; FixedText aLineLbl; FixedInfo aLineNo; @@ -82,3 +82,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index 2a63c6db360c..36747e9eb3b4 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ class MouseEvent; /************************************************************************* |* -|* Basisklasse fuer alle Funktionen +|* base class for all functions |* \************************************************************************/ @@ -49,8 +50,8 @@ protected: SwView* m_pView; SwWrtShell* m_pSh; SwEditWin* m_pWin; - Point m_aStartPos; // Position von BeginCreate - Point m_aMDPos; // Position von MouseButtonDown + Point m_aStartPos; // position of BeginCreate + Point m_aMDPos; // position of MouseButtonDown sal_uInt16 m_nSlotId; sal_Bool m_bCreateObj :1; sal_Bool m_bInsForm :1; @@ -65,7 +66,7 @@ public: inline sal_Bool IsInsertForm() const { return m_bInsForm; } inline sal_Bool IsCreateObj() const { return m_bCreateObj; } - // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet + // mouse- & key events; return value=sal_True: event was edited virtual sal_Bool KeyInput(const KeyEvent& rKEvt); virtual sal_Bool MouseMove(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); @@ -75,8 +76,8 @@ public: void SetSlotId(sal_uInt16 nSlot) {m_nSlotId = nSlot;} sal_uInt16 GetSlotId() { return m_nSlotId;} - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate fuction + virtual void Deactivate(); // deactivate function virtual void CreateDefaultObject(); @@ -88,3 +89,4 @@ public: #endif // _SW_DRAWBASE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/ui/inc/drawsh.hxx index deb0849d66a0..4325661414f9 100644 --- a/sw/source/ui/inc/drawsh.hxx +++ b/sw/source/ui/inc/drawsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/ui/inc/drformsh.hxx index 8648742b1f99..061b2f4aad23 100644 --- a/sw/source/ui/inc/drformsh.hxx +++ b/sw/source/ui/inc/drformsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 6e7d6547053c..f9a8f7316c93 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,25 +31,15 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwWrtShell; @@ -123,3 +114,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index 00b18f2fb143..0b5628b99cad 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx index add257a36ac2..46efceaf2bef 100644 --- a/sw/source/ui/inc/drwtxtsh.hxx +++ b/sw/source/ui/inc/drwtxtsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #include <sfx2/shell.hxx> #include "shellid.hxx" +#include <unotools/caserotate.hxx> class SdrView; class SwView; @@ -38,6 +40,7 @@ class SfxModule; class SwDrawTextShell: public SfxShell { SwView &rView; + RotateTransliteration m_aRotateCase; SdrView *pSdrView; @@ -78,9 +81,12 @@ public: void StateClpbrd(SfxItemSet &rSet); void StateInsert(SfxItemSet &rSet); void ExecTransliteration(SfxRequest &); + void ExecRotateTransliteration(SfxRequest &); void Init(); void StateStatusline(SfxItemSet &rSet); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index 65b778181947..c3b3d0104bb8 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ /************************************************************************* |* -|* Rechteck zeichnen +|* draw rectangle |* \************************************************************************/ @@ -40,13 +41,14 @@ class DrawSelection : public SwDrawBase public: DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); - // Mouse- & Key-Events + // mouse- & key events virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // activate function }; #endif // _SW_DSELECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 3ca6259c41a4..547d67883508 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,7 +54,7 @@ struct QuickHelpData; class SdrDropMarkerOverlay; /*-------------------------------------------------------------------- - Beschreibung: Eingabe-Fenster + Description: input window --------------------------------------------------------------------*/ class SwEditWin: public Window, @@ -75,18 +76,18 @@ friend void PageNumNotify( ViewShell* pVwSh, static sal_Bool bReplaceQuote; static long nDDStartPosX, nDDStartPosY; - static Color aTextColor; //Textfarbe, fuer die Giesskanne - static sal_Bool bTransparentBackColor; // Hintergrund transparent - static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne + static Color aTextColor; // text color; for the watering can + static sal_Bool bTransparentBackColor; // transparent background + static Color aTextBackColor; // text background; for the watering can /* - * Timer und Handler fuer das Weiterscrollen, wenn der - * Mauspointer innerhalb eines Drag-Vorgangs ausserhalb des - * EditWin stehen bleibt. In regelmaessigen Intervallen wird - * die Selektion in Richtung der Mausposition vergroessert. + * timer and handler for scrolling on when the mousepointer + * stopps outside of EditWin during a drag-operation. + * The selection is increased towards the mouse position + * regularly. */ AutoTimer aTimer; - // Timer fuer verschachtelte KeyInputs (z.B. fuer Tabellen) + // timer for overlapping KeyInputs (e.g. for tables) Timer aKeyInputTimer; // timer for ANY-KeyInut question without a following KeyInputEvent Timer aKeyInputFlushTimer; @@ -98,11 +99,11 @@ friend void PageNumNotify( ViewShell* pVwSh, Point aRszMvHdlPt; Timer aTemplateTimer; - // Type/Objecte ueber dem der MousePointer steht + // type/object where the mouse pointer is SwCallMouseEvent aSaveCallEvent; SwApplyTemplate *pApplyTempl; - SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers + SwAnchorMarker *pAnchorMarker; // for relocating the anchor SdrDropMarkerOverlay *pUserMarker; SdrObject *pUserMarkerObj; @@ -111,29 +112,29 @@ friend void PageNumNotify( ViewShell* pVwSh, SwView &rView; - int aActHitType; // aktueller Mauspointer + int aActHitType; // current mouse pointer - sal_uLong m_nDropFormat; //Format aus dem letzten QueryDrop - sal_uInt16 m_nDropAction; //Action aus dem letzten QueryDrop - sal_uInt16 m_nDropDestination; //Ziel aus dem letzten QueryDrop + sal_uLong m_nDropFormat; // format from the last QueryDrop + sal_uInt16 m_nDropAction; // action from the last QueryDrop + sal_uInt16 m_nDropDestination; // destination from the last QueryDrop sal_uInt16 eBezierMode; - sal_uInt16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen + sal_uInt16 nInsFrmColCount; // column number for interactive frame SdrObjKind eDrawMode; sal_Bool bLinkRemoved : 1, bMBPressed : 1, bInsDraw : 1, bInsFrm : 1, bIsInMove : 1, - bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren - bOldIdle : 1, //Zum abschalten des Idle'ns - bOldIdleSet : 1, //waehrend QeueryDrop + bIsInDrag : 1, // don't execute StartExecuteDrag twice + bOldIdle : 1, // to stop to idle + bOldIdleSet : 1, // during QeueryDrop bTblInsDelMode : 1, // bTblIsInsMode : 1, // bTblIsColMode : 1, // - bChainMode : 1, //Rahmen verbinden - bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an - bLockInput : 1, //Lock waehrend die Rechenleiste aktiv ist + bChainMode : 1, // connect frames + bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown + bLockInput : 1, // lock while calc panel is active bIsRowDrag : 1, //selection of rows is used, in combination with pRowColumnSelectionStart /** #i42732# display status of font size/name depending on either the input language or the selection position depending on what has changed lately @@ -157,7 +158,7 @@ friend void PageNumNotify( ViewShell* pVwSh, sal_Bool EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); sal_Bool RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode); - //Hilfsfunktionen fuer D&D + // helper function for D&D void DropCleanup(); void CleanupDropUserMarker(); sal_uInt16 GetDropDestination( const Point& rPixPnt, @@ -166,10 +167,10 @@ friend void PageNumNotify( ViewShell* pVwSh, sal_Bool SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ); /* - * Handler fuer das Weiterscrollen, wenn der Mauspointer innerhalb eines - * Drag-Vorgangs ausserhalb des EditWin stehen bleibt. In regelmaessigen - * Intervallen wird die Selektion in Richtung der Mausposition - * vergroessert. + * handler for scrolling on when the mousepointer + * stopps outside of EditWin during a drag-operation. + * The selection is regularly increased towards the mouse + * position. */ DECL_LINK( TimerHandler, Timer * ); void StartDDTimer(); @@ -179,10 +180,10 @@ friend void PageNumNotify( ViewShell* pVwSh, // timer for ANY-KeyInut question without a following KeyInputEvent DECL_LINK( KeyInputFlushHandler, Timer * ); - // Timer fuer verschachtelte KeyInputs (z.B. fuer Tabellen) + // timer for overlapping KeyInputs (e.g. for tables) DECL_LINK( KeyInputTimerHandler, Timer * ); - // Timer fuer das ApplyTemplates per Maus (verkapptes Drag&Drop) + // timer for ApplyTemplates via mouse (in disguise Drag&Drop) DECL_LINK( TemplateTimerHdl, Timer* ); using OutputDevice::GetTextColor; @@ -233,10 +234,10 @@ public: sal_Bool IsFrmAction() { return (bInsFrm); } inline sal_uInt16 GetBezierMode() { return eBezierMode; } void SetBezierMode(sal_uInt16 eBezMode) { eBezierMode = eBezMode; } - void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten + void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode void InsFrm(sal_uInt16 nCols); void StopInsFrm(); - sal_uInt16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen + sal_uInt16 GetFrmColCount() const {return nInsFrmColCount;} // column number for interactive frame void SetChainMode( sal_Bool bOn ); @@ -276,7 +277,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - // Tipfenster loeschen + // delete tip window static void ClearTip(); static inline long GetDDStartPosX() { return nDDStartPosX; } @@ -288,10 +289,9 @@ public: //#i3370# remove quick help to prevent saving of autocorrection suggestions void StopQuickHelp(); - // --> OD 2005-02-18 #i42921# - add parameter <bVerticalMode> + // #i42921# - add parameter <bVerticalMode> sal_Bool RulerMarginDrag( const MouseEvent& rMEvt, const bool bVerticalMode ); - // <-- /** #i42732# display status of font size/name depending on either the input language or the selection position depending on what has changed lately @@ -305,3 +305,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index 659fe46892db..0c282b3d35c5 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,11 +33,9 @@ #include "swdllapi.h" // MakeSender ----------------------------------------------------------------- - SW_DLLPUBLIC String MakeSender(); // enum ----------------------------------------------------------------------- - enum SwEnvAlign { ENV_HOR_LEFT = 0, @@ -48,24 +47,23 @@ enum SwEnvAlign }; // class SwEnvItem ------------------------------------------------------------ - class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem { public: - rtl::OUString aAddrText; // Text fuer Empfaenger - sal_Bool bSend; // Absender? - rtl::OUString aSendText; // Text fuer Absender - sal_Int32 lAddrFromLeft; // Linker Abstand fuer Empfaenger (twips) - sal_Int32 lAddrFromTop; // Oberer Abstand fuer Empfaenger (twips) - sal_Int32 lSendFromLeft; // Linker Abstand fuer Absender (twips) - sal_Int32 lSendFromTop; // Oberer Abstand fuer Absender (twips) - sal_Int32 lWidth; // Breite des Umschlags (twips) - sal_Int32 lHeight; // Hoehe des Umschlags (twips) - SwEnvAlign eAlign; // Ausrichtung beim Einzug - sal_Bool bPrintFromAbove; // Von oben drucken? - sal_Int32 lShiftRight; // Verschiebung nach rechts (twips) - sal_Int32 lShiftDown; // Verschiebung nach unten (twips) + rtl::OUString aAddrText; // text for reciever + sal_Bool bSend; // sender? + rtl::OUString aSendText; // text for sender + sal_Int32 lAddrFromLeft; // left gap for reciever (twips) + sal_Int32 lAddrFromTop; // upper gap for reciever (twips) + sal_Int32 lSendFromLeft; // left gap for sender (twips) + sal_Int32 lSendFromTop; // upper gap for sender (twips) + sal_Int32 lWidth; // envelope's width (twips) + sal_Int32 lHeight; // envelope's height (twips) + SwEnvAlign eAlign; // alignment at indent + sal_Bool bPrintFromAbove; // print from above? + sal_Int32 lShiftRight; // shift to right (twips) + sal_Int32 lShiftDown; // shift down (twips) SwEnvItem(); SwEnvItem(const SwEnvItem& rItem); @@ -77,8 +75,8 @@ public: virtual int operator ==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; // class SwEnvCfgItem ------------------------------------------------------- @@ -96,5 +94,7 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; + #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 85f87c71d7c0..1deb5c788b2c 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,26 +28,16 @@ #ifndef _ENVLOP_HXX #define _ENVLOP_HXX -#ifndef _SV_MEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif #include "envimg.hxx" @@ -59,7 +50,6 @@ class SwWrtShell; class Printer; // class SwEnvPreview --------------------------------------------------------- - class SwEnvPreview : public Window { void Paint(const Rectangle&); @@ -74,7 +64,6 @@ protected: }; // class SwEnvDlg ----------------------------------------------------------- - class SwEnvDlg : public SfxTabDialog { friend class SwEnvPage; @@ -99,7 +88,6 @@ public: }; // class SwEnvPage ---------------------------------------------------------- - class SwEnvPage : public SfxTabPage { FixedText aAddrText; @@ -146,4 +134,4 @@ public: #endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/extedit.hxx b/sw/source/ui/inc/extedit.hxx new file mode 100644 index 000000000000..d013890a338d --- /dev/null +++ b/sw/source/ui/inc/extedit.hxx @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * [ Surendran Mahendran <surenspost@gmail.com>] + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ +#ifndef _EXTEDIT_HXX +#define _EXTEDIT_HXX + +#include <osl/file.hxx> +#include <osl/process.h> +#include <vcl/graph.hxx> +#include <svtools/grfmgr.hxx> +#include <wrtsh.hxx> +#include <vcl/timer.hxx> + +struct Data +{ + GraphicObject *pGraphicObject; + rtl::OUString fileName; + SwWrtShell *rSh ; +}; + +class ExternalProcessClass_Impl +{ + public: + DECL_LINK( CloseEvent, void *pEvent ); + DECL_LINK( StartListeningEvent, void *pEvent ); +}; + +void EditWithExternalTool(GraphicObject *pGraphic, SwWrtShell *rSh); + +#endif diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index 35b0b19be6c8..d41557e1636f 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,10 +33,6 @@ class SwView; class SwWrtShell; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwFldEditDlg : public SfxSingleTabDialog { SwWrtShell* pSh; @@ -62,5 +59,6 @@ public: void InsertHdl(); }; - #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index 009084c633a2..a5431c6c845f 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,10 +53,10 @@ class SbModule; class SvxMacroItem; class SvNumberFormatter; class Window; + /*-------------------------------------------------------------------- - Beschreibung: Die Gruppen von Feldern + Description: the groups of fields --------------------------------------------------------------------*/ - enum SwFldGroups { GRP_DOC, @@ -73,8 +74,8 @@ struct SwFldGroupRgn }; /*-------------------------------------------------------------------- - Beschreibung: Der FeldManager handelt das Einfuegen von Felder - ueber Command-Strings + Description: the field manager handles the insertation of fields + with command strings --------------------------------------------------------------------*/ struct SwInsertFld_Data { @@ -116,7 +117,7 @@ private: SwField* pCurFld; SbModule* pModule; const SvxMacroItem* pMacroItem; - SwWrtShell* pWrtShell; // darf auch NULL sein! + SwWrtShell* pWrtShell; // can be ZERO too! String aCurPar1; String aCurPar2; String sCurFrame; @@ -140,10 +141,10 @@ public: void SetWrtShell( SwWrtShell* pShell ) { pWrtShell = pShell; } - // Feld einfuegen ueber TypeId (TYP_ ...) + // insert field using TypeID (TYP_ ...) sal_Bool InsertFld( const SwInsertFld_Data& rData ); - // Direkt das aktuelle Feld aendern + // change the current field directly void UpdateCurFld(sal_uLong nFormat, const String& rPar1, const String& rPar2, @@ -153,7 +154,7 @@ public: inline const String& GetCurFldPar2() const; inline sal_uLong GetCurFldFmt() const; - // Ein Feld ermitteln + // determine a field SwField* GetCurFld(); void InsertFldType(SwFieldType& rType); @@ -164,54 +165,54 @@ public: inline const String& GetMacroName() const { return (sMacroName); } inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } - // Vorheriger Naechster gleichen Typ + // previous and next of the same type sal_Bool GoNextPrev( sal_Bool bNext = sal_True, SwFieldType* pTyp = 0 ); sal_Bool GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( sal_True, pTyp ); } sal_Bool GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( sal_False, pTyp ); } - // Erfragen von Werten aus Datenbankfeldern (BASIC ) + // query values from database fields (BASIC ) // String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); sal_Bool IsDBNumeric(const String& rDBName, const String& rTblQryName, sal_Bool bIsTable, const String& rFldName); - // RefMark mit Namen organisieren + // organise RefMark with names sal_Bool CanInsertRefMark( const String& rStr ); - // Zugriff ueber ResId auf Feldtypen + // access to field types via ResId sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const; void RemoveFldType(sal_uInt16 nResId, const String& rName); - // Zugriff ueber TypeId aus dem Dialog - // Ids fuer einen Bereich von Feldern + // access via TypeId from the dialog + // Ids for a range of fields const SwFldGroupRgn& GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const; sal_uInt16 GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0) const; - // TypeId des aktuellen Feldes + // the current field's TypeId sal_uInt16 GetCurTypeId() const; - // TypeId fuer einen konkrete Pos in der Liste + // TypeId for a concrete position in the list static sal_uInt16 GetTypeId(sal_uInt16 nPos); - // Name des Typen in der Liste der Felder + // name of the type in the list of fields static const String& GetTypeStr(sal_uInt16 nPos); - // Pos in der Liste der Felder + // Pos in the list of fields static sal_uInt16 GetPos(sal_uInt16 nTypeId); - // Untertypen zu einem Typ + // subtypes to a type sal_Bool GetSubTypes(sal_uInt16 nId, SvStringsDtor& rToFill); - // Formate zu einem Typ + // format to a type sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode = sal_False) const; String GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); - // Evaluierung der ExpressionFelder ausschalten fuer das Einfuegen - // vieler Expressionfelder (siehe Etiketten) + // turn off evaluation of expression fields for insertation + // of many expressino fields (see labels) // inline void SetEvalExpFlds(sal_Bool bEval); void EvalExpFlds(SwWrtShell* pSh = NULL); @@ -229,6 +230,6 @@ inline const String& SwFldMgr::GetCurFldPar2() const inline sal_uLong SwFldMgr::GetCurFldFmt() const { return nCurFmt; } - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index 9ee45e91cbe8..013002276b9c 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,10 +34,6 @@ class SfxTabPage; class SwChildWinWrapper; struct SfxChildWinInfo; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwFldDlg: public SfxTabDialog { SwChildWinWrapper* m_pChildWin; @@ -66,3 +63,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 9d8435e60bfc..f2ed07bc3fba 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,8 @@ public: virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); void ShowPage(sal_uInt16 nPage = 0); }; -/* -----------------04.02.2003 14:14----------------- + +/* -------------------------------------------------- * field dialog only showing database page to support * mail merge * --------------------------------------------------*/ @@ -58,6 +60,6 @@ public: virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 23f585863a07..5acd526bd16e 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <unotools/configitem.hxx> #include <tools/string.hxx> #include <i18npool/lang.h> -#include <tools/debug.hxx> +#include <osl/diagnose.h> #include "swdllapi.h" #define FONT_STANDARD 0 @@ -58,6 +59,7 @@ //pt-size of fonts #define FONTSIZE_DEFAULT 240 +#define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 @@ -118,3 +120,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index ca35d7b5f8ab..07891a0b5874 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index 333f76f093ae..28782f96330e 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,21 +30,13 @@ #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include "toxe.hxx" @@ -51,9 +44,8 @@ class SwWrtShell; class SwForm; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Description: insert marker for index entry --------------------------------------------------------------------*/ - class SwIdxFormDlg : public SvxStandardDialog { DECL_LINK( EntryHdl, Button * ); @@ -106,3 +98,5 @@ inline const SwForm& SwIdxFormDlg::GetTOXForm() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx index 69d17759b625..0cadce11e1b9 100644 --- a/sw/source/ui/inc/frmdlg.hxx +++ b/sw/source/ui/inc/frmdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,8 @@ class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Description: frame dialog --------------------------------------------------------------------*/ - class SwFrmDlg : public SfxTabDialog { sal_Bool m_bFormat; @@ -63,5 +63,6 @@ public: inline SwWrtShell* GetWrtShell() { return m_pWrtShell; } }; - #endif // _FRMDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index 0d4d0131de43..6a462480d4b7 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,20 +68,19 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr sal_Bool bIsInVertical; // --> OD 2009-09-01 #mongolianlayout# sal_Bool bIsInVerticalL2R; - // <-- - // interne Verrechnung fuer Umrandung + // internal calculation for borders SW_DLLPRIVATE SwTwips CalcTopSpace(); SW_DLLPRIVATE SwTwips CalcBottomSpace(); SW_DLLPRIVATE SwTwips CalcLeftSpace(); SW_DLLPRIVATE SwTwips CalcRightSpace(); - SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update + SW_DLLPRIVATE void _UpdateFlyFrm(); // post-treatment after insert or update public: SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType ); - //CopyCtor fuer die Dialoge, zum Pruefen der Metrics + //CopyCtor for dialogs to check the metrics SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); inline SwWrtShell* GetShell() { return pOwnSh; } @@ -91,14 +91,14 @@ public: void SetHorzOrientation(sal_Int16 eOrient); void SetVertOrientation(sal_Int16 eOrient); - // Absolute Position + // absolute position void SetAbsPos(const Point& rLPoint); - // Relative Position vom Anker + // anchor's relative position void SetPos(const Point& rLPoint); inline Point GetPos() const; - // Groesse + // size void SetSize(const Size& rLSize); inline const Size& GetSize() const; @@ -106,7 +106,7 @@ public: void SetHeightSizeType(SwFrmSize eType); - // Abstand zum Inhalt + // space to content void SetLRSpace( long nLeft = LONG_MAX, long nRight = LONG_MAX ); void SetULSpace( long nTop = LONG_MAX, @@ -114,25 +114,25 @@ public: void SetCol( const SwFmtCol &rCol); - // Attribute aendern und erfragen + // change and query attributes void UpdateAttrMgr(); void UpdateFlyFrm(); - // neuen Rahmen erzeugen + // create new frame sal_Bool InsertFlyFrm(); void InsertFlyFrm(RndStdIds eAnchorType, const Point &rPos, const Size &rSize, sal_Bool bAbsPos = sal_False); - // Metriken pruefen und aendern + // check and change metrics void ValidateMetrics(SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, sal_Bool bOnlyPercentRefValue = sal_False); void DelAttr(sal_uInt16 nId); - // Set rausreichen + // reach out the set inline const SfxItemSet &GetAttrSet() const { return aSet; } inline SfxItemSet &GetAttrSet() { return aSet; } void SetAttrSet(const SfxItemSet& rSet); @@ -194,3 +194,5 @@ inline sal_uInt16 SwFlyFrmAttrMgr::GetHeightPercent() const } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 29983a275e59..57221dba9699 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,6 @@ #include <prcntfld.hxx> #include <globals.hrc> - namespace sfx2{class FileDialogHelper;} class SwWrtShell; struct FrmMap; @@ -48,12 +48,11 @@ struct FrmMap; struct SwPosition; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Description: frame dialog --------------------------------------------------------------------*/ - class SwFrmPage: public SfxTabPage { - // Size + // size FixedLine aSizeFL; FixedText aWidthFT; FixedText aWidthAutoFT; @@ -68,7 +67,7 @@ class SwFrmPage: public SfxTabPage CheckBox aFixedRatioCB; PushButton aRealSizeBT; - // Anker + // anchor FixedLine aTypeSepFL; FixedLine aTypeFL; RadioButton aAnchorAtPageRB; @@ -77,7 +76,7 @@ class SwFrmPage: public SfxTabPage RadioButton aAnchorAsCharRB; RadioButton aAnchorAtFrameRB; - // Position + // position FixedLine aPositionFL; FixedText aHorizontalFT; ListBox aHorizontalDLB; @@ -95,7 +94,7 @@ class SwFrmPage: public SfxTabPage // OD 02.10.2003 #i18732# - check box for new option 'FollowTextFlow' CheckBox aFollowTextFlowCB; - // Example + // example SvxSwFrameExample aExampleWN; //'string provider' @@ -111,7 +110,6 @@ class SwFrmPage: public SfxTabPage sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged // --> OD 2009-08-31 #mongolianlayou# sal_Bool bIsVerticalL2R; - // <-- sal_Bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged sal_Bool bHtmlMode; sal_uInt16 nHtmlMode; @@ -126,7 +124,7 @@ class SwFrmPage: public SfxTabPage // to character anchored objects. const SwPosition* mpToCharCntntPos; - // Die alten Ausrichtungen + // old alignment short nOldH; short nOldHRel; short nOldV; @@ -158,7 +156,7 @@ class SwFrmPage: public SfxTabPage DECL_LINK( AutoWidthClickHdl, void* ); DECL_LINK( AutoHeightClickHdl, void* ); - // Beispiel aktualisieren + // update example void UpdateExample(); DECL_LINK( ModifyHdl, Edit * ); @@ -207,7 +205,7 @@ public: class SwGrfExtPage: public SfxTabPage { - // Spiegeln + // mirror FixedLine aMirrorFL; CheckBox aMirrorVertBox; CheckBox aMirrorHorzBox; @@ -228,7 +226,7 @@ class SwGrfExtPage: public SfxTabPage sal_Bool bHtmlMode; - // Handler fuer Spiegeln + // handler for mirroring DECL_LINK( MirrorHdl, CheckBox * ); DECL_LINK( BrowseHdl, Button * ); @@ -248,10 +246,9 @@ public: virtual int DeactivatePage(SfxItemSet *pSet); }; - class SwFrmURLPage : public SfxTabPage { - //Hyperlink + // hyperlink FixedLine aHyperLinkFL; FixedText aURLFT; Edit aURLED; @@ -261,7 +258,7 @@ class SwFrmURLPage : public SfxTabPage FixedText aFrameFT; ComboBox aFrameCB; - //Image map + // image map FixedLine aImageFL; CheckBox aServerCB; CheckBox aClientCB; @@ -283,10 +280,6 @@ public: virtual void Reset(const SfxItemSet &rSet); }; -/*-----------------13.11.96 12.59------------------- - ---------------------------------------------------*/ - class SwFrmAddPage : public SfxTabPage { FixedLine aNamesFL; @@ -340,3 +333,5 @@ public: }; #endif // _FRMPAGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/ui/inc/frmsh.hxx index d4f4c546acf1..0e83ccbc6bf7 100644 --- a/sw/source/ui/inc/frmsh.hxx +++ b/sw/source/ui/inc/frmsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/globals.h b/sw/source/ui/inc/globals.h index 46a2fba86397..530fef285f9a 100644 --- a/sw/source/ui/inc/globals.h +++ b/sw/source/ui/inc/globals.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,3 +36,5 @@ enum SwChangeState }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index 0046e4f46e87..c886ad6cea92 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,19 +29,13 @@ #ifndef _GLOSBIB_HXX #define _GLOSBIB_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svtools/svtabbx.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> class SwGlossaryHdl; @@ -54,15 +49,14 @@ class FEdit : public Edit virtual void KeyInput( const KeyEvent& rKEvent ); }; -/* -----------------------------08.02.00 15:04-------------------------------- - ---------------------------------------------------------------------------*/ struct GlosBibUserData { String sPath; String sGroupName; String sGroupTitle; }; + class SwGlossaryGroupTLB : public SvTabListBox { public: @@ -115,6 +109,6 @@ public: const String& GetCreatedGroupName() const {return sCreatedGroup;} }; - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index ff7c01ee0b88..b85e6fa74283 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,3 +147,5 @@ public: #endif // _GLOSDOC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx index 9bda46e4afef..7368edacf7f3 100644 --- a/sw/source/ui/inc/gloshdl.hxx +++ b/sw/source/ui/inc/gloshdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,8 +78,8 @@ public: sal_Bool CopyOrMove( const String& rSourceGroupName, String& rSourceShortName, const String& rDestGroupName, const String& rLongName, sal_Bool bMove ); sal_Bool HasShortName(const String &rShortName) const; - //wird NewGlossary vom Basic gerufen, dann soll dir zuvor eingestellte - //Gruppe ggf. neu erstellt werden + // when NewGlossary is called from Basic then the previously set group should + // be newly created if applicable. sal_Bool NewGlossary(const String &rName, const String &rShortName, sal_Bool bApiCall = sal_False, sal_Bool bNoAttr = sal_False ); sal_Bool DelGlossary(const String&); @@ -99,7 +100,7 @@ public: sal_Bool IsReadOnly( const String* = 0 ) const; sal_Bool IsOld() const; - sal_Bool FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden + sal_Bool FindGroupName(String & rGroup); // find group without path index sal_Bool ImportGlossaries( const String& rName ); @@ -108,3 +109,5 @@ public: }; #endif // _GLOSHDL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 676c3f3c4afd..84d9c839cfd4 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,8 +43,8 @@ struct AutoTextGroup sal_uInt16 nCount; String sName; String sTitle; - String sLongNames; // durch 0x0A getrennte Langnamen - String sShortNames; // durch 0x0A getrennte Kurznamen + String sLongNames; // by 0x0A seperated long names + String sShortNames; // by 0x0A seperated short names DateTime aDateModified; }; @@ -87,3 +88,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 11328575fa4c..3f499a8c0def 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,32 +28,16 @@ #ifndef _GLOSSARY_HXX #define _GLOSSARY_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> -#endif -#include <vcl/fixed.hxx> - -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif - -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -195,3 +180,4 @@ inline String SwGlossaryDlg::GetCurrShortName() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index 85f01396910e..2c073f8b3e07 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx index f8448ae9bc68..231cc170baab 100644 --- a/sw/source/ui/inc/grfsh.hxx +++ b/sw/source/ui/inc/grfsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h deleted file mode 100644 index d5cff23e616b..000000000000 --- a/sw/source/ui/inc/hidfunc.h +++ /dev/null @@ -1,350 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define HID_EXIT 1017 -#define HID_NEW_WINDOW 1701 -#define HID_ARRANGE_CASCADE_WIN 1703 -#define HID_ARRANGE_HORZ_WIN 1704 -#define HID_ARRANGE_VERT_WIN 1705 -#define HID_ARRANGE_ALL_WIN 1702 -#define HID_SHOW_HELP_INDEX 1802 -#define HID_NEW_FILE 1005 -#define HID_NEW_FILE_DEFAULT 1024 -#define HID_CLOSE_FILE 1001 -#define HID_DOC_MGR_DLG 1032 -#define HID_CONFIG_TOOLBOX 1629 -#define HID_CONFIG_MENU 1630 -#define HID_CONFIG_KEY 1631 -#define HID_TEMPLATE_PI 1657 -#define HID_ADDR_PI 1658 -#define HID_AUTO_FORMAT 1651 -#define HID_NAVIGATION_PI 1656 -#define HID_NAVIGATION_PI_GOTO_PAGE 1659 -#define HID_HELP_PI 1655 -#define HID_FORMAT_DROPCAPS 1454 -#define HID_CONFIG_VIEWOPTIONS 1635 -#define HID_CONFIG_COLORS 1636 -#define HID_TOOLBOX 1213 -#define HID_RIBBON 1210 -#define HID_RULER 1211 -#define HID_VLINEAL 1216 -#define HID_VSCROLLBAR 1217 -#define HID_HSCROLLBAR 1218 -#define HID_SAVE_FILE 1013 -#define HID_SAVE_ALL 1023 -#define HID_SAVE_FILE_AS 1012 -#define HID_OPEN_LASTVERSION 1009 -#define HID_STATUSBAR 1212 -#define HID_ABOUT_DLG 1806 -#define HID_SEND_MAIL 1022 -#define HID_OPEN_FILE 1007 -#define HID_INSERT_FILE 1309 -#define HID_DOCSTAT_DLG 1020 -#define HID_LOAD_TEMPLATE_DLG 1021 -#define HID_ESCAPE 1941 -#define HID_PLAY_MACRO_DLG 1624 -#define HID_RECORD_MACRO_DLG 1622 -#define HID_ASSIGN_LOCAL_MACRO_DLG 1632 -#define HID_COMPILE_MACRO 1633 -#define HID_CREATE_DOCUMENT 1019 -#define HID_PAGEUP 1937 -#define HID_PAGEDOWN 1938 -#define HID_SET_LEFT_PARA 1418 -#define HID_SET_RIGHT_PARA 1419 -#define HID_SET_CENTER_PARA 1420 -#define HID_SET_JUSTIFY_PARA 1421 -#define HID_SET_ADJUST 1428 -#define HID_FORMAT_RESET 1469 -#define HID_INDENT_TO_TABSTOP 1417 -#define HID_UNINDENT_TO_TABSTOP 1431 -#define HID_SET_BOLD 1405 -#define HID_SET_ITALIC 1406 -#define HID_SET_UNDERLINE 1409 -#define HID_SET_STRIKEOUT 1410 -#define HID_SET_OUTLINE 1408 -#define HID_SET_SHADOW 1407 -#define HID_SET_SUPER_SCRIPT 1411 -#define HID_SET_SUB_SCRIPT 1412 -#define HID_SET_COLOR 1413 -#define HID_SET_CASEMAP 1414 -#define HID_SET_LANGUAGE 1415 -#define HID_SET_KERNING 1416 -#define HID_SET_FONT 1401 -#define HID_SET_FONT_SIZE 1402 -#define HID_GROW_FONT_SIZE 1403 -#define HID_SHRINK_FONT_SIZE 1404 -#define HID_SET_LINE_SPACE_1 1422 -#define HID_SET_LINE_SPACE_15 1423 -#define HID_SET_LINE_SPACE_2 1424 -#define HID_SET_PROP_LINE_SPACE 1540 -#define HID_SET_ABS_LINE_SPACE 1541 -#define HID_INSERT_SYMBOL 1328 -#define HID_INSERT_OBJECT_DLG 1322 -#define HID_EDIT_OBJECT 1110 -#define HID_EDIT_LINK_DLG 1109 -#define HID_EDIT_FILE_INFO_DLG 1107 -#define HID_EDIT_IDX_ENTRY_DLG 1123 -#define HID_NUM_BULLET_DOWN 1130 -#define HID_NUM_BULLET_MOVEUP 1134 -#define HID_NUM_BULLET_MOVEDOWN 1135 -#define HID_NUM_BULLET_UP 1131 -#define HID_NUM_BULLET_PREV 1132 -#define HID_NUM_BULLET_NEXT 1133 -#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142 -#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141 -#define HID_NUM_BULLET_OUTLINE_UP 1140 -#define HID_NUM_BULLET_OUTLINE_DOWN 1139 -#define HID_NUM_BULLET_NONUM 1136 -#define HID_NUM_NUMBERING_ON 1144 -#define HID_NUM_BULLET_ON 1138 -#define HID_NUM_BULLET_OFF 1137 -#define HID_INSERT_IDX_ENTRY_DLG 1335 -#define HID_POSTIT 1329 -#define HID_INSERT_CAPTION 1310 -#define HID_INSERT_IDX 1336 -#define HID_INSERT_USERIDX 1337 -#define HID_INSERT_CNTNTIDX 1338 -#define HID_INSERT_IDX_ENTRY 1340 -#define HID_INSERT_USERIDX_ENTRY 1341 -#define HID_INSERT_CNTNTIDX_ENTRY 1342 -#define HID_INSERT_FRAME 1334 -#define HID_INSERT_FRAME_INTERACT 1333 -#define HID_INSERT_SOFT_HYPHEN 1350 -#define HID_INSERT_HARD_SPACE 1351 -#define HID_FORMAT_FRAME_DLG 1456 -#define HID_FRAME_TO_TOP 1470 -#define HID_FRAME_TO_BOTTOM 1471 -#define HID_FRAME_NOWRAP 1472 -#define HID_FRAME_WRAP 1473 -#define HID_FRAME_WRAPTHRU 1474 -#define HID_FRAME_ALIGN_HORZ_LEFT 1475 -#define HID_FRAME_ALIGN_HORZ_RIGHT 1476 -#define HID_FRAME_ALIGN_HORZ_CENTER 1477 -#define HID_FRAME_ALIGN_VERT_TOP 1478 -#define HID_FRAME_ALIGN_VERT_BOTTOM 1479 -#define HID_FRAME_ALIGN_VERT_CENTER 1480 -#define HID_EDIT_FIELD 1104 -#define HID_SET_FIELD_VALUE 1112 -#define HID_INSERT_FIELD 1308 -#define HID_INSERT_MERGEFIELD_DLG 1320 -#define HID_EXECUTE_MACROFIELD 1127 -#define HID_UPDATE_FIELDS 1126 -#define HID_UPDATE_INPUTFIELDS 1143 -#define HID_CALC_TABLE 1129 -#define HID_INSERT_BREAK_DLG 1304 -#define HID_INSERT_BOOKMARK 1302 -#define HID_DELETE_BOOKMARK 1301 -#define HID_INSERT_GRAFIC 1315 -#define HID_FORMAT_TABLE_DLG 1460 -#define HID_INSERT_TABLE 1330 -#define HID_INSERT_COLS 1332 -#define HID_PAGE_STYLE_SET_COLS 1538 -#define HID_CONVERT_TEXT_TABLE 1500 -#define HID_TABLE_INSERT_ROW 1501 -#define HID_TABLE_INSERT_COL 1502 -#define HID_TABLE_DELETE_ROW 1503 -#define HID_TABLE_DELETE_COL 1504 -#define HID_TABLE_SPLIT_CELLS 1505 -#define HID_TABLE_MERGE_CELLS 1506 -#define HID_TABLE_SET_ROW_HEIGHT 1507 -#define HID_TABLE_SET_COL_WIDTH 1508 -#define HID_TABLE_SET_ULSPACE 1509 -#define HID_TABLE_SET_GRID 1510 -#define HID_TABLE_SET_SHADOW 1511 -#define HID_FORMAT_CHAR_DLG 1441 -#define HID_FORMAT_PAGE_DLG 1452 -#define HID_CHANGE_PAGENUM 1634 -#define HID_FORMAT_PARA_DLG 1443 -#define HID_FORMAT_TAB_DLG 1445 -#define HID_FORMAT_BORDER_DLG 1447 -#define HID_FORMAT_BORDER 1439 -#define HID_FORMAT_SHADOW 1438 -#define HID_FORMAT_BACKGROUND 1448 -#define HID_FORMAT_BACKGROUND_DLG 1450 -#define HID_SET_FRM_SIZE 1481 -#define HID_SET_FRM_POSITION 1482 -#define HID_SET_FRM_ANCHOR 1483 -#define HID_SET_FRM_WRAP 1484 -#define HID_SET_FRM_DIST 1485 -#define HID_SET_FRM_OPTIONS 1486 -#define HID_SET_FRM_MACRO 1494 -#define HID_SET_FRM_COLUMNS 1495 -#define HID_SET_FRM_COLUMN_WIDTH 1496 -#define HID_SET_GRF_MIRROR 1488 -#define HID_SET_TABLE_WIDTH 1489 -#define HID_SET_TABLE_ALIGN 1490 -#define HID_TABLE_SET_READ_ONLY_CELLS 1517 -#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519 -#define HID_NEW_STYLE_BY_EXAMPLE 1462 -#define HID_UPDATE_STYLES_DIRECT 1497 -#define HID_UPDATE_STYLE_BY_EXAMPLE 1463 -#define HID_STYLE_SHEET_FRAME_DLG 1464 -#define HID_STYLE_SHEET_DOC_DLG 1465 -#define HID_SET_STANDARD_FONTS 1442 -#define HID_COPY 1102 -#define HID_PASTE 1113 -#define HID_PASTEUNFORMATTED 1115 -#define HID_PASTESPECIAL 1114 -#define HID_CUT 1103 -#define HID_FLIP_HORZ_GRAFIC 1425 -#define HID_FLIP_VERT_GRAFIC 1426 -#define HID_FORMAT_GRAFIC_DLG 1458 -#define HID_VIEW_BOUNDS 1214 -#define HID_VIEW_FIELDS 1215 -#define HID_VIEW_META_CHARS 1224 -#define HID_VIEW_MARKS 1225 -#define HID_VIEW_FIELDNAME 1226 -#define HID_VIEW_TABLEGRID 1227 -#define HID_SEARCH 1117 -#define HID_REPEAT_SEARCH 1150 -#define HID_REPLACE 1118 -#define HID_GOTO 1111 -#define HID_SETUP_PRINTER_DLG 1015 -#define HID_PRINT_FILE 1010 -#define HID_PRINT_FILE_DEFAULT 1025 -#define HID_FAX 1028 -#define HID_PRINT_FILE_OPTIONS 1011 -#define HID_THESAURUS_DLG 1604 -#define HID_SPELLING_DLG 1601 -#define HID_HYPHENATE_OPT_DLG 1607 -#define HID_MERGE_FILE_DLG 1004 -#define HID_SELECT_DATABASE 1030 -#define HID_DOC_INFO_DLG 1031 -#define HID_MERGE_FILE 1003 -#define HID_MERGE_RECORD 1327 -#define HID_INSERT_RECORD 1326 -#define HID_NUMBERING_OUTLINE_DLG 1612 -#define HID_NUMBER_BULLETS 1121 -#define HID_ZOOM 1231 -#define HID_SORTING 1613 -#define HID_SORTING_DLG 1614 -#define HID_CALCULATE 1615 -#define HID_REFRESH_VIEW 1201 -#define HID_CHAR_LEFT 1901 -#define HID_CHAR_RIGHT 1902 -#define HID_LINE_UP 1903 -#define HID_LINE_DOWN 1904 -#define HID_START_OF_LINE 1905 -#define HID_END_OF_LINE 1906 -#define HID_START_OF_DOCUMENT 1907 -#define HID_END_OF_DOCUMENT 1908 -#define HID_SELECT_WORD 1943 -#define HID_SELECT_ALL 1119 -#define HID_START_OF_NEXT_PAGE 1909 -#define HID_END_OF_NEXT_PAGE 1910 -#define HID_START_OF_PREV_PAGE 1911 -#define HID_END_OF_PREV_PAGE 1912 -#define HID_START_OF_PAGE 1913 -#define HID_END_OF_PAGE 1914 -#define HID_NEXT_WORD 1921 -#define HID_START_OF_PARA 1919 -#define HID_END_OF_PARA 1920 -#define HID_PREV_WORD 1922 -#define HID_NEXT_SENT 1923 -#define HID_PREV_SENT 1924 -#define HID_SET_INS_MODE 1936 -#define HID_SET_ADD_MODE 1939 -#define HID_SET_EXT_MODE 1940 -#define HID_START_TABLE 1947 -#define HID_END_TABLE 1948 -#define HID_NEXT_TABLE 1949 -#define HID_PREV_TABLE 1950 -#define HID_TABLE_SELECT_ALL 1515 -#define HID_TABLE_SELECT_COL 1514 -#define HID_TABLE_SELECT_ROW 1513 -#define HID_START_OF_COLUMN 1917 -#define HID_END_OF_COLUMN 1918 -#define HID_START_OF_NEXT_COLUMN 1951 -#define HID_END_OF_NEXT_COLUMN 1952 -#define HID_START_OF_PREV_COLUMN 1953 -#define HID_END_OF_PREV_COLUMN 1954 -#define HID_FOOTNOTE_TO_ANCHOR 1955 -#define HID_NEXT_FOOTNOTE 1956 -#define HID_PREV_FOOTNOTE 1957 -#define HID_CNTNT_TO_NEXT_FRAME 1958 -#define HID_FRAME_TO_ANCHOR 1959 -#define HID_TO_HEADER 1960 -#define HID_TO_FOOTER 1961 -#define HID_IDX_MARK_TO_IDX 1962 -#define HID_DELETE 1925 -#define HID_BACKSPACE 1926 -#define HID_DELETE_SENT 1927 -#define HID_DELETE_BACK_SENT 1928 -#define HID_DELETE_WORD 1929 -#define HID_DELETE_BACK_WORD 1930 -#define HID_DELETE_LINE 1931 -#define HID_DELETE_BACK_LINE 1932 -#define HID_DELETE_PARA 1933 -#define HID_DELETE_BACK_PARA 1934 -#define HID_DELETE_WHOLE_LINE 1935 -#define HID_INSERT_BREAK 1303 -#define HID_INSERT_PAGEBREAK 1323 -#define HID_INSERT_LINEBREAK 1318 -#define HID_INSERT_COLUMN_BREAK 1305 -#define HID_INSERT_FOOTNOTE 1311 -#define HID_INSERT_FOOTNOTE_DLG 1312 -#define HID_FORMAT_FOOTNOTE_DLG 1468 -#define HID_UNDO 1120 -#define HID_REDO 1116 -#define HID_REPEAT 1122 -#define HID_REPAGINATE 1161 -#define HID_SHOW_UPDATE_HELP 1805 -#define HID_SHOW_KEYBOARD_HELP 1803 -#define HID_SHOW_HELP_MANUAL 1804 -#define HID_GLOSSARY_DLG 1620 -#define HID_EXPAND_GLOSSARY 1628 -#define HID_INSERT_GLOSSARY 1640 -#define HID_AUTO_CORRECT_DLG 1650 -#define HID_AUTO_CORRECT 1649 -#define HID_CONFIG_DLG 1627 -#define HID_INSERT_STRING 1331 -#define HID_SET_CHAR_STYLE 1491 -#define HID_SET_PARA_STYLE 1492 -#define HID_SET_PAGE_STYLE 1493 -#define HID_SET_LRMARGIN 1429 -#define HID_SET_ULMARGIN 1430 -#define HID_SET_HYPHEN_ZONE 1432 -#define HID_SET_PAGE_BREAK 1433 -#define HID_FORMAT_PAGE 1451 -#define HID_SET_KEEP_TOGETHER 1434 -#define HID_SET_WIDOW 1436 -#define HID_SET_ORPHAN 1437 -#define HID_BUFFER_UPDATE 1124 -#define HID_FORMAT_TAB 1444 -#define HID_IS_END_OF_PARA 2000 -#define HID_IS_END_OF_WORD 2000 -#define HID_IS_END_OF_DOC 2000 -#define HID_IS_START_OF_PARA 2000 -#define HID_IS_START_OF_WORD 2000 -#define HID_IS_START_OF_DOC 2000 -#define HID_EDIT_FORMULA 1128 -#define HID_ENVELOP 2050 -#define HID_LABEL 2051 -#define HID_AGENDA_WIZZARD 1663 -#define HID_MEMO_WIZZARD 1662 -#define HID_FAX_WIZZARD 1661 -#define HID_LETTER_WIZZARD 1660 -#define HID_LAUNCH_REGISTRY 1002 diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx index 330507024f3c..fdc997b58fb4 100644 --- a/sw/source/ui/inc/hyp.hxx +++ b/sw/source/ui/inc/hyp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,12 +41,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; Link aOldLnk; - LanguageType nLangError; // nicht vorhandene Sprache - sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige - sal_uInt16 nPageStart; // 1. gepruefte Seite - sal_Bool bInSelection : 1; // Trennen von selektiertem Text - sal_Bool bShowError : 1; // nicht vorhandene Sprache melden - sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen + LanguageType nLangError; // non existing language + sal_uInt16 nPageCount; // page count for progress view + sal_uInt16 nPageStart; // 1st checked page + sal_Bool bInSelection : 1; // seperating selected text + sal_Bool bShowError : 1; // report non existing language + sal_Bool bAutomatic : 1; // insert seperators without further inquiry sal_Bool bInfoBox : 1; // display info-box when ending DECL_LINK( SpellError, LanguageType * ); @@ -54,7 +55,7 @@ protected: virtual sal_Bool SpellContinue(); virtual void SpellEnd( ); virtual sal_Bool SpellMore(); - virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen + virtual void InsertHyphen( const sal_uInt16 nPos ); // insert hyphen public: SwHyphWrapper( SwView* pVw, @@ -65,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx index 6d569bb798dd..22e71dbc6168 100644 --- a/sw/source/ui/inc/idxmrk.hxx +++ b/sw/source/ui/inc/idxmrk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,6 @@ class SwWrtShell; -/* -----------------07.09.99 08:02------------------- - - --------------------------------------------------*/ class SwInsertIdxMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; @@ -51,9 +49,6 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -/* -----------------07.09.99 08:02------------------- - - --------------------------------------------------*/ class SwInsertAuthMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; @@ -71,3 +66,4 @@ public: #endif // _IDXMRK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 9cb7d11f2684..f12fbc1f3256 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; #endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 6c5b5b694445..77b44131c2be 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,7 +62,7 @@ extern SvStringsDtor* pDBNameList; extern SvStringsDtor* pAuthFieldNameList; extern SvStringsDtor* pAuthFieldTypeList; -// stellt die Textbausteinverwaltung zur Verfuegung +// provides textblock management class SwGlossaries; SW_DLLPUBLIC SwGlossaries* GetGlossaries(); @@ -77,3 +78,5 @@ extern void _FinitSpell(); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index f2ed1b22f0d4..4a99f955c583 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ #include <svx/stddlg.hxx> -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwInputField; class SwSetExpField; @@ -44,7 +41,7 @@ class SwField; class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Einfuegen Felder + Description: insert fields --------------------------------------------------------------------*/ class SwFldInputDlg: public SvxStandardDialog @@ -76,3 +73,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 2f9aaa669205..0c9b185bf1ca 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,8 +69,8 @@ friend class InputEdit; String aAktTableName, sOldFml; sal_Int32 m_nActionCount; - sal_Bool bFirst : 1; //Initialisierungen beim ersten Aufruf - sal_Bool bActive : 1; //fuer Hide/Show beim Dokumentwechsel + sal_Bool bFirst : 1; // initialisations at first call + sal_Bool bActive : 1; // for hide/show when switching documents sal_Bool bIsTable : 1; sal_Bool bDelSel : 1; bool m_bDoesUndo : 1; @@ -131,3 +132,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index e9483eea02c3..385bdda08352 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/fixed.hxx> class SwWrtShell; @@ -44,7 +41,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog { SwWrtShell &rSh; - //Alles fuer das/die Zeichen + // everything for the character(s) String aFontName; CharSet eCharSet; char cExtChar; @@ -56,7 +53,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog Edit aNumberCharEdit; PushButton aNumberExtChar; - //Alles fuer die Auswahl Fussnote/Endnote + // everything for the selection footnote/endnote FixedLine aTypeFL; RadioButton aFtnBtn; RadioButton aEndNoteBtn; @@ -95,3 +92,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index fff497ca2c0e..ea4d0cc08268 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,13 +27,14 @@ ************************************************************************/ #ifndef _INSRULE_HXX #define _INSRULE_HXX + +#include <vector> + #include "num.hxx" class SwRulerValueSet; class ValueSet; -/*-----------------14.02.97 12.30------------------- ---------------------------------------------------*/ class SwInsertGrfRulerDlg : public SfxModalDialog { FixedLine aSelectionFL; @@ -40,7 +42,7 @@ class SwInsertGrfRulerDlg : public SfxModalDialog CancelButton aCancelPB; HelpButton aHelpPB; - List aGrfNames; + std::vector<String> aGrfNames; String sSimple; String sRulers; sal_uInt16 nSelPos; @@ -57,10 +59,11 @@ public: String GetGraphicName(); sal_Bool IsSimpleLine() {return nSelPos == 1;} - sal_Bool HasImages() const {return 0 != aGrfNames.Count();} + sal_Bool HasImages() const {return !aGrfNames.empty();} }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 24e54e4c0f86..9f222c918176 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,18 +28,10 @@ #ifndef _INSTABLE_HXX #define _INSTABLE_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <sfx2/basedlgs.hxx> #include <actctrl.hxx> #include <textcontrolcombo.hxx> @@ -98,3 +91,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index d78e77597d4d..767d05a7028c 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,21 +32,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; class SwFldMgr; @@ -116,3 +109,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 46bf210bd8da..8a23e1e845ce 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ inline void SwLabDlg::ReplaceGroup( const String &rMake ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx index ab01d365bbe1..34b5e0786d8e 100644 --- a/sw/source/ui/inc/labelcfg.hxx +++ b/sw/source/ui/inc/labelcfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx index cb435bd38925..6733e4024383 100644 --- a/sw/source/ui/inc/labimg.hxx +++ b/sw/source/ui/inc/labimg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ #include "swdllapi.h" // class SwLabItem ---------------------------------------------------------- - class SwLabCfgItem; + class SW_DLLPUBLIC SwLabItem : public SfxPoolItem { @@ -49,28 +50,28 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - rtl::OUString aLstMake; //Letzte Auswahl merken. + rtl::OUString aLstMake; // remember last selection rtl::OUString aLstType; - rtl::OUString sDBName; // Verwendete Datenbank - - rtl::OUString aWriting; // Aufschrift - rtl::OUString aMake; // Etikettenmarke - rtl::OUString aType; // Etikettentyp - rtl::OUString aBin; // Druckerschacht - sal_Int32 lHDist; // Horizontaler Abstand (Benutzer) - sal_Int32 lVDist; // Vertikaler Abstand (Benutzer) - sal_Int32 lWidth; // Breite (Benutzer) - sal_Int32 lHeight; // Hoehe (Benutzer) - sal_Int32 lLeft; // Rand links (Benutzer) - sal_Int32 lUpper; // Rand oben (Benutzer) - sal_Int32 nCols; // Anzahl Spalten (Benutzer) - sal_Int32 nRows; // Anzahl Zeilen (Benutzer) - sal_Int32 nCol; // Spalte fuer Einzeldruck - sal_Int32 nRow; // Zeile fuer Einzeldruck - sal_Bool bAddr;// Adresse als Aufschrift? - sal_Bool bCont;// Endlospapier? - sal_Bool bPage;// Ganze Seite oder einzelnes Etikett? - sal_Bool bSynchron;// Alle Etiketten synchronisieren + rtl::OUString sDBName; // used database + + rtl::OUString aWriting; // label + rtl::OUString aMake; // label mark + rtl::OUString aType; // label type + rtl::OUString aBin; // printer shaft + sal_Int32 lHDist; // horizontal distance (user) + sal_Int32 lVDist; // vertical distance (user) + sal_Int32 lWidth; // width (user) + sal_Int32 lHeight; // height (user) + sal_Int32 lLeft; // left border (user) + sal_Int32 lUpper; // upper border (user) + sal_Int32 nCols; // number of columns (user) + sal_Int32 nRows; // number of rows (user) + sal_Int32 nCol; // column for single print + sal_Int32 nRow; // row for single print + sal_Bool bAddr;// adress as label? + sal_Bool bCont;// continuous paper? + sal_Bool bPage;// whole page or single labels? + sal_Bool bSynchron;// synchronise all labels //parts of the business card rtl::OUString aPrivFirstName; @@ -111,7 +112,6 @@ public: }; // class SwLabCfgItem ------------------------------------------------------- - class SwLabCfgItem : public utl::ConfigItem { SwLabItem aItem; @@ -129,3 +129,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx index 213092062a00..90a8503cea6f 100755..100644 --- a/sw/source/ui/inc/langhelper.hxx +++ b/sw/source/ui/inc/langhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ namespace SwLangHelper } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index 8d727b771750..270241a2f6bd 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <vcl/field.hxx> #include <numberingtypelistbox.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class Window; class SfxItemSet; @@ -43,9 +42,8 @@ class SwView; class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: SingleTabDialog + Description: SingleTabDialog --------------------------------------------------------------------*/ - class SwLineNumberingDlg : public SfxSingleTabDialog { SwWrtShell* pSh; @@ -60,9 +58,8 @@ public: }; /*-------------------------------------------------------------------- - Beschreibung: TabPage + Description: TabPage --------------------------------------------------------------------*/ - class SwLineNumberingPage : public SfxTabPage { CheckBox aNumberingOnCB; @@ -107,4 +104,4 @@ public: #endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/ui/inc/listsh.hxx index 61fea6ece214..30a97c04c0f2 100644 --- a/sw/source/ui/inc/listsh.hxx +++ b/sw/source/ui/inc/listsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx index ac8be8d2dd87..291129d20ada 100644 --- a/sw/source/ui/inc/macassgn.hxx +++ b/sw/source/ui/inc/macassgn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ class SvxMacroItem; enum DlgEventType { - MACASSGN_TEXTBAUST, + MACASSGN_AUTOTEXT, MACASSGN_GRAPHIC, MACASSGN_OLE, MACASSGN_FRMURL, @@ -52,3 +53,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index cf0022b378c8..4c01efb74a90 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,25 +29,15 @@ #define _MAILCONFIGPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SwTestAccountSettingsDialog; class SwMailMergeConfigItem; -/*-- 05.05.2004 16:45:45--------------------------------------------------- - -----------------------------------------------------------------------*/ class SwMailConfigPage : public SfxTabPage { friend class SwTestAccountSettingsDialog; @@ -95,9 +86,6 @@ public: }; -/*-- 18.08.2004 12:02:02--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SwMailConfigDlg : public SfxSingleTabDialog { public: @@ -108,3 +96,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx index bc8afb829fdf..ad5521d3814a 100644 --- a/sw/source/ui/inc/maildispatcher.hxx +++ b/sw/source/ui/inc/maildispatcher.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,6 @@ #ifndef INCLUDED_MAILDISPATCHER_HXX #define INCLUDED_MAILDISPATCHER_HXX -//#ifndef _COM_SUN_STAR_MAIL_XMAILSERVER_HPP_ -//#include "com/sun/star/mail/XMailServer.hpp" -//#endif #include "com/sun/star/mail/XSmtpService.hpp" #include "com/sun/star/mail/XMailMessage.hpp" #include <osl/thread.hxx> @@ -166,3 +164,5 @@ private: }; #endif // INCLUDED_MAILDISPATCHER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx index fb4f529f10cf..a02ca949180c 100644 --- a/sw/source/ui/inc/mailmergechildwindow.hxx +++ b/sw/source/ui/inc/mailmergechildwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,6 @@ #include <vcl/toolbox.hxx> #include "swdllapi.h" -/*-- 25.05.2004 15:25:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SwMailMergeChildWin : public SfxFloatingWindow { ToolBox m_aBackTB; @@ -47,10 +45,8 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; }; -/*-- 25.05.2004 15:25:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SwSendMailDialog; + class SwMailMergeChildWindow : public SfxChildWindow { public: @@ -64,3 +60,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index 954ce643d8e9..a38ef5eef0ca 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,8 +43,8 @@ #include <vcl/scrbar.hxx> #include "swdllapi.h" - class SwMailMergeConfigItem; + namespace com{ namespace sun{ namespace star{ namespace uno{ class XComponentContext; @@ -56,9 +57,7 @@ namespace com{ namespace sun{ namespace star{ class XMailService; } }}} -/*-- 14.06.2004 12:27:42--------------------------------------------------- - -----------------------------------------------------------------------*/ namespace SwMailMergeHelper { SW_DLLPUBLIC String CallSaveAsDialog(String& rFilter); @@ -70,9 +69,7 @@ namespace SwMailMergeHelper const String& rOutMailServerPassword, Window* pDialogParentWindow = 0 ); } -/* -----------------06.04.2004 10:29----------------- - --------------------------------------------------*/ class SW_DLLPUBLIC SwBoldFixedInfo : public FixedInfo { public: @@ -86,7 +83,7 @@ namespace com{namespace sun{namespace star{ } }}} -/*-- 27.04.2004 13:20:00--------------------------------------------------- +/*------------------------------------------------------------------------- Preview window used to show the possible selection of address blocks and also the resulting address filled with database data -----------------------------------------------------------------------*/ @@ -142,7 +139,7 @@ public: void SetSelectHdl (const Link& rLink) {m_aSelectHdl = rLink;} }; -/*-- 11.05.2004 15:39:59--------------------------------------------------- +/*------------------------------------------------------------------------- iterate over an address block or a greeting line the iterator returns the parts either as pure string or as column @@ -156,6 +153,7 @@ struct SwMergeAddressItem bIsColumn(false), bIsReturn(false) {} }; + class SW_DLLPUBLIC SwAddressIterator { String sAddress; @@ -167,9 +165,6 @@ public: bool HasMore() const{return sAddress.Len() > 0;} }; -/*-- 21.05.2004 10:31:15--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SW_DLLPUBLIC SwAuthenticator : public cppu::WeakImplHelper1< ::com::sun::star::mail::XAuthenticator> { @@ -189,9 +184,7 @@ public: virtual ::rtl::OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException); }; -/*-- 25.08.2004 12:48:47--------------------------------------------------- - -----------------------------------------------------------------------*/ class SW_DLLPUBLIC SwConnectionContext : public cppu::WeakImplHelper1< ::com::sun::star::uno::XCurrentContext > { @@ -206,17 +199,13 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; -/*-- 21.05.2004 10:39:20--------------------------------------------------- - -----------------------------------------------------------------------*/ class SwMutexBase { public: osl::Mutex m_aMutex; }; -/*-- 21.05.2004 10:39:20--------------------------------------------------- - -----------------------------------------------------------------------*/ class SW_DLLPUBLIC SwConnectionListener : public SwMutexBase, public cppu::WeakComponentImplHelper1< ::com::sun::star::mail::XConnectionListener > @@ -239,9 +228,6 @@ public: throw(com::sun::star::uno::RuntimeException); }; -/*-- 13.07.2004 09:02:12--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SwMailTransferable : public SwMutexBase, public cppu::WeakComponentImplHelper2 @@ -281,9 +267,6 @@ class SwMailTransferable : }; -/*-- 22.06.2004 16:38:34--------------------------------------------------- - - -----------------------------------------------------------------------*/ class SwMailMessage : public SwMutexBase, public cppu::WeakComponentImplHelper1< ::com::sun::star::mail::XMailMessage > @@ -305,7 +288,7 @@ public: SwMailMessage(); ~SwMailMessage(); - // Attributes + // attributes virtual ::rtl::OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException); @@ -319,7 +302,7 @@ public: virtual void SAL_CALL setBody( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _body ) throw (::com::sun::star::uno::RuntimeException); - // Methods + // methods virtual void SAL_CALL addRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addCcRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addBccRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); @@ -338,12 +321,11 @@ public: void SetSenderAddress(const ::rtl::OUString& rSenderAddress) {m_sSenderAddress = rSenderAddress;} }; -/*-- 21.05.2004 10:17:22--------------------------------------------------- - -----------------------------------------------------------------------*/ SW_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> getCurrentCmpCtx( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> rSrvMgr); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index 7a582693b013..ea413b445b13 100644 --- a/sw/source/ui/inc/mailmergewizard.hxx +++ b/sw/source/ui/inc/mailmergewizard.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index c541832462ec..fd0fb2e0787b 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,25 +30,15 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> @@ -167,9 +158,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; }; -/* -----------------27.11.2002 12:05----------------- - * - * --------------------------------------------------*/ + class SwMailMergeCreateFromDlg : public ModalDialog { FixedLine aCreateFromFL; @@ -185,9 +174,7 @@ public: sal_Bool IsThisDocument() const {return aThisDocRB.IsChecked();} }; -/* -----------------04.02.2003 13:41----------------- - * - * --------------------------------------------------*/ + class SwMailMergeFieldConnectionsDlg : public ModalDialog { FixedLine aConnectionsFL; @@ -208,3 +195,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/ui/inc/mediash.hxx index 035c03656119..d01dc6692d96 100644 --- a/sw/source/ui/inc/mediash.hxx +++ b/sw/source/ui/inc/mediash.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 239f776ee938..8923a2a1c2f3 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,13 +28,9 @@ #ifndef _MERGETBL_HXX #define _MERGETBL_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/stddlg.hxx> @@ -57,3 +54,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index f7c7cfcde9a0..39f33d39d677 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.hrc @@ -96,6 +96,7 @@ #define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) #define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62) #define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) +#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64) #define MISC_ACT_END STRRES_NUMTYPES diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index e647e934792d..4ac5eab0da00 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,18 +45,17 @@ namespace com{namespace sun{namespace star{ class XColumnsSupplier; } }}} + class SwMailMergeConfigItem_Impl; class SwView; -/*-- 06.04.2004 10:43:35--------------------------------------------------- - - -----------------------------------------------------------------------*/ struct SwDocMergeInfo { long nStartPageInTarget; long nEndPageInTarget; long nDBRow; }; + class SW_DLLPUBLIC SwMailMergeConfigItem { // com::sun::star::uno::Sequence< ::rtl::OUString> m_aSavedDocuments; @@ -275,5 +275,7 @@ public: //helper methods ::rtl::OUString GetAssignedColumn(sal_uInt32 nColumn)const; }; + #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index e56da31afc47..3df0d7070fe2 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,25 +31,15 @@ #include <svx/stddlg.hxx> - -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> - -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#include <vcl/fixed.hxx> - -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwTOXMgr; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Description: insert mark for index entry --------------------------------------------------------------------*/ class SwMultiTOXMarkDlg : public SvxStandardDialog @@ -75,3 +66,4 @@ public: #endif // _MULTMRK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index de400eca916e..a3666dc4e624 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _NAVICFG_HXX #include <unotools/configitem.hxx> -/* -----------------------------08.09.00 16:27-------------------------------- - ---------------------------------------------------------------------------*/ class SwNavigationConfig : public utl::ConfigItem { sal_Int32 nRootType; //RootType @@ -39,7 +38,7 @@ class SwNavigationConfig : public utl::ConfigItem sal_Int32 nRegionMode; //InsertMode sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState sal_Bool bIsSmall; //ShowListBox - sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig? + sal_Bool bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid? com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); @@ -115,5 +114,7 @@ public: } } }; + #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index d1f0a70272aa..ba7d50057525 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,16 +35,16 @@ class SwDocShell; class TransferDataContainer; class TransferableDataHelper; -/* [Beschreibung] - Navigator-Bookmark zur eindeutigen Identifizierung im Sw +/* + navigator bookmark for distinct identification in Sw */ class NaviContentBookmark { - String aUrl; // URL inkl. Sprungmarke - String aDescr; // Description - long nDocSh; // Adresse der DocShell - sal_uInt16 nDefDrag; // Description enthaelt defaultDragType + String aUrl; // URL including jump mark + String aDescr; // description + long nDocSh; // adress of DocShell + sal_uInt16 nDefDrag; // description contains defaultDragType public: NaviContentBookmark(); @@ -59,3 +60,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 36dcbd7fa2e3..97a8c4b6312f 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <sfx2/childwin.hxx> @@ -49,9 +48,8 @@ class SwView; class SwNavigationConfig; class SfxObjectShellLock; class SfxChildWindowContext; - -//----------------------------------------------------------------------- class SwNavigationPI; + class SwNavHelpToolBox : public SwHelpToolBox { virtual void MouseButtonDown(const MouseEvent &rEvt); @@ -60,7 +58,6 @@ class SwNavHelpToolBox : public SwHelpToolBox SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; - // CLASS ----------------------------------------------------------------- class SwNavigationPI : public Window, public SfxControllerItem, public SfxListener @@ -73,7 +70,6 @@ class SwNavigationPI : public Window, SwNavHelpToolBox aContentToolBox; SwHelpToolBox aGlobalToolBox; ImageList aContentImageList; - ImageList aContentImageListH; SwContentTree aContentTree; SwGlobalTree aGlobalTree; ListBox aDocListBox; @@ -81,7 +77,7 @@ class SwNavigationPI : public Window, String sContentFileName; String aContextArr[3]; String aStatusArr[4]; - Point aBoxBottomLeft; // Pos., wenn Box unten ist + Point aBoxBottomLeft; // Pos when Box is at bottom SfxObjectShellLock *pxObjectShell; SwView *pContentView; @@ -99,7 +95,7 @@ class SwNavigationPI : public Window, long nDocLBIniHeight; long nWishWidth; sal_uInt16 nAutoMarkIdx; - sal_uInt16 nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link + sal_uInt16 nRegionMode; // 0 - URL, 1 - region with link 2 - region without link short nZoomIn; short nZoomOutInit; short nZoomOut; @@ -147,7 +143,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // zum App-Ende rechtzeitig ObjectShellLock loslassen + // release ObjectShellLock early enough for app end virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); NumEditAction& GetPageEdit(); @@ -159,7 +155,7 @@ public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*); ~SwNavigationPI(); - void GotoPage(); // Seite anspringen; bindbare Funktion + void GotoPage(); // jump to page; bindable function void Update() { FillBox(); } void UpdateListBox(); @@ -196,3 +192,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx new file mode 100644 index 000000000000..2a86172e6c1b --- /dev/null +++ b/sw/source/ui/inc/navmgr.hxx @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * [ Maja Djordjevic < ovcica@gmail.com > ] + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Cédric Bosdonnat <cbosdonnat@novell.com> + * Caolan McNamara <caolanm@redhat.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ +#ifndef _NAVMGR_HXX +#define _NAVMGR_HXX + +#include "swtypes.hxx" +#include "pam.hxx" +#include "swdllapi.h" + +class SwWrtShell; +struct SwPosition; + +class SW_DLLPUBLIC SwNavigationMgr +{ +private: + /* + * List of entries in the navigation history + * Each entry is a SwPosition, which represents a position within the document + * SwPosition is given by a node index (SwNodeIndex) which usually represents the paragraph the position is in + * and an index (SwIndex), which represents the position inside this paragraph. + * You can find more on SwPositions at http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout + * + * The navigation history behaves as a stack, to which items are added when we jump to a new position + * (e.g. click a link, or double click an entry from the navigator). + * Every use of the back/forward buttons results in moving the stack pointer within the navigation history + */ + std::vector<SwPosition> _entries; + std::vector<SwPosition>::size_type _nCurrent; /* Current position within the navigation history */ + SwWrtShell* _pMyShell; /* The active shell within which the navigation occurs */ + + void GotoSwPosition(const SwPosition &rPos); + +public: + /* Constructor that initializes the shell to the current shell */ + SwNavigationMgr( SwWrtShell* pShell ); + /* Can we go back in the history ? */ + sal_Bool backEnabled() ; + /* Can we go forward in the history ? */ + sal_Bool forwardEnabled(); + /* The method that is called when we click the back button */ + void goBack() ; + /* The method that is called when we click the forward button */ + void goForward() ; + /* The method that adds the position pPos to the navigation history */ + bool addEntry(const SwPosition& rPos); +}; +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navsh.hxx b/sw/source/ui/inc/navsh.hxx new file mode 100644 index 000000000000..7c12ddc3b1cb --- /dev/null +++ b/sw/source/ui/inc/navsh.hxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * [ Maja Djordjevic < ovcica@gmail.com > ] + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Cédric Bosdonnat <cbosdonnat@novell.com> + * Caolan McNamara <caolanm@redhat.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ +#ifndef _SWNAVIGATIONSH_HXX +#define _SWNAVIGATIONSH_HXX + +#include "frmsh.hxx" + +class SfxItemSet; +class SwWrtShell; + + + +class SwNavigationShell: public SwBaseShell +{ +public: + SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL) + + SwNavigationShell(SwView &rView); + + void GetState(SfxItemSet &); + void Execute(SfxRequest &); +}; + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index c999bf25eb93..a9c8eb901201 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,25 +30,13 @@ #include <sfx2/tabdlg.hxx> -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> #include <numprevw.hxx> #include "numrule.hxx" @@ -56,36 +45,23 @@ class SwWrtShell; class SvxBrushItem; class SwOutlineTabDialog; - -/*-----------------13.02.97 14.02------------------- - ---------------------------------------------------*/ - struct SwBmpItemInfo { SvxBrushItem* pBrushItem; sal_uInt16 nItemId; }; - -/*-----------------07.02.97 15.37------------------- - ---------------------------------------------------*/ #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 #define PAGETYPE_USER_START 10 -/*-----------------03.12.97 10:18------------------- - ---------------------------------------------------*/ class SwNumPositionTabPage : public SfxTabPage { FixedLine aLevelFL; MultiListBox aLevelLB; - // --> OD 2008-02-01 #newlistlevelattrs# // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION FixedLine aPositionFL; @@ -98,9 +74,7 @@ class SwNumPositionTabPage : public SfxTabPage MetricField aDistNumMF; FixedText aAlignFT; ListBox aAlignLB; - // <-- - // --> OD 2008-02-01 #newlistlevelattrs# // new set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT FixedText aLabelFollowedByFT; @@ -113,7 +87,6 @@ class SwNumPositionTabPage : public SfxTabPage MetricField aAlignedAtMF; FixedText aIndentAtFT; MetricField aIndentAtMF; - // <-- PushButton aStandardPB; @@ -128,10 +101,8 @@ class SwNumPositionTabPage : public SfxTabPage sal_Bool bModified : 1; sal_Bool bPreset : 1; - sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein - // --> OD 2008-02-01 #newlistlevelattrs# + sal_Bool bInInintControl : 1; // work around modify-error; should be resolved from 391 on bool bLabelAlignmentPosAndSpaceModeActive; - // <-- void InitControls(); @@ -141,7 +112,6 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK( RelativeHdl, CheckBox * ); DECL_LINK( StandardHdl, PushButton * ); - // --> OD 2008-02-01 #newlistlevelattrs# void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); @@ -149,7 +119,6 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK( ListtabPosHdl_Impl, MetricField* ); DECL_LINK( AlignAtHdl_Impl, MetricField* ); DECL_LINK( IndentAtHdl_Impl, MetricField* ); - // <-- using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -203,3 +172,4 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog }; #endif // _NUM_CXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index eaf35c349417..747328dd1378 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index d21380f30358..e19d7206535e 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 6fb8fe446154..a173de881c1d 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,14 +33,12 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /* --- class SwParagraphNumTabPage ---------------------------------------- - Mit dieser TabPage werden Numerierungseinstellungen am Absatz bzw. der - Absatzvorlage vorgenommen. + with this TabPage numbering settings at the paragraph / paragraph style + are performed. ---------------------------------------------------------------------------*/ class SwParagraphNumTabPage : public SfxTabPage @@ -64,7 +63,6 @@ class SwParagraphNumTabPage : public SfxTabPage // --> OD 2008-04-14 #outlinelevel# const String msOutlineNumbering; - // <-- sal_Bool bModified : 1; sal_Bool bCurNumrule : 1; @@ -96,3 +94,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index 5324fa8189db..e40e49b41347 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,6 @@ #include <vcl/window.hxx> class SwNumRule; -/*-----------------02.12.97 10:31------------------- - ---------------------------------------------------*/ class NumberingPreview : public Window { @@ -69,3 +67,4 @@ class NumberingPreview : public Window #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index 32a413300f36..c4c220b795e0 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index 270c8d8e458c..bc2c7a1e8973 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index ae9de51f1ba8..b9e95f5722bf 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,6 @@ #include <svx/checklbx.hxx> // class SwCompatibilityOptPage ------------------------------------------ - class SwWrtShell; struct SwCompatibilityOptPage_Impl; @@ -85,3 +85,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index d883a63060c1..1c5d0bd4d5b0 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> @@ -45,10 +44,6 @@ class SwFldMgr; class SvLBoxEntry; class SwWrtShell; -/*-----------------31.08.96 10.09------------------- - ---------------------------------------------------*/ - class SwLoadOptPage : public SfxTabPage { private: @@ -68,6 +63,7 @@ private: FixedText aTabFT; MetricField aTabMF; CheckBox aUseSquaredPageMode; + CheckBox aUseCharUnit; SwWrtShell* pWrtShell; sal_Bool bHTMLMode; @@ -88,18 +84,12 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ class SwCaptionOptDlg : public SfxSingleTabDialog { public: SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet); ~SwCaptionOptDlg(); }; -/* -----------------23.10.98 13:19------------------- - * - * --------------------------------------------------*/ class CaptionComboBox : public SwComboBox { @@ -112,10 +102,6 @@ public: {} }; -/*-----------------31.08.96 10.09------------------- - ---------------------------------------------------*/ - class SwCaptionPreview : public Window { private: @@ -210,4 +196,4 @@ public: #endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 4ee11b8757c6..2279161b5841 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,25 +29,15 @@ #define _OPTPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svx/fntctrl.hxx> #include <fontcfg.hxx> @@ -56,10 +47,6 @@ class SwStdFontConfig; class SwWrtShell; class FontList; -/*-----------------31.08.96 10.09------------------- - ---------------------------------------------------*/ - class SwContentOptPage : public SfxTabPage { //visual aids @@ -107,11 +94,9 @@ public: }; -/*-------- OS 27.01.95 ----------------------------------- - TabPage Druckereinstellungen Zusaetze +/*-------------------------------------------------------- + TabPage printer settings additions --------------------------------------------------------- */ - - class SwAddPrinterTabPage : public SfxTabPage { FixedLine aFL1; @@ -172,10 +157,6 @@ public: }; -/*-----------------03.09.96 11.50------------------- - ---------------------------------------------------*/ - class SwStdFontTabPage : public SfxTabPage { FixedLine aStdChrFL ; @@ -218,7 +199,7 @@ class SwStdFontTabPage : public SfxTabPage SwStdFontConfig* pFontConfig; SwWrtShell* pWrtShell; LanguageType eLanguage; - // waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben + // only defaults were there? they were signed with the boxes sal_Bool bListDefault :1; sal_Bool bSetListDefault :1; sal_Bool bLabelDefault :1; @@ -260,10 +241,6 @@ public: virtual void PageCreated (SfxAllItemSet aSet); }; -/*-----------------18.01.97 12.10------------------- - ---------------------------------------------------*/ - class SwTableOptionsTabPage : public SfxTabPage { FixedLine aTableFL; @@ -322,8 +299,9 @@ public: virtual void PageCreated (SfxAllItemSet aSet); }; -/*-----------------31.10.97 17:55------------------- - TabPage fuer ShadowCrsr + +/*-------------------------------------------------- + TabPage for ShadowCrsr --------------------------------------------------*/ class SwShdwCrsrOptionsTabPage : public SfxTabPage { @@ -374,9 +352,8 @@ public: }; /*----------------------------------------------------------------------- - Beschreibung: Markierungsvorschau + Description: mark preview -----------------------------------------------------------------------*/ - class SwMarkPreview : public Window { Color m_aBgCol; // background @@ -412,9 +389,8 @@ public: }; /*----------------------------------------------------------------------- - Beschreibung: Redlining-Optionen + Description: redlining options -----------------------------------------------------------------------*/ - class SwRedlineOptionsTabPage : public SfxTabPage { FixedLine aInsertFL; @@ -468,11 +444,11 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -/*--------OS 11.01.95 ----------------------------------- - TabPage Testeinstellungen fuer SW +/*------------------------------------------------------- + TabPage test settings for SW --------------------------------------------------------- */ -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 class SwTestTabPage : public SfxTabPage { @@ -506,4 +482,6 @@ private: }; #endif //PRODUCT + #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index f626de0c0fa3..22bc4f14a26b 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,28 +33,18 @@ #include <vcl/menu.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#include "swtypes.hxx" //fuer MAXLEVEL +#include "swtypes.hxx" //for MAXLEVEL #include <numprevw.hxx> #include <numberingtypelistbox.hxx> @@ -61,9 +52,6 @@ class SwWrtShell; class SwNumRule; class SwChapterNumRules; -/* -----------------07.07.98 13:38------------------- - * - * --------------------------------------------------*/ class SwOutlineTabDialog : public SfxTabDialog { static sal_uInt16 nNumLevel; @@ -99,9 +87,7 @@ class SwOutlineTabDialog : public SfxTabDialog static sal_uInt16 GetActNumLevel() {return nNumLevel;} static void SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;} }; -/* -----------------07.07.98 13:47------------------- - * - * --------------------------------------------------*/ + class SwOutlineSettingsTabPage : public SfxTabPage { FixedLine aLevelFL; @@ -163,4 +149,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/ui/inc/pardlg.hxx index 3946300dc248..2bb0be8dc5fe 100644 --- a/sw/source/ui/inc/pardlg.hxx +++ b/sw/source/ui/inc/pardlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ class SfxItemSet; #define DLG_ENVELOP 2 #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/ui/inc/pattern.hxx index 2ee7cb079afd..d8bfd1a5e179 100644 --- a/sw/source/ui/inc/pattern.hxx +++ b/sw/source/ui/inc/pattern.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index 5f8c147bf374..319782255c70 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,23 +30,16 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- - Beschreibung: Fussnoteneinstellungs-TabPage + Description: footnote settings TabPage --------------------------------------------------------------------*/ - class SwFootNotePage: public SfxTabPage { public: @@ -73,12 +67,18 @@ private: LineListBox aLineTypeBox; FixedText aLineWidthLbl; MetricField aLineWidthEdit; + FixedText aLineColorLbl; + ColorListBox aLineColorBox; + FixedText aLineLengthLbl; + MetricField aLineLengthEdit; FixedText aLineDistLbl; MetricField aLineDistEdit; DECL_LINK( HeightPage, Button * ); DECL_LINK( HeightMetric, Button * ); DECL_LINK( HeightModify, MetricField * ); + DECL_LINK( LineWidthChanged_Impl, void * ); + DECL_LINK( LineColorSelected_Impl, void * ); long lMaxHeight; @@ -91,3 +91,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 165f77be8302..974b48690465 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,17 +30,13 @@ #include <sfx2/tabdlg.hxx> #include <colex.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> + /*-------------------------------------------------------------------- Description: TabPage Format/(Styles/)Page/Text grid --------------------------------------------------------------------*/ - class SwTextGridPage: public SfxTabPage { FixedLine aGridTypeFL; @@ -54,12 +51,14 @@ class SwTextGridPage: public SfxTabPage FixedText aLinesPerPageFT; NumericField aLinesPerPageNF; + FixedText aLinesRangeFT; FixedText aTextSizeFT; MetricField aTextSizeMF; FixedText aCharsPerLineFT; NumericField aCharsPerLineNF; + FixedText aCharsRangeFT; FixedText aCharWidthFT; MetricField aCharWidthMF; @@ -76,19 +75,22 @@ class SwTextGridPage: public SfxTabPage FixedText aColorFT; ColorListBox aColorLB; - Window* aControls[18]; + Window* aControls[20]; sal_Int32 m_nRubyUserValue; sal_Bool m_bRubyUserValue; Size m_aPageSize; sal_Bool m_bVertical; sal_Bool m_bSquaredMode; + sal_Bool m_bHRulerChanged; + sal_Bool m_bVRulerChanged; SwTextGridPage(Window *pParent, const SfxItemSet &rSet); ~SwTextGridPage(); void UpdatePageSize(const SfxItemSet& rSet); void PutGridItem(SfxItemSet& rSet); + void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); DECL_LINK(GridTypeHdl, RadioButton*); DECL_LINK(CharorLineChangedHdl, SpinField*); @@ -111,3 +113,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index bc9fa1855287..2df2b6cc894a 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _POPBOX_HXX -#ifndef _TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif #include <svtools/transfer.hxx> class SwNavigationPI; @@ -38,7 +37,7 @@ class SwNavigationPI; class SwHelpToolBox: public ToolBox, public DropTargetHelper { Link aDoubleClickLink; - Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!! + Link aRightClickLink; // link gets mouse event as parameter !!! using ToolBox::DoubleClick; @@ -65,3 +64,5 @@ inline void SwHelpToolBox::SetRightClickLink(const Link &rLink) { #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index e36d330f22b5..d9e3e2b77cc3 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,14 +28,12 @@ #ifndef _PRCNTFLD_HXX #define _PRCNTFLD_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" class SW_DLLPUBLIC PercentField : public MetricField { - sal_Int64 nRefValue; // 100%-Wert fuer Umrechnung (in Twips) + sal_Int64 nRefValue; // 100% value for conversion (in Twips) sal_Int64 nOldMax; sal_Int64 nOldMin; sal_Int64 nOldSpinSize; @@ -97,3 +96,4 @@ public: #endif // _PRCNTFLD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 35146bcc1ae0..e9902fbfd339 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ public: SwPagePreViewWin( Window* pParent, SwPagePreView& rView ); ~SwPagePreViewWin(); - //Ruft ViewShell::Paint + // calls ViewShell::Paint virtual void Paint( const Rectangle& rRect ); virtual void KeyInput( const KeyEvent & ); virtual void Command( const CommandEvent& rCEvt ); @@ -170,15 +171,13 @@ public: CreateAccessible(); }; - /*-------------------------------------------------------------------- - Beschreibung: Sicht auf ein Dokument + Description: view of a document --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwPagePreView: public SfxViewShell { - // ViewWindow und Henkel zur Core - // aktuelle Dispatcher-Shell + // ViewWindow and handle to core + // current dispatcher shell SwPagePreViewWin aViewWin; //viewdata of the previous SwView and the new crsrposition String sSwViewData, @@ -186,18 +185,17 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell sNewCrsrPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 nNewPage; - // Sichtbarer Bereich + // visible range String sPageStr; Size aDocSz; Rectangle aVisArea; - // MDI Bedienelemente + // MDI control elements SwScrollbar *pHScrollbar; SwScrollbar *pVScrollbar; ImageButton *pPageUpBtn, *pPageDownBtn; - // Dummy-Window zum F�llen der rechten unteren Ecke, wenn beide Scrollbars - // aktiv sind + // dummy window for filling the lower right edge when both scrollbars are active Window *pScrollFill; sal_uInt16 mnPageCount; @@ -285,7 +283,7 @@ public: sal_uInt16 GetNewPage() const {return nNewPage;} void SetNewPage(sal_uInt16 nSet) {nNewPage = nSet;} - // Handler + // handler void Execute(SfxRequest&); void GetState(SfxItemSet&); void StateUndo(SfxItemSet&); @@ -325,12 +323,12 @@ public: ~SwPagePreView(); }; -// ----------------- inline Methoden ---------------------- - - +// ----------------- inline methods ---------------------- inline void SwPagePreView::AdjustEditWin() { OuterResizePixel( Point(), GetFrameWindow()->GetOutputSizePixel() ); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 159e71628f46..8dedffb9aa4a 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <redline.hxx> #include <tools/datetime.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/viewfrm.hxx> @@ -45,17 +44,17 @@ class SwChildWinWrapper; struct SwRedlineDataChild { - const SwRedlineData* pChild; // Verweis auf originale gestackte Daten - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag + const SwRedlineData* pChild; // link to original stacked data + const SwRedlineDataChild* pNext; // link to stacked data + SvLBoxEntry* pTLBChild; // corresponding TreeListBox entry }; struct SwRedlineDataParent { const SwRedlineData* pData; // RedlineDataPtr - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag - String sComment; // Redline-Kommentar + const SwRedlineDataChild* pNext; // link to stacked data + SvLBoxEntry* pTLBParent; // corresponding TreeListBox entry + String sComment; // redline comment inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); } @@ -145,10 +144,6 @@ public: virtual void Resize(); }; -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - class SwModelessRedlineAcceptDlg : public SfxModelessDialog { SwRedlineAcceptDlg* pImplDlg; @@ -165,11 +160,6 @@ public: void Initialize (SfxChildWinInfo* pInfo); }; - -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - class SwRedlineAcceptChild : public SwChildWinWrapper { public: @@ -187,3 +177,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index bcdb06393f6c..ca006c2bc940 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,7 +52,6 @@ #include <svx/paraprev.hxx> #include <editeng/lrspitem.hxx> - class SwWrtShell; class EditRegionDlg; @@ -62,9 +62,8 @@ namespace sfx2 } /************************************************************************* - Dialog "Bereiche bearbeiten" + dialog "edit regions" *************************************************************************/ - class SectRepr; typedef SectRepr* SectReprPtr; SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0, 4 ) @@ -96,10 +95,9 @@ class SwEditRegionDlg : public SfxModalDialog FixedText aConditionFT; ConditionEdit aConditionED; - // --> FME 2004-06-22 #114856# edit in readonly sections + // #114856# edit in readonly sections FixedLine aPropertiesFL; TriStateBox aEditInReadonlyCB; - // <-- OKButton aOK; CancelButton aCancel; @@ -107,7 +105,6 @@ class SwEditRegionDlg : public SfxModalDialog PushButton aDismiss; HelpButton aHelp; ImageList aImageIL; - ImageList aImageILH; SwWrtShell& rSh; SectReprArr aSectReprArr; @@ -120,7 +117,7 @@ class SwEditRegionDlg : public SfxModalDialog sal_Bool bWeb :1; - Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden,sal_Bool bHighContrast); + Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); sal_uInt16 FindArrPos(const SwSectionFmt* pFmt); @@ -135,9 +132,8 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( ChangePasswdHdl, Button * ); DECL_LINK( ChangeProtectHdl, TriStateBox * ); DECL_LINK( ChangeHideHdl, TriStateBox * ); - // --> FME 2004-06-22 #114856# edit in readonly sections + // #114856# edit in readonly sections DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * ); - // <-- DECL_LINK( ChangeDismissHdl, CheckBox * ); DECL_LINK( UseFileHdl, CheckBox* ); DECL_LINK( FileSearchHdl, PushButton* ); @@ -156,13 +152,10 @@ public: void SelectSection(const String& rSectionName); }; + /************************************************************************* - Dialog "Bereich einfuegen" + dialog "insert region" *************************************************************************/ - -/* -----------------21.05.99 11:05------------------- - * - * --------------------------------------------------*/ class SwInsertSectionTabPage : public SfxTabPage { FixedLine aNameFL; @@ -188,10 +181,9 @@ class SwInsertSectionTabPage : public SfxTabPage FixedText aConditionFT; ConditionEdit aConditionED; - // --> FME 2004-06-22 #114856# edit in readonly sections + // #114856# edit in readonly sections FixedLine aPropertiesFL; CheckBox aEditInReadonlyCB; - // <-- String m_sFileName; String m_sFilterName; @@ -204,9 +196,8 @@ class SwInsertSectionTabPage : public SfxTabPage Window* m_pOldDefDlgParent; DECL_LINK( ChangeHideHdl, CheckBox * ); - // --> FME 2004-06-22 #114856# edit in readonly sections + // #114856# edit in readonly sections DECL_LINK( ChangeEditInReadonlyHdl, CheckBox * ); - // <-- DECL_LINK( ChangeProtectHdl, CheckBox * ); DECL_LINK( ChangePasswdHdl, Button * ); DECL_LINK( NameEditHdl, Edit * ); @@ -272,9 +263,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; -/* -----------------13.06.2003 09:51----------------- - --------------------------------------------------*/ class SwSectionIndentTabPage : public SfxTabPage { FixedLine aIndentFL; @@ -299,9 +288,6 @@ public: void SetWrtShell(SwWrtShell& rSh); }; -/* -----------------21.05.99 13:07------------------- - * - * --------------------------------------------------*/ class SwInsertSectionTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; @@ -318,9 +304,6 @@ public: SwSectionData * GetSectionData() { return m_pSectionData.get(); } }; -/* -----------------21.05.99 13:07------------------- - * - * --------------------------------------------------*/ class SwSectionPropertyTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; @@ -333,4 +316,4 @@ public: #endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index 6ad4e5f7ab19..0302fcefe4bb 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,22 +29,9 @@ #define _ROWHT_HXX #include <svx/stddlg.hxx> - -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif - -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif - -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif - -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> -#endif class SwWrtShell; @@ -65,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 49d023d17605..f0243f5fc6ee 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,18 +27,16 @@ ************************************************************************/ #ifndef _SCROLL_HXX #define _SCROLL_HXX -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif class SwScrollbar: public ScrollBar { Size aDocSz; - sal_Bool bHori :1; // Horizontal = sal_True, sonst Vertikal - sal_Bool bAuto :1; // fuer Scrollingmode + sal_Bool bHori :1; // horizontal = salTrue, otherwise vertical + sal_Bool bAuto :1; // for scrolling mode sal_Bool bThumbEnabled:1; - sal_Bool bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen - sal_Bool bSizeSet :1; // wurde die Groesse bereits gesetzt? + sal_Bool bVisible :1; // show/hide should only set this flag + sal_Bool bSizeSet :1; // was the size already set? void AutoShow(); @@ -52,11 +51,11 @@ public: void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); sal_Bool IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } - // Aenderung der Dokumentgroesse + // changing of document size void DocSzChgd(const Size &rNewSize); - // Aenderung des sichtbaren Bereiches + // changing of visible region void ViewPortChgd(const Rectangle &rRectangle); - // was fuer einer ist es denn ?? + // what is it?? sal_Bool IsHoriScroll() const { return bHori; } void SetAuto(sal_Bool bSet); @@ -69,3 +68,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index 357600a31c0d..4ce626454d25 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,18 +28,12 @@ #ifndef _SELGLOS_HXX #define _SELGLOS_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwSelGlossaryDlg : public ModalDialog { @@ -72,3 +67,5 @@ inline void SwSelGlossaryDlg::SelectEntryPos(sal_uInt16 nIdx) { aGlosBox.SelectEntryPos(nIdx); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/ui/inc/sharedconnection.hxx index cbb6f41d17ad..cf61e646b9cc 100644 --- a/sw/source/ui/inc/sharedconnection.hxx +++ b/sw/source/ui/inc/sharedconnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,5 @@ typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; #endif // SW_UI_SHARED_CONNECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 0652596b128c..7a6c85047dc0 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 2058b6432ed8..569dba2a05ac 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -102,7 +102,9 @@ #define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) -#define SHELLS_ACT_END RID_MEDIA_TOOLBOX +#define STR_SHELLNAME_NAVIGATION (RC_SHELLS_BEGIN + 62) + +#define SHELLS_ACT_END STR_SHELLNAME_NAVIGATION #if SHELLS_ACT_END > RC_SHELLS_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 6d515acf22b5..5d9dd5aa2178 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,21 +30,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; @@ -74,3 +67,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index 4bc4ec45f23b..7ce7c65e898e 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 5b4aafddbcb8..9e9a74f900af 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <unotools/options.hxx> #include <vcl/timer.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <svtools/xtextedt.hxx> class ScrollBar; @@ -162,3 +161,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index e6574f5bfdce..faa770fc1ac5 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,10 +39,6 @@ class SwDocShell; class SvxSearchItem; class SfxMedium; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwSrcView: public SfxViewShell { SwSrcEditWindow aEditWin; @@ -52,7 +49,7 @@ class SwSrcView: public SfxViewShell rtl_TextEncoding eLoadEncoding; void Init(); - // fuer Readonly-Umschaltung + // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -101,26 +98,6 @@ public: }; - #endif - - - - - - - - - - - - - - - - - - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 25840e7ae2c0..3f17aff5d01a 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,18 +28,10 @@ #ifndef _SRTDLG_HXX #define _SRTDLG_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <svx/stddlg.hxx> #include <svx/langbox.hxx> @@ -116,3 +109,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index a761d60a12ed..f72de63e0c81 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,16 +31,12 @@ #ifndef _STMENU_HXX #define _STMENU_HXX -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vector> #include <com/sun/star/smarttags/XSmartTagAction.hpp> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <com/sun/star/text/XTextRange.hpp> class SwView; @@ -83,3 +80,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index 4c906ee8eacb..9ae0856ea8d5 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ class SwContentType; -//Reihenfolge und Anzahl mit ResIds abgleichen!! +// synchronize order and number with ResIds!! #define CONTENT_TYPE_OUTLINE 0 #define CONTENT_TYPE_TABLE 1 #define CONTENT_TYPE_FRAME 2 @@ -48,17 +49,17 @@ class SwContentType; #define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 -// Typen fuer das Globaldokument +// types for global document #define GLOBAL_CONTENT_REGION 100 #define GLOBAL_CONTENT_INDEX 101 #define GLOBAL_CONTENT_TEXT 102 #define GLOBAL_CONTENT_MAX 3 -// Strings fuer Kontextmenue +// strings for context menus #define CONTEXT_COUNT 12 #define GLOBAL_CONTEXT_COUNT 14 -// Modi fuer Drag 'n Drop +// modes for Drag 'n Drop #define REGION_MODE_NONE 0 #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 @@ -93,12 +94,12 @@ public: const String& GetName() const {return sContentName;} int operator==(const SwContent& /*rCont*/) const { - //gleich sind sie nie, sonst fallen sie aus dem Array + // they're never equal, otherwise they'd fall out of the array return sal_False; } int operator<(const SwContent& rCont) const { - //zuerst nach Position dann nach Name sortieren + // at first sort by position and then by name return nYPosition != rCont.nYPosition ? nYPosition < rCont.nYPosition : sContentName < rCont.sContentName;; @@ -111,3 +112,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 25a0871c9944..3caa280b522a 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,7 +58,7 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DDELINK = 0x0010; const sal_uInt16 TRNSFR_OLE = 0x0020; const sal_uInt16 TRNSFR_INETFLD = 0x0040; - const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! + const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } #define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor @@ -76,7 +77,7 @@ class SwTransferable : public TransferableHelper const ViewShell *pCreatorView; SwDocFac *pClpDocFac; Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; - INetBookmark *pBkmk; // URL und Beschreibung! + INetBookmark *pBkmk; // URL and description! ImageMap *pImageMap; INetImage *pTargetURL; @@ -220,3 +221,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 7bc40b394013..9788146dde63 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ #include <svl/svarray.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include "swdllapi.h" class SwBoxEntry; @@ -44,9 +41,8 @@ class Window; SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10, 10) /*-------------------------------------------------------------------- - Beschreibung: SwBoxEntry + Description: SwBoxEntry --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; @@ -66,10 +62,10 @@ public: }; /*-------------------------------------------------------------------- - Beschreibung: fuer ComboBoxen + Description: for combo boxes --------------------------------------------------------------------*/ - typedef sal_uInt16 SwComboBoxStyle; + namespace nsSwComboBoxStyle { const SwComboBoxStyle CBS_UPPER = 0x01; @@ -122,3 +118,5 @@ public: }; #endif /* _SWLBOX_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx index 90bc788e3c54..2e983566c6f2 100644 --- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index d15c90935c85..de02fa8b06fc 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> @@ -43,11 +42,6 @@ #include <tools/resary.hxx> #include <swunodef.hxx> - - -/* -----------------09.06.99 14:36------------------- - * - * --------------------------------------------------*/ class SwRenameXNamedDlg : public ModalDialog { FixedLine aNameFL; @@ -85,3 +79,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index e874c78aa624..d0b341456cb0 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 1ed54fafe629..b665a068828e 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index a47bcb5a5e3a..a2ff8e8c0294 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,26 +30,17 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> #include "tox.hxx" -#include <tools/list.hxx> #include <toxmgr.hxx> #include <svx/checklbx.hxx> #include <tools/resary.hxx> @@ -56,6 +48,8 @@ #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> #include <cnttab.hxx> +#include <vector> + class SwWrtShell; class SwTOXMgr; namespace com{namespace sun{namespace star{ @@ -65,15 +59,14 @@ namespace com{namespace sun{namespace star{ } }}} -//----------------------------------------------------------------------------- struct SwIndexSections_Impl { com::sun::star::uno::Reference< com::sun::star::text::XTextSection > xContainerSection; com::sun::star::uno::Reference< com::sun::star::text::XDocumentIndex > xDocumentIndex; }; -//----------------------------------------------------------------------------- class SwOneExampleFrame; + struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog @@ -136,9 +129,7 @@ public: static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName); }; -/* -----------------14.07.99 12:17------------------- - --------------------------------------------------*/ class IndexEntryRessource; class IndexEntrySupplierWrapper; @@ -160,7 +151,6 @@ class SwTOXSelectTabPage : public SfxTabPage //content FixedLine aCreateFromFL; // content, user, illustration CheckBox aFromHeadingsCB; -// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei CheckBox aAddStylesCB; PushButton aAddStylesPB; Point aAddStylesPosDef; @@ -233,7 +223,6 @@ class SwTOXSelectTabPage : public SfxTabPage DECL_LINK(TOXTypeHdl, ListBox* ); DECL_LINK(TOXAreaHdl, ListBox* ); -// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei DECL_LINK(AddStylesHdl, PushButton* ); DECL_LINK(MenuEnableHdl, Menu*); DECL_LINK(MenuExecuteHdl, Menu*); @@ -265,11 +254,6 @@ public: void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc void SetWrtShell(SwWrtShell& rSh); }; -/* -----------------16.06.99 08:33------------------- - - --------------------------------------------------*/ - -DECLARE_LIST(TOXControlList, Control*) class SwTOXEdit; class SwTOXButton; @@ -277,10 +261,15 @@ class SwTOXEntryTabPage; class SwTokenWindow : public Window { + typedef std::vector<Control*>::iterator ctrl_iterator; + typedef std::vector<Control*>::const_iterator ctrl_const_iterator; + typedef std::vector<Control*>::reverse_iterator ctrl_reverse_iterator; + typedef std::vector<Control*>::const_reverse_iterator ctrl_const_reverse_iterator; + ImageButton aLeftScrollWin; Window aCtrlParentWin; ImageButton aRightScrollWin; - TOXControlList aControlList; + std::vector<Control*> aControlList; SwForm* pForm; sal_uInt16 nLevel; sal_Bool bValid; @@ -342,10 +331,9 @@ public: virtual void Resize(); virtual void GetFocus(); }; -/* -----------------------------23.12.99 14:16-------------------------------- - ---------------------------------------------------------------------------*/ class SwTOXEntryTabPage; + class SwIdxTreeListBox : public SvTreeListBox { SwTOXEntryTabPage* pParent; @@ -355,9 +343,6 @@ public: SwIdxTreeListBox(SwTOXEntryTabPage* pPar, const ResId& rResId); }; -/* -----------------16.06.99 12:49------------------- - - --------------------------------------------------*/ class SwTOXEntryTabPage : public SfxTabPage { FixedText aLevelFT; @@ -487,9 +472,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); }; -/* -----------------05.07.99 13:00------------------- - --------------------------------------------------*/ class SwTOXStylesTabPage : public SfxTabPage { FixedLine aFormatFL; @@ -502,7 +485,6 @@ class SwTOXStylesTabPage : public SfxTabPage PushButton aEditStyleBT; SwForm* m_pCurrentForm; -// void UpdatePattern(); DECL_LINK( EditStyleHdl, Button *); DECL_LINK( StdHdl, Button * ); @@ -537,3 +519,4 @@ public: #endif // _SWUI_CNTTAB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index ad3adcce78ca..5a673c5c304d 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,30 +31,18 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif #include <sfx2/childwin.hxx> #include "toxe.hxx" #include <svtools/stdctrl.hxx> @@ -63,10 +52,11 @@ class SwWrtShell; class SwTOXMgr; class SwTOXMark; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Description: insert mark for index entry --------------------------------------------------------------------*/ class SwIndexMarkFloatDlg; class SwIndexMarkModalDlg; + class SwIndexMarkDlg : public Window { friend class SwIndexMarkFloatDlg; @@ -173,9 +163,7 @@ public: sal_Bool IsTOXType(const String& rName) {return LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos(rName);} }; -/* -----------------06.10.99 10:11------------------- - --------------------------------------------------*/ class SwIndexMarkFloatDlg : public SfxModelessDialog { SwIndexMarkDlg aDlg; @@ -188,9 +176,7 @@ class SwIndexMarkFloatDlg : public SfxModelessDialog sal_Bool bNew=sal_True); void ReInitDlg(SwWrtShell& rWrtShell); }; -/* -----------------06.10.99 10:33------------------- - --------------------------------------------------*/ class SwIndexMarkModalDlg : public SvxStandardDialog { SwIndexMarkDlg aDlg; @@ -201,10 +187,8 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -/* -----------------15.09.99 08:39------------------- - - --------------------------------------------------*/ class SwAuthMarkModalDlg; + class SwAuthMarkDlg : public Window { static sal_Bool bIsFromComponent; @@ -262,9 +246,7 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -/* -----------------06.10.99 10:11------------------- - --------------------------------------------------*/ class SwAuthMarkFloatDlg : public SfxModelessDialog { SwAuthMarkDlg aDlg; @@ -277,9 +259,7 @@ class SwAuthMarkFloatDlg : public SfxModelessDialog sal_Bool bNew=sal_True); void ReInitDlg(SwWrtShell& rWrtShell); }; -/* -----------------06.10.99 10:33------------------- - --------------------------------------------------*/ class SwAuthMarkModalDlg : public SvxStandardDialog { SwAuthMarkDlg aDlg; @@ -290,6 +270,6 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; - #endif // _SWUI_IDXMRK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index 74f798d7d6ca..62ea87544fd5 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx index 4e6b2a46f856..d8253b3c3b52 100644 --- a/sw/source/ui/inc/swvset.hxx +++ b/sw/source/ui/inc/swvset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +27,6 @@ ************************************************************************/ #ifndef _SWVSET_HXX #define _SWVSET_HXX -#include <tools/list.hxx> #include <svx/numvset.hxx> class SwRulerValueSet : public SvxBmpNumValueSet @@ -39,3 +39,4 @@ class SwRulerValueSet : public SvxBmpNumValueSet }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 661cedfc2502..f8e272702e45 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 5022881a4854..c176dc13cb6d 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,7 @@ #ifdef _SYNCDLG #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif - -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ class SwSyncBtnDlg : public SfxFloatingWindow { @@ -51,10 +46,6 @@ public: }; #endif -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - class SwSyncChildWin : public SfxChildWindow { public: @@ -69,3 +60,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 9f1553a2ccd0..677ab6c951f2 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ class SwTabCols; struct TColumn; /*------------------------------------------------------- - Tabellendialog + table dialog --------------------------------------------------------- */ class SwTableTabDlg : public SfxTabDialog { @@ -53,3 +54,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index 844f76833cbc..b8035c681327 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) : } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index a1e5c37dcc27..49c8a06558a7 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ class SwWrtShell; SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh ); -extern const sal_uInt16 __FAR_DATA aUITableAttrRange[]; +extern const sal_uInt16 aUITableAttrRange[]; SW_DLLPUBLIC const sal_uInt16* SwuiGetUITableAttrRange(); class SwTableShell: public SwBaseShell @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index bf581291c12e..5ba02135aa62 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,25 +29,15 @@ #define SW_TAUTOFMT_HXX #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif class SwTableAutoFmt; class AutoFmtPreview; @@ -116,3 +107,4 @@ public: #endif // SW_AUTOFMT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index d96b85f21208..4616174ac0f3 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/ui/inc/tblnumfm.hxx index b6118f3943fe..ca93e3a0ec07 100644 --- a/sw/source/ui/inc/tblnumfm.hxx +++ b/sw/source/ui/inc/tblnumfm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/ui/inc/tbxanchr.hxx index 9edc1e22fbe2..c27dbcc88b14 100644 --- a/sw/source/ui/inc/tbxanchr.hxx +++ b/sw/source/ui/inc/tbxanchr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index 08209cd70403..d730a4d701b6 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _TEXTCONTROLCOMBO_HXX #define _TEXTCONTROLCOMBO_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <vcl/field.hxx> #include "swdllapi.h" @@ -64,3 +63,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx index 5e3358c2b20a..31a545ae65d6 100644 --- a/sw/source/ui/inc/textsh.hxx +++ b/sw/source/ui/inc/textsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #define _SWTEXTSH_HXX #include <basesh.hxx> +#include <unotools/caserotate.hxx> class AbstractSvxPostItDialog; class SwFldMgr; @@ -37,6 +39,7 @@ class SvxHyperlinkItem; class SwTextShell: public SwBaseShell { SwFldMgr* pPostItFldMgr; + RotateTransliteration m_aRotateCase; void InsertSymbol( SfxRequest& ); void InsertHyperlink(const SvxHyperlinkItem& rHlnkItem); @@ -47,10 +50,6 @@ public: SFX_DECL_INTERFACE(SW_TEXTSHELL) TYPEINFO(); -//CHINA001 DECL_LINK( PostItNextHdl, Button * ); -//CHINA001 DECL_LINK( PostItPrevHdl, Button * ); -//CHINA001 DECL_LINK( RedlineNextHdl, Button * ); -//CHINA001 DECL_LINK( RedlinePrevHdl, Button * ); DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * ); DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * ); @@ -80,6 +79,7 @@ public: void ExecAttr(SfxRequest &); void ExecDB(SfxRequest &); void ExecTransliteration(SfxRequest &); + void ExecRotateTransliteration(SfxRequest &); void GetAttrState(SfxItemSet &); @@ -88,3 +88,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx new file mode 100644 index 000000000000..5f102e008201 --- /dev/null +++ b/sw/source/ui/inc/titlepage.hxx @@ -0,0 +1,102 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.) + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Caolán McNamara <caolanm@redhat.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ +#ifndef _SWTITLEPAGE_HXX +#define _SWTITLEPAGE_HXX + +#include <sfx2/basedlgs.hxx> +#include <sfx2/tabdlg.hxx> +#include <vcl/fixed.hxx> +#include <vcl/field.hxx> +#include <vcl/lstbox.hxx> +#include <numberingtypelistbox.hxx> + +class Window; +class SfxItemSet; +class SwView; +class SwWrtShell; +class SwPageDesc; + +class SwTitlePageDlg : public SfxModalDialog +{ +private: + FixedLine aMakeInsertFL; + RadioButton aUseExistingPagesRB; + RadioButton aInsertNewPagesRB; + FixedText aPageCountFT; + NumericField aPageCountNF; + FixedText aPagePagesFT; + + FixedText aPageStartFT; + RadioButton aDocumentStartRB; + RadioButton aPageStartRB; + NumericField aPageStartNF; + + FixedLine aNumberingFL; + CheckBox aRestartNumberingCB; + FixedText aRestartNumberingFT; + NumericField aRestartNumberingNF; + CheckBox aSetPageNumberCB; + FixedText aSetPageNumberFT; + NumericField aSetPageNumberNF; + + FixedLine aPagePropertiesFL; + ListBox aPagePropertiesLB; + PushButton aPagePropertiesPB; + + FixedLine aBottomFL; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; + + SwWrtShell *mpSh; + + const SwFmtPageDesc *mpPageFmtDesc; + + SwPageDesc *mpTitleDesc; + const SwPageDesc *mpIndexDesc; + const SwPageDesc *mpNormalDesc; + + void FillList(); + + sal_uInt16 GetInsertPosition() const; + + DECL_LINK( OKHdl, Button * ); + DECL_LINK( EditHdl, Button * ); + DECL_LINK( RestartNumberingHdl, CheckBox* ); + DECL_LINK( SetPageNumberHdl, CheckBox* ); + DECL_LINK( UpHdl, NumericField * ); + DECL_LINK( DownHdl, NumericField * ); + DECL_LINK( StartPageHdl, RadioButton * ); +public: + SwTitlePageDlg( Window *pParent ); + ~SwTitlePageDlg(); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index f3feddfc89ed..966ec13be1e5 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,8 @@ class SfxItemSet; class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Der Tabdialog Traeger der TabPages + Description: the tab dialog carrier of TabPages --------------------------------------------------------------------*/ - class SwTemplateDlg: public SfxStyleDialog { @@ -45,6 +45,7 @@ class SwTemplateDlg: public SfxStyleDialog sal_Bool bNewStyle; DECL_LINK( NumOptionsHdl, PushButton* ); + DECL_LINK( ApplyHdl, void* ); public: SwTemplateDlg( Window* pParent, @@ -61,6 +62,6 @@ public: virtual short Ok(); }; - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx index 1c684d6c599a..f0579d0ec96c 100644 --- a/sw/source/ui/inc/tmplctrl.hxx +++ b/sw/source/ui/inc/tmplctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,10 @@ #define _TMPLCTRL_HXX // include --------------------------------------------------------------- - #include <sfx2/stbitem.hxx> #include <tools/string.hxx> - // class BookmarkToolBoxControl ------------------------------------------- - class SwTemplateControl : public SfxStatusBarControl { protected: @@ -53,6 +51,6 @@ private: String sTemplate; }; - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index a1cc17d4c470..87eb6100a21f 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,10 +37,9 @@ class SwWrtShell; class SwForm; /*-------------------------------------------------------------------- - Beschreibung: Manager fuer Verzeichnisfunktionalitaet + Description: manager for directory functionality --------------------------------------------------------------------*/ //one single method will be sufficient to insert AND upate indexes - class SW_DLLPUBLIC SwTOXDescription { TOXTypes eTOXType; @@ -183,7 +183,7 @@ public: void ApplyTo(SwTOXBase& rTOXBase); }; -// -------------------------------------------------------------------------------- + class SwTOXMarkDescription { TOXTypes eTOXType; @@ -281,7 +281,7 @@ public: explicit SwTOXMgr(SwWrtShell* pShell); // - // Methoden fuer Verzeichnismarkierungen + // methods for directory marks // void InsertTOXMark(const SwTOXMarkDescription& rDesc); @@ -292,7 +292,7 @@ public: void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); - // Aktuelle TOXmarks holen + // get current TOXmarks sal_uInt16 GetTOXMarks(); sal_uInt16 GetTOXMarkCount(); SwTOXMark* GetTOXMark(sal_uInt16 nId); @@ -300,7 +300,7 @@ public: void SetCurTOXMark(sal_uInt16 nId); // - // Methoden fuer Verzeichnisse + // methods for directories // sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); @@ -309,16 +309,15 @@ public: }; - /*-------------------------------------------------------------------- - Beschreibung: Inlines + Description: inlines --------------------------------------------------------------------*/ - inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() { return aCurMarks.Count(); } - inline SwTOXMark* SwTOXMgr::GetCurTOXMark() { return pCurTOXMark; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx index 573bef720d49..b734427f0124 100644 --- a/sw/source/ui/inc/uiborder.hxx +++ b/sw/source/ui/inc/uiborder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index 55155e35fe59..d575593053e6 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ class SwNumRule; class IntlWrapper; /*-------------------------------------------------------------------- - Beschreibung: Container fuer FootNote + Description: container for FootNote --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem { @@ -56,16 +57,14 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } }; -/*******************************************************************/ - class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem { void* pMisc; @@ -81,8 +80,6 @@ public: void* GetValue() const { return pMisc; } }; -/*******************************************************************/ - class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem { SwNumRule* pRule; @@ -95,16 +92,13 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } }; -/* -----------------17.06.98 17:40------------------- - * - * --------------------------------------------------*/ class SwBackgroundDestinationItem : public SfxUInt16Item { public: @@ -114,3 +108,5 @@ public: }; #endif // _UIITEMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 1fe7e6e5f82e..5f2f87009da6 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,12 +41,11 @@ class SvStream; typedef SfxPoolItem* SfxPoolItemPtr; SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5,0 ) -//------------------------------------------------------------------------ class SW_DLLPUBLIC SwNumRulesWithName { String aName; - // die Formate der NumRule muessen! unabhaengig von einem Document sein - // (Sie sollen immer vorhanden sein!) + // the NumRule's formats _have_ to be independent of a document + // (They should always be there!) class SW_DLLPRIVATE _SwNumFmtGlobal { SwNumFmt aFmt; @@ -83,13 +83,11 @@ public: void Store( SvStream& ); }; -/******************************************************************** -********************************************************************/ class SwBaseNumRules { public: - enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms + enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms protected: SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; String sFileName; @@ -112,9 +110,6 @@ public: }; -/******************************************************************** - -********************************************************************/ class SwChapterNumRules : public SwBaseNumRules { @@ -129,8 +124,10 @@ public: // INLINE METHODE -------------------------------------------------------- inline const SwNumRulesWithName *SwBaseNumRules::GetRules(sal_uInt16 nIdx) const { - ASSERT(nIdx < nMaxRules, Array der NumRules ueberindiziert.); + OSL_ENSURE(nIdx < nMaxRules, "Array der NumRules ueberindiziert."); return pNumRules[nIdx]; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 07d9054438c7..e5199bf5bbf2 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,34 +46,37 @@ class SwTabCols; class DateTime; class SfxViewFrame; -// Umschalten einer Metric +// switch a metric SW_DLLPUBLIC void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit); -// BoxInfoAttribut fuellen +// fill BoxInfoAttribut SW_DLLPUBLIC void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh); // SfxItemSets <-> PageDesc void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ); void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet); -// Auffuellen der Tabs mit DefaultTabs +// fill tabs with default tabs SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); -// DefaultTabs loeschen aus dem TabStopArray +// erase DefaultTabs from TabStopArray //void EraseDefTabs(SvxTabStopItem& rTabs); -// Abstand zwischen dem 1. und zweitem Element ermitteln +// determine space between 1st and 2nd element SW_DLLPUBLIC sal_uInt16 GetTabDist(const SvxTabStopItem& rTabs); -// erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt -// und setze diesen im Set und loesche die Transport Items -// (PageBreak & PageModel) aus dem Set +// determine whether a Sfx-PageDesc combination exists in the set +// and set this in the set and delete the transport items +// (PageBreak & PageModel) from the set void SwToSfxPageDescAttr( SfxItemSet& rSet ); void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); SW_DLLPUBLIC FieldUnit GetDfltMetric(sal_Bool bWeb); void SetDfltMetric(FieldUnit eMetric, sal_Bool bWeb); +SW_DLLPUBLIC sal_Bool HasCharUnit( sal_Bool bWeb ); +void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); + // ListBox mit allen Zeichenvorlagen fuellen - ausser Standard! SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal_Bool bSorted = sal_False, sal_Bool bWithDefault = sal_False); @@ -90,3 +94,5 @@ String GetAppLangDateTimeString( const DateTime& ); bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId ); #endif // _UITOOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 1e68678cdb72..4c349a047c67 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,9 +53,6 @@ namespace com{ namespace sun{ namespace star { } }}} -/* -----------------------------29.05.00 08:22-------------------------------- - - ---------------------------------------------------------------------------*/ class SwScannerEventListener : public ::cppu::WeakImplHelper1< STAR_NMSPC::lang::XEventListener > { @@ -73,7 +71,6 @@ public: }; // --------------------------- Clipboard EventListener ------------------ - class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< CLIP_NMSPC::XClipboardListener > { @@ -96,11 +93,8 @@ public: void AddRemoveListener( sal_Bool bAdd ); }; - -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ class SwMailMergeConfigItem; + class SwView_Impl { STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr; @@ -186,3 +180,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 884d647725e5..039769abda5f 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,13 +36,10 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <list> -//#ifndef _OSL_MUTEX_HXX_ -//#include <osl/mutex.hxx> -//#endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> class SwView; -//--------------------------------------------------------------------------------------------------------------------- + class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 < ::com::sun::star::frame::XDispatchProviderInterceptor, @@ -52,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - vos::OGuard aGuard; + osl::SolarGuard aGuard; DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); @@ -132,3 +130,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index 4a94628a03ad..aa710f182a6f 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> @@ -44,10 +43,8 @@ #include <swunodef.hxx> #include "swdllapi.h" -/* -----------------------------15.12.99 09:55-------------------------------- - - ---------------------------------------------------------------------------*/ class SwOneExampleFrame; + class SwFrmCtrlWindow : public Window { SwOneExampleFrame* pExampleFrame; @@ -56,9 +53,7 @@ public: virtual void Command( const CommandEvent& rCEvt ); }; -/* -----------------------------15.12.99 12:56-------------------------------- - ---------------------------------------------------------------------------*/ class MenuResource : public Resource { ResStringArray aMenuArray; @@ -68,9 +63,7 @@ public: ResStringArray& GetMenuArray() {return aMenuArray;} }; -/* -----------------27.07.99 15:20------------------- - --------------------------------------------------*/ #define EX_SHOW_ONLINE_LAYOUT 0x001 // hard zoom value @@ -79,6 +72,7 @@ public: #define EX_SHOW_DEFAULT_PAGE 0x04 class SwView; + class SW_DLLPUBLIC SwOneExampleFrame { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > _xControl; @@ -133,3 +127,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 8a0d2b2662af..0e11b99e946a 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,9 +58,6 @@ class SwView; typedef ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > * XSelectionChangeListenerPtr; SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4, 4 ) -/****************************************************************************** - * - ******************************************************************************/ class SwXTextView : public ::com::sun::star::view::XSelectionSupplier, public ::com::sun::star::lang::XServiceInfo, @@ -159,10 +157,6 @@ public: SfxObjectShellLock BuildTmpSelectionDoc(); }; -/* -----------------17.09.98 12:52------------------- - * - * --------------------------------------------------*/ - typedef cppu::WeakImplHelper8< ::com::sun::star::text::XTextViewCursor, ::com::sun::star::lang::XServiceInfo, @@ -269,6 +263,7 @@ public: virtual const SwDoc* GetDoc() const; virtual SwDoc* GetDoc(); }; -#endif +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index d9abd8193c2b..fbf1971fe959 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,10 +35,8 @@ #include "viewopt.hxx" #include <tools/fldunit.hxx> -/* -----------------------------28.09.00 09:45-------------------------------- - - ---------------------------------------------------------------------------*/ class SwMasterUsrPref; + class SwContentViewConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; @@ -55,9 +54,7 @@ class SwContentViewConfig : public utl::ConfigItem void Load(); void SetModified(){ConfigItem::SetModified();} }; -/* -----------------------------28.09.00 09:45-------------------------------- - ---------------------------------------------------------------------------*/ class SwLayoutViewConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; @@ -73,9 +70,7 @@ class SwLayoutViewConfig : public utl::ConfigItem void Load(); void SetModified(){ConfigItem::SetModified();} }; -/* -----------------------------19.01.01 13:06-------------------------------- - ---------------------------------------------------------------------------*/ class SwGridConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; @@ -91,9 +86,7 @@ class SwGridConfig : public utl::ConfigItem void Load(); void SetModified(){ConfigItem::SetModified();} }; -/* -----------------------------19.01.01 13:06-------------------------------- - ---------------------------------------------------------------------------*/ class SwCursorConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; @@ -108,9 +101,7 @@ class SwCursorConfig : public utl::ConfigItem void Load(); void SetModified(){ConfigItem::SetModified();} }; -/* -----------------------------28.09.00 09:45-------------------------------- - ---------------------------------------------------------------------------*/ class SwWebColorConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; @@ -125,9 +116,7 @@ class SwWebColorConfig : public utl::ConfigItem void Load(); void SetModified(){ConfigItem::SetModified();} }; -/* -----------------------------28.09.00 09:45-------------------------------- - ---------------------------------------------------------------------------*/ class SwMasterUsrPref : public SwViewOption { friend class SwContentViewConfig; @@ -155,6 +144,7 @@ class SwMasterUsrPref : public SwViewOption SwCursorConfig aCursorConfig; SwWebColorConfig* pWebColorConfig; + sal_Bool bApplyCharUnit; // apply_char_unit public: SwMasterUsrPref(sal_Bool bWeb); ~SwMasterUsrPref(); @@ -256,6 +246,17 @@ public: aLayoutConfig.SetModified(); } + sal_Bool IsApplyCharUnit() const + { + return bApplyCharUnit; + } + void SetApplyCharUnit(sal_Bool bSet, sal_Bool bNoModify = sal_False) + { + bApplyCharUnit = bSet; + if(!bNoModify) + aLayoutConfig.SetModified(); + } + sal_Int32 GetDefTab() const { return nDefTab;} void SetDefTab( sal_Int32 nSet, sal_Bool bNoModify = sal_False ) { @@ -284,3 +285,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index aa7dab24054a..517ac26514a9 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -42,7 +42,7 @@ #define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5) #define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6) -// Namene der Inhaltstypen (RC_UTLUI_BEGIN + 7) +// names of content types (RC_UTLUI_BEGIN + 7) #define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8) #define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST #define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) @@ -154,15 +154,7 @@ #define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) #define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) -#define IMG_NAVI_ENTRYBMPH (RC_UTLUI_BEGIN + 5) #define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6) -#define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7) - -#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8) -#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9) -#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10) -#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11) - #define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12) #define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE (RC_UTLUI_BEGIN + 13) @@ -170,12 +162,6 @@ #define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE (RC_UTLUI_BEGIN + 15) #define IMG_VIEWLAYOUT_SINGLECOLUMN (RC_UTLUI_BEGIN + 16) #define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17) -#define IMG_VIEWLAYOUT_AUTOMATIC_HC (RC_UTLUI_BEGIN + 18) -#define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC (RC_UTLUI_BEGIN + 19) -#define IMG_VIEWLAYOUT_BOOKMODE_HC (RC_UTLUI_BEGIN + 20) -#define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC (RC_UTLUI_BEGIN + 21) -#define IMG_VIEWLAYOUT_SINGLECOLUMN_HC (RC_UTLUI_BEGIN + 22) -#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC (RC_UTLUI_BEGIN + 23) //local ids of the Database ImageLists diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 61d4d4b8702c..3fa31bb69d44 100755 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #include <vcl/timer.hxx> #include <vcl/field.hxx> +#include <vcl/floatwin.hxx> #include <svtools/htmlcfg.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> @@ -127,13 +129,13 @@ enum ShellModes SHELL_MODE_MEDIA, SHELL_MODE_EXTRUDED_CUSTOMSHAPE, SHELL_MODE_FONTWORK, - SHELL_MODE_POSTIT + SHELL_MODE_POSTIT, + SHELL_MODE_NAVIGATION }; /*-------------------------------------------------------------------- - Beschreibung: Anwendung einer Vorlage + Description: apply a template --------------------------------------------------------------------*/ - struct SwApplyTemplate { union @@ -160,14 +162,12 @@ struct SwApplyTemplate } }; - /*-------------------------------------------------------------------- - Beschreibung: Sicht auf ein Dokument + Description: view of a document --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwView: public SfxViewShell { - //Messehack (MA,MBA) + // exhibition hack (MA,MBA) friend void lcl_SelectShellForDrop( SwView &rView ); friend class TestTemplateItem; @@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell friend class SwView_Impl; friend class SwClipboardChangeListener; - //suchen & ersetzen + // search & replace static SvxSearchDialog *pSrchDlg; static SvxSearchItem *pSrchItem; @@ -184,8 +184,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static sal_uInt16 nWebInsertCtrlState; static sal_uInt16 nInsertObjectCtrlState; static sal_uInt16 nInsertFieldCtrlState; - static sal_uInt16 nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) - static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker + static sal_uInt16 nMoveType; // for buttons below the scrollbar (viewmdi) + static sal_Int32 nActMark; // current jump mark for unknown mark static sal_Bool bExtra; static sal_Bool bFound; @@ -196,37 +196,34 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SvxHtmlOptions aHTMLOpt; - Timer aTimer; //Fuer verzoegerte ChgLnks waehrend - //einer Aktion - String aPageStr; //Statusanzeige, aktuelle Seite + Timer aTimer; // for delayed ChgLnks during an action + String aPageStr; // status view, current page String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 nNewPage; - Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus - //aus dem Dokument heraus. + Point aTabColFromDocPos; // moving table colmns out of the document SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# - Size aDocSz; // aktuelle Dokumentgroesse - Rectangle aVisArea; // sichtbarer Bereich + Size aDocSz; // current document size + Rectangle aVisArea; // visible region SwEditWin *pEditWin; SwWrtShell *pWrtShell; - SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher + SfxShell *pShell; // current SubShell at the dispatcher FmFormShell *pFormShell; // DB-FormShell - SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic + SwView_Impl *pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *pHScrollbar, // MDI Bedienelemente + SwScrollbar *pHScrollbar, // MDI control elements *pVScrollbar; - Window *pScrollFill; // Dummy-Window zum Fuellen der rechten - // unteren Ecke, wenn beide Scrollbars - // aktiv sind + Window *pScrollFill; // dummy window for filling the lower right edge + // when both scrollbars are active SvxRuler *pHRuler, *pVRuler; @@ -236,7 +233,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell *pPageDownBtn; SwNaviImageButton *pNaviBtn; - SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine + SwGlossaryHdl *pGlosHdl; // handle text block SwDrawBase *pDrawActual; const SwFrmFmt *pLastTableFormat; @@ -246,6 +243,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwPostItMgr *mpPostItMgr; int nSelectionType; + FloatingWindow *mpFieldPopup; static const int MASTERENUMCOMMANDS = 6; @@ -253,7 +251,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell sal_uInt16 nPageCnt; - // Aktueller Drawmode + // current draw mode sal_uInt16 nDrawSfxId; String sDrawCustom; //some drawing types are marked with strings! sal_uInt16 nFormSfxId; @@ -285,11 +283,11 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bInDtor : 1, //detect destructor to prevent creating of sub shells while closing bOldShellWasPagePreView : 1, bIsPreviewDoubleClick : 1, // #i114045# - bMakeSelectionVisible : 1 // #b6330459# transport the bookmark selection + bMakeSelectionVisible : 1 // transport the bookmark selection ; - // Methoden fuers Suchen - // Suchkontext setzen + // methods for searching + // set search context SW_DLLPRIVATE sal_Bool SearchAndWrap(sal_Bool bApi = sal_False); SW_DLLPRIVATE sal_Bool SearchAll(sal_uInt16* pFound = 0); SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); @@ -299,7 +297,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE sal_Bool IsTextTool() const; - // Bedienelemente verwalten anlegen + // create control elements SW_DLLPRIVATE void CreateBtns(); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); @@ -308,6 +306,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); + SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, FloatingWindow * ); + inline long GetXScroll() const; inline long GetYScroll() const; SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; @@ -318,7 +318,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE sal_Bool GetPageScrollUpOffset(SwTwips& rOff) const; SW_DLLPRIVATE sal_Bool GetPageScrollDownOffset(SwTwips& rOff) const; - // Scrollbar Movements + // scrollbar movements SW_DLLPRIVATE long PageUp(); SW_DLLPRIVATE long PageDown(); SW_DLLPRIVATE long PageUpCrsr(sal_Bool bSelect); @@ -330,11 +330,12 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); SW_DLLPRIVATE sal_Bool UpdateScrollbars(); + SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); SW_DLLPRIVATE void CreatePageButtons(sal_Bool bShow); - // Linguistik-Funktionen + // linguistics functions SW_DLLPRIVATE void HyphenateDocument(); SW_DLLPRIVATE sal_Bool IsDrawTextHyphenate(); SW_DLLPRIVATE void HyphenateDrawText(); @@ -353,16 +354,16 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True) { bCenterCrsr = bOn; bAllwaysShowSel = bOn; } - // Methoden fuers Printing + // methods for printing SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); - // fuer Readonly-Umschaltung + // for readonly switching SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); SW_DLLPRIVATE void _CheckReadonlyState(); SW_DLLPRIVATE void _CheckReadonlySelection(); - // Methode fuer PageDesc drehen + // method for rotating PageDesc SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, @@ -386,7 +387,7 @@ protected: int GetSelectionType() const { return nSelectionType; } void SetSelectionType(int nSet) { nSelectionType = nSet;} - // fuer die SwWebView + // for SwWebView void SetShell( SfxShell* pS ) { pShell = pS; } void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } @@ -419,7 +420,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( FASTBOOL bOn = sal_True ); + virtual void ShowCursor( bool bOn = sal_True ); virtual ErrCode DoVerb( long nVerb ); virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, @@ -441,7 +442,7 @@ public: bool IsValidSelectionForThesaurus() const; String GetThesaurusLookUpText( bool bSelection ) const; - // Shell sofort wechseln -> fuer GetSelectionObject + // immediately switch shell -> for GetSelectionObject void StopShellTimer(); inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } @@ -454,7 +455,7 @@ public: void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject ); #endif - //Handler fuer Textbausteine an die Textshell rausreichen, gfs. anlegen + // hand the handler for text blocks to the shell; create if applicable SwGlossaryHdl* GetGlosHdl(); inline const Rectangle& GetVisArea() const { return aVisArea; } @@ -469,7 +470,8 @@ public: DECL_LINK( SpellError, LanguageType * ); sal_Bool ExecSpellPopup( const Point& rPt ); - sal_Bool ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + // SMARTTAGS sal_Bool ExecSmartTagPopup( const Point& rPt ); @@ -505,7 +507,7 @@ public: sal_Bool HandleWheelCommands( const CommandEvent& ); - // Rahmen einfuegen + // insert frames void InsFrmMode(sal_uInt16 nCols); void SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False); @@ -559,7 +561,7 @@ public: void StateStatusLine(SfxItemSet&); - // Funktionen fuer Drawing + // functions for drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return pDrawActual; } void GetDrawState(SfxItemSet &rSet); @@ -569,7 +571,7 @@ public: inline sal_Bool IsDrawSelMode() { return bDrawSelMode; } void SetSelDrawSlot(); inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } - void NoRotate(); // Rotate-Mode abschalten + void NoRotate(); // turn off rotate mode sal_Bool EnterDrawTextMode(const Point& aDocPos); void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();} sal_Bool IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } @@ -583,30 +585,30 @@ public: void StateTabWin(SfxItemSet&); - // Attribute haben sich geaendert + // attributes have changed DECL_LINK( AttrChangedNotify, SwWrtShell * ); // form control has been activated DECL_LINK( FormControlActivated, FmFormShell* ); - // Links bearbeiten + // edit links void EditLinkDlg(); void AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId = 0); void InsertCaption(const InsCaptionOpt *pOpt); - // Async Aufruf durch Core + // Async call by Core void UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); String GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); - // Shell rausreichen + // hand over Shell SfxShell *GetCurShell() { return pShell; } SwDocShell *GetDocShell(); inline const SwDocShell *GetDocShell() const; inline FmFormShell *GetFormShell() { return pFormShell; } inline const FmFormShell *GetFormShell() const { return pFormShell; } - //damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann + // so that in the SubShells' DTors pShell can be reset if applicable void ResetSubShell() { pShell = 0; } virtual void WriteUserData(String &, sal_Bool bBrowse = sal_False ); @@ -671,7 +673,6 @@ public: }; // ----------------- inline Methoden ---------------------- - inline long SwView::GetXScroll() const { return aVisArea.GetWidth() * nScrollX / 100L; @@ -687,11 +688,10 @@ inline const SwDocShell *SwView::GetDocShell() const return ((SwView*)this)->GetDocShell(); } -//*********************************************************** - SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, sal_Bool bPreview); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/ui/inc/viewlayoutctrl.hxx index 999f4b845636..fd02906129a8 100644 --- a/sw/source/ui/inc/viewlayoutctrl.hxx +++ b/sw/source/ui/inc/viewlayoutctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,11 +29,9 @@ #define _VIEWLAYOUTCTRL_HXX // include --------------------------------------------------------------- - #include <sfx2/stbitem.hxx> // class SwViewLayoutControl ---------------------------------------------- - class SwViewLayoutControl : public SfxStatusBarControl { private: @@ -54,3 +53,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index abd98d510e65..38e587ff5e35 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index dfe5bd5f422f..a141842440f2 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index b53743885d66..eaf5e4625007 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wlistsh.hxx b/sw/source/ui/inc/wlistsh.hxx index e3503a54e448..dd3fe48ac9ba 100644 --- a/sw/source/ui/inc/wlistsh.hxx +++ b/sw/source/ui/inc/wlistsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 87b48db5593e..6d714580b8e4 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index a228b8bdea77..5c6dbabea04f 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define SW_WORDCOUNTDIALOG_HXX #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <layout/layout.hxx> #include <layout/layout-pre.hxx> struct SwDocStat; @@ -41,12 +40,16 @@ class SwWordCountDialog : public SfxModalDialog FixedInfo aCurrentWordFI; FixedText aCurrentCharacterFT; FixedInfo aCurrentCharacterFI; + FixedText aCurrentCharacterExcludingSpacesFT; + FixedInfo aCurrentCharacterExcludingSpacesFI; FixedLine aDocFL; FixedText aDocWordFT; FixedInfo aDocWordFI; FixedText aDocCharacterFT; FixedInfo aDocCharacterFI; + FixedText aDocCharacterExcludingSpacesFT; + FixedInfo aDocCharacterExcludingSpacesFI; FixedLine aBottomFL; @@ -63,3 +66,5 @@ public: #include <layout/layout-post.hxx> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 297c343a7391..2e8588c23c15 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,15 +31,13 @@ #include <sfx2/tbxctrl.hxx> #include <vcl/toolbox.hxx> #include <svtools/stdctrl.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif class PopupMenu; class SwView; -// doppelter Eintrag! hrc und hxx -// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun +// double entry! hrc and hxx +// these Ids say what the buttons below the scrollbar are doing #define NID_START 20000 #define NID_NEXT 20000 #define NID_PREV 20001 @@ -137,7 +136,6 @@ class SwScrollNaviPopup : public SfxPopupWindow FixedLine aSeparator; FixedInfo aInfoField; ImageList aIList; - ImageList aIListH; String sQuickHelp[2 * NID_COUNT]; @@ -170,7 +168,6 @@ class SwNaviImageButton : public ImageButton { SwScrollNaviPopup* pPopup; Image aImage; - Image aImageH; String sQuickText; SfxPopupWindow* pPopupWindow; SfxPopupWindow* pFloatingWindow; @@ -189,7 +186,7 @@ class SwNaviImageButton : public ImageButton }; //---------------------------------------------------------------------------- -// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen +// ImageButtons have to set the HelpText themselves if needed //---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton @@ -202,9 +199,7 @@ class SwHlpImageButton : public ImageButton virtual void RequestHelp( const HelpEvent& rHEvt ); }; -/* -----------------26.11.2002 09:25----------------- - * - * --------------------------------------------------*/ + class SwPreviewZoomControl : public SfxToolBoxControl { public: @@ -223,3 +218,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 6ca664ea5d84..34913202199b 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,21 +31,13 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class Window; class SfxItemSet; @@ -63,7 +56,7 @@ public: /*-------------------------------------------------------------------- - Beschreibung: Umlauf-TabPage + Description: circulation TabPage --------------------------------------------------------------------*/ class SwWrapTabPage: public SfxTabPage @@ -149,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 010c3792f258..634cd97966c4 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,6 +34,7 @@ #include <sortopt.hxx> #include <swurl.hxx> #include <IMark.hxx> +#include "navmgr.hxx" class Window; class OutputDevice; @@ -68,17 +70,17 @@ namespace com { namespace sun { namespace star { namespace util { typedef sal_Int32 SelectionType; namespace nsSelectionType { - const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 - const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 - const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 - const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform - const SelectionType SEL_NUM = 0x000040; // NumListe - const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle - const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert - const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) - const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode - const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren - const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms + const SelectionType SEL_TXT = CNT_TXT; // text, never frames too 0x0001 + const SelectionType SEL_GRF = CNT_GRF; // graphic 0x0002 + const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 + const SelectionType SEL_FRM = 0x000020; // frame, no content type + const SelectionType SEL_NUM = 0x000040; // NumList + const SelectionType SEL_TBL = 0x000080; // cursor is in table + const SelectionType SEL_TBL_CELLS = 0x000100; // table cells are selected + const SelectionType SEL_DRW = 0x000200; // drawing objects (rectangle, circle...) + const SelectionType SEL_DRW_TXT = 0x000400; // draw-textobjects in edit mode + const SelectionType SEL_BEZ = 0x000800; // edit ornament objects + const SelectionType SEL_DRW_FORM = 0x001000; // drawing objects: DB-Forms const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. const SelectionType SEL_MEDIA = 0x004000; // Media object const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape @@ -113,11 +115,10 @@ public: SELECTFUNC fnEndDrag; SELECTFUNC fnKillSel; - // Alle Selektionen aufheben + // reset all selections long ResetSelect( const Point *, sal_Bool ); - //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down - //zurueck, falls ein Stack aufgebaut ist + // resets the cursorstack after movement with PageUp/-Down if a stack is built up inline void ResetCursorStack(); SelectionType GetSelectionType() const; @@ -129,7 +130,7 @@ public: void EndSelect(); sal_Bool IsInSelect() const { return bInSelect; } void SetInSelect(sal_Bool bSel = sal_True) { bInSelect = bSel; } - // Liegt eine Text- oder Rahmenselektion vor? + // is there a text- or frameselection? sal_Bool HasSelection() const { return SwCrsrShell::HasSelection() || IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); @@ -160,40 +161,38 @@ public: void EnterSelFrmMode(const Point *pStartDrag = 0); void LeaveSelFrmMode(); sal_Bool IsSelFrmMode() const { return bLayoutMode; } - // Selektion von Rahmen aufheben + // reset selection of frames void UnSelectFrm(); void Invalidate(); - // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar + // select table cells for editing of formulas in the ribbonbar inline void SelTblCells( const Link &rLink, sal_Bool bMark = sal_True ); inline void EndSelTblCells(); - //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird - //in der Regel in MB-Up gerufen. + // leave per word or per line selection mode. Is usually called in MB-Up. sal_Bool IsExtSel() const { return bSelWrd || bSelLn; } - // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist - // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen. + // query whether the active fnDrag pointer is set to BeginDrag + // is needed for MouseMove to work around bugs 55592/55931 inline sal_Bool Is_FnDragEQBeginDrag() const; - //Basisabfragen + // base requests sal_Bool IsInWrd() { return IsInWord(); } sal_Bool IsSttWrd() { return IsStartWord(); } sal_Bool IsEndWrd(); sal_Bool IsSttOfPara() const { return IsSttPara(); } sal_Bool IsEndOfPara() const { return IsEndPara(); } - //Word bzw. Satz selektieren. + // select word / sentense sal_Bool SelNearestWrd(); sal_Bool SelWrd (const Point * = 0, sal_Bool bProp=sal_False ); - // --> FME 2004-07-30 #i32329# Enhanced selection + // #i32329# Enhanced selection void SelSentence (const Point * = 0, sal_Bool bProp=sal_False ); void SelPara (const Point * = 0, sal_Bool bProp=sal_False ); - // <-- long SelAll(); - //Basiscursortravelling + // basecursortravelling typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool SimpleMove( FNSimpleMove, sal_Bool bSelect ); @@ -231,16 +230,15 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool BwdSentence( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); } - // --> FME 2004-07-30 #i20126# Enhanced table selection + // #i20126# Enhanced table selection sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); - // <-- sal_Bool SelectTableRow(); sal_Bool SelectTableCol(); sal_Bool SelectTableCell(); sal_Bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 ); - // Spaltenweise Spruenge + // per column jumps sal_Bool StartOfColumn ( sal_Bool bSelect = sal_False ); sal_Bool EndOfColumn ( sal_Bool bSelect = sal_False ); sal_Bool StartOfNextColumn ( sal_Bool bSelect = sal_False ); @@ -248,18 +246,18 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool StartOfPrevColumn ( sal_Bool bSelect = sal_False ); sal_Bool EndOfPrevColumn ( sal_Bool bSelect = sal_False ); - // setze den Cursor auf die Seite "nPage" an den Anfang - // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx - // werden hier alle bestehenden Selektionen vor dem Setzen des - // Cursors aufgehoben + // set the cursor to page "nPage" at the beginning + // additionally to a identically named implementation in crsrsh.hxx + // here all existing selections are being reset before setting the + // cursor sal_Bool GotoPage( sal_uInt16 nPage, sal_Bool bRecord ); - //setzen des Cursors; merken der alten Position fuer Zurueckblaettern. + // setting the cursor; remember the old position for turning back DECL_LINK( ExecFlyMac, void * ); sal_Bool PageCrsr(SwTwips lOffset, sal_Bool bSelect); - // Felder Update + // update fields void UpdateInputFlds( SwInputFieldList* pLst = 0, sal_Bool bOnlyInSel = sal_False ); void NoEdit(sal_Bool bHideCrsr = sal_True); @@ -272,14 +270,13 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // change current data base and notify void ChgDBData(const SwDBData& SwDBData); - // Loeschen + // delete long DelToEndOfLine(); long DelToStartOfLine(); long DelLine(); long DelLeft(); - // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen, - // wenn bDelFrm == sal_False ist + // also deletes the frame or sets the cursor in the frame when bDelFrm == sal_False long DelRight(); long DelToEndOfPara(); long DelToStartOfPara(); @@ -288,10 +285,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); long DelNxtWord(); long DelPrvWord(); - // Prueft, ob eine Wortselektion vorliegt. - // Gemaess den Regeln fuer intelligentes Cut / Paste - // werden umgebende Spaces rausgeschnitten. - // Liefert Art der Wortselektion zurueck (siehe enum) + // checks whether a word selection exists. + // According to the rules for intelligent Cut / Paste + // surrounding spaces are cut out. + // returns type of word selection (see enum) enum word { NO_WORD = 0, WORD_SPACE_BEFORE = 1, @@ -300,10 +297,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); }; int IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True); - // Editieren + // edit void Insert(SwField &); void Insert(const String &); - // Graphic + // graphic void Insert( const String &rPath, const String &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, sal_Bool bRule = sal_False ); @@ -316,11 +313,11 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); sal_Bool CanInsert(); - // Verzeichnisse + // indexes void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); sal_Bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - // Numerierung und Bullets + // numbering and bullets /** Turns on numbering or bullets. @@ -333,28 +330,29 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void BulletOn(); //OLE - void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard + void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard const svt::EmbeddedObjectRef&, - SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. + SvGlobalName *pName = 0, // != 0 create object accordingly sal_Bool bActivate = sal_True, - sal_uInt16 nSlotId = 0); // SlotId fuer Dialog + sal_uInt16 nSlotId = 0); // SlotId for dialog sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); - void LaunchOLEObj( long nVerb = 0 ); // Server starten + void LaunchOLEObj( long nVerb = 0 ); // start server sal_Bool IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, - const SwRect *pFlyFrmRect = 0 ); + const SwRect *pFlyFrmRect = 0, + const bool bNoTxtFrmPrtAreaChanged = false ); virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, const SwRect &rFrm ); - // Vorlagen und Formate + // styles and formats - // enum gibt an, was geschehen soll, wenn das Style nicht gefunden wurde - enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen - GETSTYLE_CREATESOME, // falls auf PoolId mapt anlegen - GETSTYLE_CREATEANY }; // ggfs Standard returnen + // enum tells when should happen when the style was not found + enum GetStyle { GETSTYLE_NOCREATE, // create none + GETSTYLE_CREATESOME, // if on PoolId create mapt + GETSTYLE_CREATEANY }; // return standard if applicable SwTxtFmtColl* GetParaStyle(const String &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); @@ -366,7 +364,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); String GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const; - // Aktuelle Vorlage anhand der geltenden Attribute aendern + // change current style using the attributes in effect void QuickUpdateStyle(); enum DoType { UNDO, REDO, REPEAT }; @@ -376,7 +374,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); String GetRepeatString() const; sal_uInt16 GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; - //Suchen oder Ersetzen + // search and replace sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, sal_Bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnde, @@ -397,23 +395,23 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar = ' ' ); - // Aktion vor Cursorbewegung - // Hebt gfs. Selektionen auf, triggert Timer und GCAttr() + // action ahead of cursor movement + // resets selection if applicable, triggers timer and GCAttr() void MoveCrsr( sal_Bool bWithSelect = sal_False ); - // Eingabefelder updaten + // update input fields sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); // update DropDown fields sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, ByteString* pWindowState = 0); - //"Handler" fuer Anederungen an der DrawView - fuer Controls. + //"Handler" for changes at DrawView - for controls. virtual void DrawSelChanged( ); - // springe zum Bookmark und setze die "Selections-Flags" wieder richtig + // jump to bookmark and set the "selctions-flags" correctly again sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart ); sal_Bool GotoMark( const ::rtl::OUString& rName ); - sal_Bool GoNextBookmark(); // sal_True, wenn's noch eine gab + sal_Bool GoNextBookmark(); // sal_True when there still was one sal_Bool GoPrevBookmark(); bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark); @@ -424,46 +422,44 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // on graphics sal_Bool SelectNextPrevHyperlink( sal_Bool bNext = sal_True ); - // Zugehoerige SwView ermitteln + // determine corresponding SwView const SwView& GetView() const { return rView; } SwView& GetView() { return rView; } - //Weil es sonst keiner macht, gibt es hier eine ExecMacro() + // Because nobody else is doing it, here is a ExecMacro() void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 ); - // rufe ins dunkle Basic/JavaScript + // call into the dark Basic/JavaScript sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, sal_Bool bCheckPtr = sal_False, SbxArray* pArgs = 0, const Link* pCallBack = 0 ); - // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem. - // Fuehre die vor definierten Aktionen aus. + // a click at the given field. the cursor is on it. + // execute the predefined actions. void ClickToField( const SwField& rFld ); void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER ); sal_Bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER ); inline sal_Bool IsInClickToEdit() const ; - // fall ein URL-Button selektiert ist, dessen URL returnen, ansonsten - // einen LeerString + // if a URL-Button is selected, return its URL; otherwise an empty string sal_Bool GetURLFromButton( String& rURL, String& rDescr ) const; void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - // die Core erzeugt eine Selektion, das SttSelect muss gerufen werden + // Core creates a selection, SttSelect has to be called virtual void NewCoreSelection(); virtual void ApplyViewOptions( const SwViewOption &rOpt ); - // autom. Update von Vorlagen + // automatic update of styles void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet); void AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet); - // Link fuers einfuegen von Bereichen uebers Drag&Drop/Clipboard + // link for inserting ranges via Drag&Drop/Clipboard DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); - //ctoren, der erstere ist eine Art kontrollierter copy ctor fuer weitere - //Sichten auf ein Dokument + // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, const SwViewOption *pViewOpt = 0); @@ -473,6 +469,21 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); String GetSelDescr() const; + SwNavigationMgr& GetNavigationMgr(); + void addCurrentPosition(); + sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, + sal_Bool bSelFrame = sal_True ); + sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr ); + void GotoOutline( sal_uInt16 nIdx ); + sal_Bool GotoOutline( const String& rName ); + sal_Bool GotoRegion( const String& rName ); + sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, + sal_uInt16 nSeqNo = 0 ); + sal_Bool GotoNextTOXBase( const String* pName = 0); + sal_Bool GotoTable( const String& rName ); + sal_Bool GotoFld( const SwFmtFld& rFld ); + const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); + private: SW_DLLPRIVATE void OpenMark(); @@ -498,7 +509,7 @@ private: {} } *pModeStack; - // Cursor bei PageUp / -Down mitnehmen + // carry cursor along when PageUp / -Down enum PageMove { MV_NO, @@ -529,6 +540,7 @@ private: } *pCrsrStack; SwView &rView; + SwNavigationMgr aNavigationMgr; Point aDest; sal_Bool bDestOnStack; @@ -536,21 +548,20 @@ private: SW_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect); SW_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False); - // ENDE Cursor bei PageUp / -Down mitnehmen + // take END cursor along when PageUp / -Down SW_DLLPRIVATE sal_Bool _SttWrd(); SW_DLLPRIVATE sal_Bool _EndWrd(); SW_DLLPRIVATE sal_Bool _NxtWrd(); SW_DLLPRIVATE sal_Bool _PrvWrd(); - // --> OD 2008-08-06 #i92468# + // #i92468# SW_DLLPRIVATE sal_Bool _NxtWrdForDelete(); SW_DLLPRIVATE sal_Bool _PrvWrdForDelete(); - // <-- SW_DLLPRIVATE sal_Bool _FwdSentence(); SW_DLLPRIVATE sal_Bool _BwdSentence(); sal_Bool _FwdPara(); SW_DLLPRIVATE sal_Bool _BwdPara(); - // Selektionen + // selections sal_Bool bIns :1; sal_Bool bInSelect :1; sal_Bool bExtMode :1; @@ -562,7 +573,7 @@ private: sal_Bool bSelWrd :1; sal_Bool bSelLn :1; sal_Bool bIsInClickToEdit:1; - sal_Bool bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen + sal_Bool bClearMark :1; // don't delete selection for ChartAutoPilot sal_Bool mbRetainSelection :1; // Do not remove selections Point aStart; @@ -570,7 +581,7 @@ private: SELECTFUNC fnLeaveSelect; - //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down zurueck. + // resets the cursor stack after movement by PageUp/-Down SW_DLLPRIVATE void _ResetCursorStack(); SW_DLLPRIVATE void SttDragDrop(Timer *); @@ -588,13 +599,12 @@ private: SW_DLLPRIVATE long ExtSelWrd(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long ExtSelLn(const Point *, sal_Bool bProp=sal_False ); - //Verschieben von Text aus Drag and Drop; Point ist - //Destination fuer alle Selektionen. + // move text from Drag and Drop; Point is destination for all selections. SW_DLLPRIVATE long MoveText(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long BeginFrmDrag(const Point *, sal_Bool bProp=sal_False ); - //nach SSize/Move eines Frames Update; Point ist Destination. + // after SSize/Move of a frame update; Point is destination. SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long SttLeaveSelect(const Point *, sal_Bool bProp=sal_False ); @@ -650,3 +660,5 @@ inline sal_Bool SwWrtShell::Is_FnDragEQBeginDrag() const } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/ui/inc/wtabsh.hxx index 5ab809821de8..fbb5b4d9c57f 100644 --- a/sw/source/ui/inc/wtabsh.hxx +++ b/sw/source/ui/inc/wtabsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index cc03de602400..b94199828613 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wview.hxx b/sw/source/ui/inc/wview.hxx index 2b36bbf97dce..c76d8bd7d5e1 100644 --- a/sw/source/ui/inc/wview.hxx +++ b/sw/source/ui/inc/wview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,10 +31,6 @@ #include "swdllapi.h" #include "view.hxx" -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwWebView: public SwView { protected: @@ -49,3 +46,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index 05880e12189e..29818393d9a2 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |