From 8792ec7b2129650777b7b4bfacaa7c13d923279b Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 19:06:16 +0100 Subject: Remove visual noise from include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/svtools/AccessibleBrowseBoxObjType.hxx | 8 +-- include/svtools/acceleratorexecute.hxx | 34 +++++------ include/svtools/accessiblefactory.hxx | 12 ++-- include/svtools/addresstemplate.hxx | 12 ++-- include/svtools/bindablecontrolhelper.hxx | 12 ++-- include/svtools/brwbox.hxx | 26 ++++----- include/svtools/brwhead.hxx | 2 +- include/svtools/calendar.hxx | 12 ++-- include/svtools/colorcfg.hxx | 2 +- include/svtools/colrdlg.hxx | 4 +- include/svtools/controldims.hrc | 12 ++-- include/svtools/ctrlbox.hxx | 20 +++---- include/svtools/ctrltool.hxx | 8 +-- include/svtools/dialogclosedlistener.hxx | 12 ++-- include/svtools/dialogcontrolling.hxx | 36 ++++++------ include/svtools/editbrowsebox.hxx | 76 ++++++++++++------------- include/svtools/editimplementation.hxx | 34 +++++------ include/svtools/extcolorcfg.hxx | 2 +- include/svtools/extensionlistbox.hxx | 8 +-- include/svtools/filectrl.hxx | 2 +- include/svtools/fileurlbox.hxx | 12 ++-- include/svtools/fileview.hxx | 4 +- include/svtools/fmtfield.hxx | 8 +-- include/svtools/fontsubstconfig.hxx | 4 +- include/svtools/genericunodialog.hxx | 12 ++-- include/svtools/headbar.hxx | 20 +++---- include/svtools/hyperlabel.hxx | 4 +- include/svtools/imageresourceaccess.hxx | 12 ++-- include/svtools/inetimg.hxx | 2 +- include/svtools/ivctrl.hxx | 2 +- include/svtools/langtab.hxx | 4 +- include/svtools/localresaccess.hxx | 12 ++-- include/svtools/menuoptions.hxx | 10 ++-- include/svtools/miscopt.hxx | 8 +-- include/svtools/optionsdrawinglayer.hxx | 34 +++++------ include/svtools/printoptions.hxx | 12 ++-- include/svtools/prnsetup.hxx | 8 +-- include/svtools/roadmap.hxx | 12 ++-- include/svtools/roadmapwizard.hxx | 12 ++-- include/svtools/scriptedtext.hxx | 4 +- include/svtools/scrwin.hxx | 8 +-- include/svtools/stdctrl.hxx | 4 +- include/svtools/stdmenu.hxx | 8 +-- include/svtools/stringtransfer.hxx | 16 +++--- include/svtools/svtools.hrc | 10 ++-- include/svtools/tabbar.hxx | 24 ++++---- include/svtools/table/defaultinputhandler.hxx | 12 ++-- include/svtools/table/gridtablerenderer.hxx | 12 ++-- include/svtools/table/tablecontrol.hxx | 16 +++--- include/svtools/table/tablecontrolinterface.hxx | 32 +++++------ include/svtools/table/tableinputhandler.hxx | 12 ++-- include/svtools/table/tablemodel.hxx | 28 ++++----- include/svtools/table/tablerenderer.hxx | 12 ++-- include/svtools/table/tablesort.hxx | 20 +++---- include/svtools/table/tabletypes.hxx | 8 +-- include/svtools/templatefoldercache.hxx | 12 ++-- include/svtools/toolpanel/decklayouter.hxx | 12 ++-- include/svtools/toolpanel/drawerlayouter.hxx | 12 ++-- include/svtools/toolpanel/paneltabbar.hxx | 12 ++-- include/svtools/toolpanel/refbase.hxx | 12 ++-- include/svtools/toolpanel/tabalignment.hxx | 8 +-- include/svtools/toolpanel/tabitemcontent.hxx | 8 +-- include/svtools/toolpanel/tablayouter.hxx | 12 ++-- include/svtools/toolpanel/toolpanel.hxx | 16 +++--- include/svtools/toolpanel/toolpaneldeck.hxx | 20 +++---- include/svtools/urlcontrol.hxx | 12 ++-- include/svtools/valueset.hxx | 8 +-- include/svtools/vclxaccessibleheaderbar.hxx | 4 +- include/svtools/wizardmachine.hxx | 22 +++---- include/svtools/wizdlg.hxx | 8 +-- include/svtools/xwindowitem.hxx | 4 +- 71 files changed, 467 insertions(+), 467 deletions(-) (limited to 'include/svtools') diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx index 72132edc3abf..2b4f45fae2e0 100644 --- a/include/svtools/AccessibleBrowseBoxObjType.hxx +++ b/include/svtools/AccessibleBrowseBoxObjType.hxx @@ -21,11 +21,11 @@ #ifndef INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX #define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX -// ============================================================================ + namespace svt { -// ============================================================================ + /** This enumeration contains a constant for each kind of accessible object of a BrowseBox. */ @@ -41,11 +41,11 @@ enum AccessibleBrowseBoxObjType BBTYPE_CHECKBOXCELL /// A cell with a checkbox. }; -// ============================================================================ + } // namespace svt -// ============================================================================ + #endif diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 81ddaabb4e74..8cf6d3fe8e08 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -45,7 +45,7 @@ struct TMutexInit ::osl::Mutex m_aLock; }; -//=============================================== + /** @descr implements a helper, which can be used to convert vcl key codes into awt key codes ... @@ -71,7 +71,7 @@ struct TMutexInit */ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit { - //------------------------------------------- + // const, types private: @@ -80,7 +80,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit remove this resource here if we go forwards to next major */ typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; - //------------------------------------------- + // member private: @@ -108,11 +108,11 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit remove this resource here if we go forwards to next major */ ::vcl::EventPoster m_aAsyncCallback; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short factory method to create new accelerator helper instance. @@ -138,11 +138,11 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit */ static AcceleratorExecute* createAcceleratorHelper(); - //--------------------------------------- + /** @short fight against inlining ... */ virtual ~AcceleratorExecute(); - //--------------------------------------- + /** @short init this instance. @descr It must be called as first method after creation. @@ -169,7 +169,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xEnv ); - //--------------------------------------- + /** @short trigger this accelerator. @descr The internal configuartions are used to find @@ -194,29 +194,29 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit * @return The command or an empty string if the key event could not be found. */ OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - //------------------------------------------- + // internal private: - //--------------------------------------- + /** @short allow creation of instances of this class by using our factory only! */ @@ -224,15 +224,15 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit AcceleratorExecute(const AcceleratorExecute& rCopy); void operator=(const AcceleratorExecute&) {}; - //--------------------------------------- + /** TODO document me */ SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - //--------------------------------------- + /** @deprecated replaced by internal class AsyncAccelExec ... remove this resource here if we go forwards to next major */ diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index cd8a65483bed..c09c90562cb4 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -44,10 +44,10 @@ class VCLXWindow; class TextEngine; class TextView; -//........................................................................ + namespace svt { -//........................................................................ + class ToolPanelDeck; class IToolPanelDeck; @@ -67,9 +67,9 @@ namespace svt */ typedef void* (SAL_CALL * GetSvtAccessibilityComponentFactory)( ); - //================================================================ + //= IAccessibleFactory - //================================================================ + class IAccessibleFactory : public ::rtl::IReference { public: @@ -175,9 +175,9 @@ namespace svt ~IAccessibleFactory() {} }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index a922ed3f1726..dc72b9e2f896 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -35,14 +35,14 @@ #include #include -// ....................................................................... + namespace svt { -// ....................................................................... - // =================================================================== + + // = AddressBookSourceDialog - // =================================================================== + struct AddressBookSourceDialogData; class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog { @@ -136,9 +136,9 @@ namespace svt }; -// ....................................................................... + } // namespace svt -// ....................................................................... + #endif // INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 2adca6c29f7e..9811b00891d7 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -23,14 +23,14 @@ #include #include -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= GraphicAccess - //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) from a resource */ @@ -43,9 +43,9 @@ namespace svt SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 4581337cf0ae..37d8d4fedbcc 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -47,9 +47,9 @@ namespace utl { class AccessibleStateSetHelper; } -// ------------------- + // - BrowseBox-Types - -// ------------------- + #define BROWSER_INVALIDID SAL_MAX_UINT16 #define BROWSER_ENDOFSELECTION (static_cast(SFX_ENDOFSELECTION)) @@ -122,9 +122,9 @@ typedef sal_uLong BrowserMode; #define BROWSER_MOVECOLUMNLEFT 756 #define BROWSER_MOVECOLUMNRIGHT 757 -// --------------- + // - BrowseEvent - -// --------------- + class BrowseEvent { @@ -148,9 +148,9 @@ public: const Rectangle& GetRect() const { return aRect; } }; -// --------------------- + // - BrowserMouseEvent - -// --------------------- + class BrowserMouseEvent: public MouseEvent, public BrowseEvent { @@ -162,9 +162,9 @@ public: const Rectangle& rRect ); }; -// -------------------------- + // - BrowserAcceptDropEvent - -// -------------------------- + class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent { @@ -173,9 +173,9 @@ public: BrowserAcceptDropEvent( BrowserDataWin* pWin, const AcceptDropEvent& rEvt ); }; -// --------------------------- + // - BrowserExecuteDropEvent - -// --------------------------- + class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent { @@ -184,9 +184,9 @@ public: BrowserExecuteDropEvent( BrowserDataWin* pWin, const ExecuteDropEvent& rEvt ); }; -// ------------- + // - BrowseBox - -// ------------- + // TODO // The whole selection thingie in this class is somewhat .... suspicious to me. @@ -816,7 +816,7 @@ private: using Window::ToTop; }; -//------------------------------------------------------------------- + inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const { return *reinterpret_cast(implGetDataFlavors()); diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 66edce82457b..17d547d2116a 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -25,7 +25,7 @@ class BrowseBox; -//=================================================================== + class SVT_DLLPUBLIC BrowserHeader: public HeaderBar { diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 6fad42f27c74..265621d6f90c 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -130,9 +130,9 @@ calls or by ending a selection. *************************************************************************/ -// ------------------ + // - Calendar types - -// ------------------ + #define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) #define WB_BOLDTEXT ((WinBits)0x00008000) @@ -149,9 +149,9 @@ calls or by ending a selection. #define DIB_BOLD ((sal_uInt16)0x0001) -// ------------ + // - Calendar - -// ------------ + typedef std::set IntDateSet; @@ -393,9 +393,9 @@ method in CalendarField and create an own calendar there ourselves. *************************************************************************/ -// ----------------- + // - CalendarField - -// ----------------- + class SVT_DLLPUBLIC CalendarField : public DateField { diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index ddc84850bf71..9d5f5d2ec8c5 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -27,7 +27,7 @@ #include #include -//----------------------------------------------------------------------------- + namespace svtools{ enum ColorConfigEntry { diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 061868277ab0..834150fe0f19 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -26,9 +26,9 @@ class Window; -// --------------- + // - ColorDialog - -// --------------- + namespace svtools { diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc index 2d01ddc668e1..4a0e54a7e310 100644 --- a/include/svtools/controldims.hrc +++ b/include/svtools/controldims.hrc @@ -20,17 +20,17 @@ #ifndef _SVT_CONTROLDIMS_HRC_ #define _SVT_CONTROLDIMS_HRC_ -// + // From: Dialogue Specification and Guidelines - Visual Design V1.3 // by Christian Jansen -// -// + + // Usage: -// ====== -// + + // all values have to be mapped by MAP_APPFONT -// + // Base #define RSC_BS_CHARHEIGHT 8 diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 6571dddde9ee..2d0f4abacce5 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -147,9 +147,9 @@ FontList; FontNameBox; FontStyleBox; FontSizeMenu *************************************************************************/ -// ---------------- + // - ColorListBox - -// ---------------- + class SVT_DLLPUBLIC ColorListBox : public ListBox { @@ -228,9 +228,9 @@ inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const return aColor; } -// --------------- + // - LineListBox - -// --------------- + /** Class computing border widths shared between Line style listbox and the @@ -401,9 +401,9 @@ inline void LineListBox::SetNone( const OUString& sNone ) m_sNone = sNone; } -// --------------- + // - FontNameBox - -// --------------- + class SVT_DLLPUBLIC FontNameBox : public ComboBox { @@ -438,9 +438,9 @@ private: FontNameBox& operator =( const FontNameBox& ); }; -// ---------------- + // - FontStyleBox - -// ---------------- + class SVT_DLLPUBLIC FontStyleBox : public ComboBox { @@ -475,9 +475,9 @@ inline void FontStyleBox::SetText( const OUString& rText ) ComboBox::SetText( rText ); } -// --------------- + // - FontSizeBox - -// --------------- + class SVT_DLLPUBLIC FontSizeBox : public MetricBox { diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 65b19e30dcd1..cd06bce505a8 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -132,9 +132,9 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. *************************************************************************/ -// ------------ + // - FontList - -// ------------ + #define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) @@ -212,9 +212,9 @@ private: }; -// ----------------- + // - FontSizeNames - -// ----------------- + class SVT_DLLPUBLIC FontSizeNames { diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index dcf973418617..b42a51be03fd 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -25,14 +25,14 @@ #include #include -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= ODialogClosedListener - //===================================================================== + /** C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener */ @@ -60,9 +60,9 @@ namespace svt virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 269c8f6bdab6..c9875b4bac55 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -28,14 +28,14 @@ #include #include -//........................................................................ + namespace svt { -//........................................................................ - //===================================================================== + + //= IWindowOperator - //===================================================================== + /** an abstract interface for operating on a ->Window */ class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator @@ -55,9 +55,9 @@ namespace svt }; typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; - //===================================================================== + //= IWindowEventFilter - //===================================================================== + /** an abstract interface for deciding whether a ->VclWindowEvent is worth paying attention to */ @@ -70,9 +70,9 @@ namespace svt }; typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; - //===================================================================== + //= DialogController - //===================================================================== + struct DialogController_Data; /** a class controlling interactions between dialog controls @@ -125,9 +125,9 @@ namespace svt }; typedef ::boost::shared_ptr< DialogController > PDialogController; - //===================================================================== + //= ControlDependencyManager - //===================================================================== + struct ControlDependencyManager_Data; /** helper class for managing control dependencies @@ -185,9 +185,9 @@ namespace svt ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented }; - //===================================================================== + //= EnableOnCheck - //===================================================================== + /** a helper class implementing the ->IWindowOperator interface, which enables a dependent window depending on the check state of an instigator window. @@ -221,9 +221,9 @@ namespace svt } }; - //===================================================================== + //= FilterForRadioOrCheckToggle - //===================================================================== + /** a helper class implementing the ->IWindowEventFilter interface, which filters for radio buttons or check boxes being toggled. @@ -251,9 +251,9 @@ namespace svt } }; - //===================================================================== + //= RadioDependentEnabler - //===================================================================== + /** a ->DialogController derivee which enables or disables its dependent windows, depending on the check state of a radio button. @@ -285,9 +285,9 @@ namespace svt } }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_DIALOGCONTROLLING_HXX diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 900222d8c60b..d02a83b85162 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -35,7 +35,7 @@ #include #include -//================================================================== + // EditBrowseBoxFlags (EBBF) #define EBBF_NONE ((sal_Int32)0x0000) @@ -65,22 +65,22 @@ /// @deprecated #define EBBF_NOROWPICTURE EBBF_NO_HANDLE_COLUMN_CONTENT -//================================================================== + class Edit; class SpinField; class FormattedField; -// ....................................................................... + namespace svt { -// ....................................................................... + class CellControllerRef; - //================================================================== + //= CellController - //================================================================== + class SVT_DLLPUBLIC CellController : public SvRefBase { friend class EditBrowseBox; @@ -118,9 +118,9 @@ namespace svt SV_DECL_IMPL_REF(CellController); - //================================================================== + //= IEditImplementation - //================================================================== + class SVT_DLLPUBLIC IEditImplementation { public: @@ -150,9 +150,9 @@ namespace svt virtual void SetModifyHdl( const Link& _rLink ) = 0; }; - //================================================================== + //= GenericEditImplementation - //================================================================== + template class GenericEditImplementation : public IEditImplementation { @@ -188,9 +188,9 @@ namespace svt #include - //================================================================== + //= MultiLineTextCell - //================================================================== + /** a multi line edit which can be used in a cell of a EditBrowseBox */ class SVT_DLLPUBLIC MultiLineTextCell : public MultiLineEdit @@ -212,9 +212,9 @@ namespace svt sal_Bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; - //================================================================== + //= concrete edit implementations - //================================================================== + typedef GenericEditImplementation< Edit > EditImplementation; typedef GenericEditImplementation< MultiLineTextCell > MultiLineEditImplementation_Base; @@ -229,9 +229,9 @@ namespace svt virtual OUString GetSelected( LineEnd aSeparator ) const; }; - //================================================================== + //= EditCellController - //================================================================== + class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; @@ -255,9 +255,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= SpinCellController - //================================================================== + class SVT_DLLPUBLIC SpinCellController : public CellController { public: @@ -274,9 +274,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= CheckBoxControl - //================================================================== + class SVT_DLLPUBLIC CheckBoxControl : public Control { CheckBox* pBox; @@ -307,9 +307,9 @@ namespace svt DECL_LINK( OnClick, void* ); }; - //================================================================== + //= CheckBoxCellController - //================================================================== + class SVT_DLLPUBLIC CheckBoxCellController : public CellController { public: @@ -326,9 +326,9 @@ namespace svt virtual sal_Bool WantMouseEvent() const; }; - //================================================================== + //= ComboBoxControl - //================================================================== + class SVT_DLLPUBLIC ComboBoxControl : public ComboBox { friend class ComboBoxCellController; @@ -340,9 +340,9 @@ namespace svt virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //================================================================== + //= ComboBoxCellController - //================================================================== + class SVT_DLLPUBLIC ComboBoxCellController : public CellController { public: @@ -359,9 +359,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= ListBoxControl - //================================================================== + class SVT_DLLPUBLIC ListBoxControl : public ListBox { friend class ListBoxCellController; @@ -373,9 +373,9 @@ namespace svt virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //================================================================== + //= ListBoxCellController - //================================================================== + class SVT_DLLPUBLIC ListBoxCellController : public CellController { public: @@ -392,9 +392,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= FormattedFieldCellController - //================================================================== + class SVT_DLLPUBLIC FormattedFieldCellController : public EditCellController { public: @@ -404,9 +404,9 @@ namespace svt virtual void CommitModifications(); }; - //================================================================== + //= EditBrowserHeader - //================================================================== + class SVT_DLLPUBLIC EditBrowserHeader : public BrowserHeader { public: @@ -417,9 +417,9 @@ namespace svt virtual void DoubleClick(); }; - //================================================================== + //= EditBrowseBox - //================================================================== + class EditBrowseBoxImpl; class SVT_DLLPUBLIC EditBrowseBox: public BrowseBox { @@ -675,9 +675,9 @@ namespace svt DECL_DLLPRIVATE_LINK(CellModifiedHdl, void* ); }; -// ....................................................................... + } // namespace svt -// ....................................................................... + #undef SVTOOLS_IN_EDITBROWSEBOX_HXX #endif // INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index c6de2b783113..96eaf50964a0 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -21,21 +21,21 @@ #error "not to be included directly!" #endif -//---------------------------------------------------------------------- + template GenericEditImplementation< EDIT >::GenericEditImplementation( EDIT& _rEdit ) :m_rEdit( _rEdit ) { } -//---------------------------------------------------------------------- + template Control& GenericEditImplementation< EDIT >::GetControl() { return m_rEdit; } -//---------------------------------------------------------------------- + template OUString GenericEditImplementation< EDIT >::GetText( LineEnd ) const { @@ -43,98 +43,98 @@ OUString GenericEditImplementation< EDIT >::GetText( LineEnd ) const return m_rEdit.GetText( ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetText( const OUString& _rStr ) { m_rEdit.SetText( _rStr ); } -//---------------------------------------------------------------------- + template Selection GenericEditImplementation< EDIT >::GetSelection() const { return m_rEdit.GetSelection( ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetSelection( const Selection& _rSelection ) { m_rEdit.SetSelection( _rSelection ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetReadOnly( sal_Bool bReadOnly ) { m_rEdit.SetReadOnly( bReadOnly ); } -//---------------------------------------------------------------------- + template sal_Bool GenericEditImplementation< EDIT >::IsReadOnly() const { return m_rEdit.IsReadOnly(); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::ReplaceSelected( const OUString& _rStr ) { m_rEdit.ReplaceSelected( _rStr ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::DeleteSelected() { m_rEdit.DeleteSelected(); } -//---------------------------------------------------------------------- + template OUString GenericEditImplementation< EDIT >::GetSelected( LineEnd ) const { return m_rEdit.GetSelected( ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetMaxTextLen( sal_Int32 _nMaxLen ) { m_rEdit.SetMaxTextLen( _nMaxLen ); } -//---------------------------------------------------------------------- + template sal_Int32 GenericEditImplementation< EDIT >::GetMaxTextLen() const { return m_rEdit.GetMaxTextLen( ); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetModified() { m_rEdit.SetModifyFlag(); } -//---------------------------------------------------------------------- + template sal_Bool GenericEditImplementation< EDIT >::IsModified() const { return m_rEdit.IsModified(); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::ClearModified() { m_rEdit.ClearModifyFlag(); } -//---------------------------------------------------------------------- + template void GenericEditImplementation< EDIT >::SetModifyHdl( const Link& _rLink ) { diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index afafa1dc416d..cc20bea1a09f 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -26,7 +26,7 @@ #include #include -//----------------------------------------------------------------------------- + namespace svtools{ class ExtendedColorConfig_Impl; diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index a0421ce2cb7e..42a7523d9b5a 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -23,12 +23,12 @@ #include #include -// ============================================================================ + namespace svt { -// ============================================================================ + /** This abstract class provides methods to implement an extension list box. This header is needed for the automatic test tool @@ -87,11 +87,11 @@ public: */ virtual void select( const OUString & sName ) = 0; }; -// ============================================================================ + } // namespace svt -// ============================================================================ + #endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 2ee919d80695..a79fb20b37c7 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -85,7 +85,7 @@ public: void SetReadOnly( sal_Bool bReadOnly = sal_True ) { maEdit.SetReadOnly( bReadOnly ); } sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); } - //------ + //use this to manipulate the dialog bevore executing it: void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 2d113cfb0450..1ba68e71f1dd 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -23,14 +23,14 @@ #include #include -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= FileURLBox - //===================================================================== + class SVT_DLLPUBLIC FileURLBox : public SvtURLBox { private: @@ -59,9 +59,9 @@ namespace svt void DisplayURL( const OUString& _rURL ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_FILEURLBOX_HXX diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index e617aac3eaa3..25f3a54c839a 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -211,9 +211,9 @@ struct SvtContentEntry namespace svtools { -// ----------------------------------------------------------------------- + // QueryDeleteDlg_Impl -// ----------------------------------------------------------------------- + enum QueryDeleteResult_Impl { diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index aa7d36af17c9..9c474d8be22c 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -32,7 +32,7 @@ typedef sal_uInt16 FORMAT_CHANGE_TYPE; #define FCT_PRECISION 0x02 // a new precision was set #define FCT_THOUSANDSSEP 0x03 // the thousands separator setting changed -//------------------------------------------------------------------------------ + class SVT_DLLPUBLIC FormattedField : public SpinField { private: @@ -259,7 +259,7 @@ protected: virtual void ReFormat(); }; -//------------------------------------------------------------------------------ + class SVT_DLLPUBLIC DoubleNumericField : public FormattedField { protected: @@ -282,11 +282,11 @@ protected: void ResetConformanceTester(); }; -//============================================================================== + #define FCT_CURRENCY_SYMBOL 0x10 #define FCT_CURRSYM_POSITION 0x20 -//------------------------------------------------------------------------------ + class DoubleCurrencyField : public FormattedField { OUString m_sCurrencySymbol; diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index e2c38d5f77b0..053be31409b2 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -24,7 +24,7 @@ struct SvtFontSubstConfig_Impl; -//----------------------------------------------------------------------------- + struct SubstitutionStruct { OUString sFont; @@ -32,7 +32,7 @@ struct SubstitutionStruct sal_Bool bReplaceAlways; sal_Bool bReplaceOnScreenOnly; }; -//----------------------------------------------------------------------------- + class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem { sal_Bool bIsEnabled; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 360f8e6dbe42..373e2a4aa3c2 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -43,12 +43,12 @@ class Dialog; class Window; class VclWindowEvent; -//......................................................................... + namespace svt { -//......................................................................... - //========================================================================= + + #define UNODIALOG_PROPERTY_ID_TITLE 1 #define UNODIALOG_PROPERTY_ID_PARENT 2 @@ -56,7 +56,7 @@ namespace svt #define UNODIALOG_PROPERTY_PARENT "ParentWindow" - //========================================================================= + typedef ::cppu::WeakImplHelper3 < com::sun::star::ui::dialogs::XExecutableDialog , com::sun::star::lang::XServiceInfo , com::sun::star::lang::XInitialization @@ -176,9 +176,9 @@ namespace svt ::osl::MutexGuard m_aGuard; }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 3bb3f0b70e04..f4560fb08149 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -182,23 +182,23 @@ class ImplHeadItem; typedef ::std::vector< ImplHeadItem* > ImplHeadItemList; -// ----------- + // - WinBits - -// ----------- + #define WB_BOTTOMBORDER ((WinBits)0x0400) #define WB_BUTTONSTYLE ((WinBits)0x0800) #define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER) -// --------------------- + // - HeaderBarItemBits - -// --------------------- + typedef sal_uInt16 HeaderBarItemBits; -// ---------------------------- + // - Bits fuer HeaderBarItems - -// ---------------------------- + #define HIB_LEFT ((HeaderBarItemBits)0x0001) #define HIB_CENTER ((HeaderBarItemBits)0x0002) @@ -217,9 +217,9 @@ typedef sal_uInt16 HeaderBarItemBits; #define HIB_USERDRAW ((HeaderBarItemBits)0x4000) #define HIB_STDSTYLE (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE) -// ------------------- + // - HeaderBar-Types - -// ------------------- + #define HEADERBAR_APPEND ((sal_uInt16)0xFFFF) #define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) @@ -227,9 +227,9 @@ typedef sal_uInt16 HeaderBarItemBits; #define HEADERBAR_TEXTOFF 2 -// ------------- + // - HeaderBar - -// ------------- + class VCLXHeaderBar; diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index bc60e4a005b1..502a1bb7a2c6 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -27,10 +27,10 @@ #define LABELBASEMAPHEIGHT 8 -//......................................................................... + namespace svt { -//......................................................................... + class HyperLabelImpl; diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index c7bea711dbc4..93287db5a671 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -26,14 +26,14 @@ #include class SvStream; -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= GraphicAccess - //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) from a resource */ @@ -72,9 +72,9 @@ namespace svt ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // DBA14_ INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index 5c19d429d6a5..f9b86f16f9d2 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -24,7 +24,7 @@ class SvData; class SotDataObject; -//========================================================================= + class INetImage { diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 6b8e904d24ee..a51693e048ba 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -179,7 +179,7 @@ public: sal_uInt16 GetSubItem() const { return nSubItem; } }; -//################################################################################################################################### + /* Window-Bits: WB_ICON // Text unter dem Icon diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 8c3163f6030f..509755d6dbcc 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.hxx @@ -24,9 +24,9 @@ #include #include -//======================================================================== + // class SvtLanguageTable -//======================================================================== + class SVT_DLLPUBLIC SvtLanguageTable : public ResStringArray { diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index 61baf4620d9d..43368b4c6899 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -24,14 +24,14 @@ #include #include -//......................................................................... + namespace svt { -//......................................................................... - //========================================================================= + + //= OLocalResourceAccess - //========================================================================= + /** helper class for acessing local resources */ class OLocalResourceAccess : public Resource @@ -66,9 +66,9 @@ namespace svt } }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_LOCALRESACCESS_HXX diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 12291879a92a..788dcc250723 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -25,7 +25,7 @@ #include #include -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -35,7 +35,7 @@ class Link; class SvtMenuOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about menu features @descr - @@ -49,7 +49,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -71,7 +71,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." @descr These options describe internal states to enable/disable features of installed office. @@ -93,7 +93,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 14ff1168bf29..8d0e1db477b0 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -26,7 +26,7 @@ #include #include -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -36,7 +36,7 @@ class SvtMiscOptions_Impl; class Link; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about misc group @descr - @@ -51,7 +51,7 @@ class Link; class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -115,7 +115,7 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index e8e4d2e7e5ed..101ca4c06b7e 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -26,11 +26,11 @@ #include #include -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -39,7 +39,7 @@ class SvtOptionsDrawinglayer_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about startup features @descr - @@ -51,17 +51,17 @@ class SvtOptionsDrawinglayer_Impl; class SVT_DLLPUBLIC SvtOptionsDrawinglayer { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -80,11 +80,11 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer SvtOptionsDrawinglayer(); ~SvtOptionsDrawinglayer(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Drawinglayer/..." @descr These options describe internal states to enable/disable features of installed office. @@ -159,13 +159,13 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer void SetTransparentSelection( sal_Bool bState ); void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class use his own static mutex to be threadsafe. We create a static mutex only for one ime and use at different times. @@ -179,9 +179,9 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer *//*-*****************************************************************************************************/ SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index 30a14bf3e095..2d90abfd30e9 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -28,9 +28,9 @@ class SvtPrintOptions_Impl; -// ----------------------- + // - SvtBasePrintOptions - -// ----------------------- + class PrinterOptions; @@ -81,9 +81,9 @@ public: void SetPrinterOptions( const PrinterOptions& rOptions ); }; -// --------------------- + // - SvtPrinterOptions - -// --------------------- + class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions { @@ -98,9 +98,9 @@ public: virtual ~SvtPrinterOptions(); }; -// ----------------------- + // - SvtPrintFileOptions - -// ----------------------- + class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions { diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 1d43f2f39a24..b0dbf621dac1 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -33,9 +33,9 @@ class Printer; class QueueInfo; -// ---------------------- + // - PrinterSetupDialog - -// ---------------------- + class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog { @@ -73,9 +73,9 @@ public: void SetOptionsHdl( const Link& rLink ); }; -// ------------------------------------- + // - Helper functions for print dialog - -// ------------------------------------- + #define IMPL_PRINTDLG_STATUS_UPDATE 15000 diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index 1febec3cbb4a..154a392f7215 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.hxx @@ -29,10 +29,10 @@ class Bitmap; -//......................................................................... + namespace svt { -//......................................................................... + struct RoadmapTypes { @@ -44,9 +44,9 @@ namespace svt class RoadmapImpl; class RoadmapItem; - //===================================================================== + //= Roadmap - //===================================================================== + class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes { protected: @@ -114,9 +114,9 @@ namespace svt void UpdatefollowingHyperLabels( ItemIndex _Index ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 62d4aa93800e..03ec7696618d 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -23,10 +23,10 @@ #include #include -//........................................................................ + namespace svt { -//........................................................................ + struct RoadmapWizardImpl; class RoadmapWizard; @@ -39,9 +39,9 @@ namespace svt typedef TabPage* (* RoadmapPageFactory)( RoadmapWizard& ); }; - //==================================================================== + //= RoadmapWizard - //==================================================================== + /** is - no, not a wizard for a roadmap, but the base class for wizards supporting a roadmap. @@ -237,9 +237,9 @@ protected: SVT_DLLPRIVATE void impl_construct(); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // OOO_ INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 1b2c4d9aa72b..6b8248c99a73 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -31,7 +31,7 @@ class Size; class Point; -//_____________________________________________________________________________ + /** This class provides drawing text with different script types on any output devices. @@ -88,7 +88,7 @@ public: void DrawText( const Point& _rPos ); }; -//_____________________________________________________________________________ + #endif diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 53f83b5c2f01..47eb307d481a 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -26,9 +26,9 @@ class DataChangedEvent; -// ------------------------- + // - ScrollableWindow-Type - -// ------------------------- + typedef sal_uInt16 ScrollableWindowFlags; @@ -37,9 +37,9 @@ typedef sal_uInt16 ScrollableWindowFlags; #define SCRWIN_HCENTER 4 #define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) -// -------------------- + // - ScrollableWindow - -// -------------------- + class SVT_DLLPUBLIC ScrollableWindow: public Window { diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 3dd05675fa56..56643816dd56 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -25,9 +25,9 @@ #include #include -// ------------- + // - FixedInfo - -// ------------- + class SVT_DLLPUBLIC FixedInfo : public FixedText { diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index fd0f18674290..b6e23763065b 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -97,9 +97,9 @@ FontList; FontNameMenu; FontSizeBox *************************************************************************/ -// ---------------- + // - FontNameMenu - -// ---------------- + class SVT_DLLPUBLIC FontNameMenu : public PopupMenu { @@ -126,9 +126,9 @@ public: const Link& GetHighlightHdl() const { return maHighlightHdl; } }; -// ---------------- + // - FontSizeMenu - -// ---------------- + class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu { diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 12d6fdaf204a..dce78ebd184e 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -23,14 +23,14 @@ #include #include -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= OStringTransferable - //==================================================================== + class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper { protected: @@ -45,9 +45,9 @@ namespace svt virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); }; - //==================================================================== + //= OStringTransfer - //==================================================================== + class OStringTransfer { public: @@ -67,9 +67,9 @@ namespace svt SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_STRINGTRANSFER_HXX diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index e11c5aea9a8f..83ecedb860d2 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -24,7 +24,7 @@ #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) -//............................................................................. + // various unsorted stuff #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) @@ -253,19 +253,19 @@ -//............................................................................. + // dialogs #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) -//............................................................................. + // bitmaps #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3) #define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4) -//............................................................................. + // image lists #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) @@ -284,7 +284,7 @@ #define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) #define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) -//............................................................................. + // images #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) #define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1) diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 70f6afee0b6e..8bdc26a66911 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -35,9 +35,9 @@ class TabBarEdit; struct ImplTabBarItem; typedef ::std::vector< ImplTabBarItem* > ImplTabBarList; -// ----------------- + // - Dokumentation - -// ----------------- + /* @@ -288,9 +288,9 @@ Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick ueber einem bzw. ueber welchem Item durchgefuehrt wurde. */ -// ----------- + // - WinBits - -// ----------- + #define WB_RANGESELECT ((WinBits)0x00200000) #define WB_MULTISELECT ((WinBits)0x00400000) @@ -300,29 +300,29 @@ ueber einem bzw. ueber welchem Item durchgefuehrt wurde. #define WB_INSERTTAB ((WinBits)0x40000000) #define WB_STDTABBAR WB_BORDER -// ------------------ + // - TabBarPageBits - -// ------------------ + typedef sal_uInt16 TabBarPageBits; -// ------------------------- + // - Bits fuer TabBarPages - -// ------------------------- + #define TPB_SPECIAL ((TabBarPageBits)0x0001) -// ---------------- + // - TabBar-Types - -// ---------------- + #define TABBAR_RENAMING_YES ((long)sal_True) #define TABBAR_RENAMING_NO ((long)sal_False) #define TABBAR_RENAMING_CANCEL ((long)2) -// ---------- + // - TabBar - -// ---------- + struct TabBar_Impl; struct ImplTabBarItem; diff --git a/include/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx index 34f93b4d9424..11544fd5369c 100644 --- a/include/svtools/table/defaultinputhandler.hxx +++ b/include/svtools/table/defaultinputhandler.hxx @@ -25,16 +25,16 @@ #include -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... + struct DefaultInputHandler_Impl; - //================================================================================================================== + //= DefaultInputHandler - //================================================================================================================== + class DefaultInputHandler : public ITableInputHandler { private: @@ -56,9 +56,9 @@ namespace svt { namespace table virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ); }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX diff --git a/include/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx index dda6b6ff3982..6842fc33cda2 100644 --- a/include/svtools/table/gridtablerenderer.hxx +++ b/include/svtools/table/gridtablerenderer.hxx @@ -24,16 +24,16 @@ #include -//........................................................................ + namespace svt { namespace table { -//........................................................................ + struct GridTableRenderer_Impl; - //==================================================================== + //= GridTableRenderer - //==================================================================== + /** a default implementation for the ->ITableRenderer interface This class is able to paint a table grid, table headers, and cell @@ -112,9 +112,9 @@ namespace svt { namespace table OUString const & i_text ); }; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index 73f713d67b20..d8eee465d096 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -31,17 +31,17 @@ #include #include -//........................................................................ + namespace svt { namespace table { -//........................................................................ + class TableControl_Impl; - //==================================================================== + //= TableControl - //==================================================================== + /** a basic control which manages table-like data, i.e. a number of cells organized in m rows and n columns. @@ -164,7 +164,7 @@ namespace svt { namespace table void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue ); void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue ); - // ............................................................................................................. + // IAccessibleTable virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); @@ -198,7 +198,7 @@ namespace svt { namespace table virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const; virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ); virtual void SelectAllRows( bool const i_select ); - // ............................................................................................................. + private: DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* ); @@ -209,9 +209,9 @@ namespace svt { namespace table TableControl& operator=( const TableControl& ); // never implemented }; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX diff --git a/include/svtools/table/tablecontrolinterface.hxx b/include/svtools/table/tablecontrolinterface.hxx index 362f5e82cad5..553ce4078729 100644 --- a/include/svtools/table/tablecontrolinterface.hxx +++ b/include/svtools/table/tablecontrolinterface.hxx @@ -29,14 +29,14 @@ class Pointer; -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... - //================================================================================================================== + + //= TableControlAction - //================================================================================================================== + enum TableControlAction { /// moves the cursor in the table control one row up, if possible, by keeping the current column @@ -78,18 +78,18 @@ namespace svt { namespace table invalidTableControlAction }; - //================================================================================================================== + //= TableCellArea - //================================================================================================================== + enum TableCellArea { CellContent, ColumnDivider }; - //================================================================================================================== + //= TableCell - //================================================================================================================== + struct TableCell { ColPos nColumn; @@ -111,9 +111,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= ColumnMetrics - //================================================================================================================== + struct ColumnMetrics { /** the start of the column, in pixels. Might be negative, in case the column is scrolled out of the visible @@ -147,9 +147,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= TableArea - //================================================================================================================== + enum TableArea { TableAreaColumnHeaders, @@ -158,9 +158,9 @@ namespace svt { namespace table TableAreaAll }; - //================================================================================================================== + //= ITableControl - //================================================================================================================== + /** defines a callback interface to be implemented by a concrete table control */ class SAL_NO_VTABLE ITableControl @@ -248,9 +248,9 @@ namespace svt { namespace table virtual ~ITableControl() {}; }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx index 1806dfd6b866..b08cf9908e17 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/include/svtools/table/tableinputhandler.hxx @@ -28,16 +28,16 @@ class HelpEvent; class CommandEvent; class NotifyEvent; -//........................................................................ + namespace svt { namespace table { -//........................................................................ + class ITableControl; - //==================================================================== + //= ITableInputHandler - //==================================================================== + /** interface for components handling input in a ->TableControl */ class ITableInputHandler @@ -64,9 +64,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableInputHandler > PTableInputHandler; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 0711bb0b6ff9..67a0e16b9034 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -37,15 +37,15 @@ #include #include -//........................................................................ + namespace svt { namespace table { -//........................................................................ - //==================================================================== + + //= ScrollbarVisibility - //==================================================================== + enum ScrollbarVisibility { /** enumeration value denoting that a scrollbar should never be visible, even @@ -61,9 +61,9 @@ namespace svt { namespace table ScrollbarShowAlways }; - //==================================================================== + //= ITableModelListener - //==================================================================== + typedef sal_Int32 ColumnAttributeGroup; #define COL_ATTRS_NONE (0x00000000) /// denotes column attributes related to the width of the column @@ -73,9 +73,9 @@ namespace svt { namespace table /// denotes the entirety of column attributes #define COL_ATTRS_ALL (0x7FFFFFFF) - //==================================================================== + //= ITableModelListener - //==================================================================== + /** declares an interface to be implemented by components interested in changes in an ->ITableModel */ @@ -159,9 +159,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableModelListener > PTableModelListener; - //==================================================================== + //= IColumnModel - //==================================================================== + /** interface to be implemented by table column models */ class SAL_NO_VTABLE IColumnModel @@ -313,9 +313,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< IColumnModel > PColumnModel; - //==================================================================== + //= ITableModel - //==================================================================== + /** declares the interface to implement by an abtract table model */ class SAL_NO_VTABLE SVT_DLLPUBLIC ITableModel @@ -534,9 +534,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableModel > PTableModel; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index bbd7d85be31b..a365f33b6d56 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -28,14 +28,14 @@ class StyleSettings; -//........................................................................ + namespace svt { namespace table { -//........................................................................ - //==================================================================== + + //= ITableRenderer - //==================================================================== + /** interface to implement by components rendering a ->TableControl */ class SAL_NO_VTABLE ITableRenderer @@ -278,9 +278,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableRenderer > PTableRenderer; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx index bb0bf04c6473..493f7c199704 100644 --- a/include/svtools/table/tablesort.hxx +++ b/include/svtools/table/tablesort.hxx @@ -22,23 +22,23 @@ #include -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... - //================================================================================================================== + + //= ColumnSortDirection - //================================================================================================================== + enum ColumnSortDirection { ColumnSortAscending, ColumnSortDescending }; - //================================================================================================================== + //= ColumnSort - //================================================================================================================== + struct ColumnSort { ColPos nColumnPos; @@ -57,9 +57,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= ITableDataSort - //================================================================================================================== + /** provides sorting functionality for the datta underlying an ITableModel */ class SAL_NO_VTABLE ITableDataSort @@ -80,9 +80,9 @@ namespace svt { namespace table ~ITableDataSort() {} }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX diff --git a/include/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx index 8e3ba7d9ae82..8c7258f71a4f 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/include/svtools/table/tabletypes.hxx @@ -22,10 +22,10 @@ #include -//........................................................................ + namespace svt { namespace table { -//........................................................................ + /// a value denoting the size of a table typedef sal_Int32 TableSize; @@ -55,9 +55,9 @@ namespace svt { namespace table #define ROW_INVALID ((::svt::table::RowPos)-2) -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index 61c9f611d60b..b6f8ffd6b0a6 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -23,14 +23,14 @@ #include #include -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= TemplateFolderCache - //===================================================================== + class TemplateFolderCacheImpl; /** allows to cache the state of the template directories of OOo

Usually, this class is used together with an instance of a the @@ -93,9 +93,9 @@ namespace svt void storeState( sal_Bool _bForceRetrieval = sal_False ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX diff --git a/include/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx index 9b593d434836..11345e7106a3 100644 --- a/include/svtools/toolpanel/decklayouter.hxx +++ b/include/svtools/toolpanel/decklayouter.hxx @@ -32,14 +32,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class Rectangle; class Point; -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= IDeckLayouter - //==================================================================== + class IDeckLayouter : public ::rtl::IReference { public: @@ -90,9 +90,9 @@ namespace svt typedef ::rtl::Reference< IDeckLayouter > PDeckLayouter; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_DECKLAYOUTER_HXX diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index a086549568f9..c5867111db14 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -27,18 +27,18 @@ #include -//...................................................................................................................... + namespace svt { -//...................................................................................................................... + class ToolPanelViewShell; class ToolPanelDrawer; typedef ::boost::shared_ptr< ToolPanelDrawer > PToolPanelDrawer; - //================================================================================================================== + //= ToolPanelDrawer - //================================================================================================================== + /** a class which implements a tool panel selector in the form of the classical drawers */ class SVT_DLLPUBLIC DrawerDeckLayouter :public RefBase @@ -88,9 +88,9 @@ private: ::boost::optional< size_t > m_aLastKnownActivePanel; }; -//...................................................................................................................... + } // namespace svt -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TOOLPANEL_DRAWERLAYOUTER_HXX diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 3506fb71d4bb..35323d7aee6e 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -31,17 +31,17 @@ class PushButton; -//........................................................................ + namespace svt { -//........................................................................ + class PanelTabBar_Impl; class IToolPanelDeck; - //==================================================================== + //= PanelTabBar - //==================================================================== + /** a tab bar for selecting panels At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal @@ -87,9 +87,9 @@ namespace svt ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_PANELTABBAR_HXX diff --git a/include/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx index 06afe1fa06a6..7de482b37693 100644 --- a/include/svtools/toolpanel/refbase.hxx +++ b/include/svtools/toolpanel/refbase.hxx @@ -24,14 +24,14 @@ #include -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= RefBase - //==================================================================== + class SVT_DLLPUBLIC RefBase : public ::rtl::IReference { protected: @@ -66,9 +66,9 @@ namespace svt return RefBase::release(); \ } -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_REFBASE_HXX diff --git a/include/svtools/toolpanel/tabalignment.hxx b/include/svtools/toolpanel/tabalignment.hxx index 6dae547b758b..e75ffb83339f 100644 --- a/include/svtools/toolpanel/tabalignment.hxx +++ b/include/svtools/toolpanel/tabalignment.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX #define INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX -//........................................................................ + namespace svt { -//........................................................................ + enum TabAlignment { @@ -33,9 +33,9 @@ namespace svt TABS_BOTTOM }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX diff --git a/include/svtools/toolpanel/tabitemcontent.hxx b/include/svtools/toolpanel/tabitemcontent.hxx index 22e33f7898a8..5198cdd349f7 100644 --- a/include/svtools/toolpanel/tabitemcontent.hxx +++ b/include/svtools/toolpanel/tabitemcontent.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX #define INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX -//........................................................................ + namespace svt { -//........................................................................ + enum TabItemContent { @@ -34,9 +34,9 @@ namespace svt TABITEM_AUTO }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index b7f762f337ab..72e234ea5fc1 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -32,18 +32,18 @@ class Window; -//........................................................................ + namespace svt { -//........................................................................ + class IToolPanelDeck; struct TabDeckLayouter_Data; - //==================================================================== + //= TabDeckLayouter - //==================================================================== + class SVT_DLLPUBLIC TabDeckLayouter :public RefBase ,public IDeckLayouter ,public ::boost::noncopyable @@ -90,9 +90,9 @@ namespace svt ::std::auto_ptr< TabDeckLayouter_Data > m_pData; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABLAYOUTER_HXX diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index d0a21a951889..6ecb29da3844 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -34,14 +34,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= IToolPanel - //==================================================================== + /** abstract interface for a single tool panel */ class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference @@ -111,9 +111,9 @@ namespace svt typedef ::rtl::Reference< IToolPanel > PToolPanel; - //==================================================================== + //= ToolPanelBase - //==================================================================== + /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface, but still being abstract */ @@ -129,9 +129,9 @@ namespace svt DECLARE_IREFERENCE() }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANEL_HXX diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 1bc2026183c6..7423d75e0488 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -29,17 +29,17 @@ #include #include -//........................................................................ + namespace svt { -//........................................................................ + class ToolPanelCollection; class ToolPanelDeck_Impl; - //==================================================================== + //= IToolPanelDeckListener - //==================================================================== + class SAL_NO_VTABLE IToolPanelDeckListener { public: @@ -71,9 +71,9 @@ namespace svt ~IToolPanelDeckListener() {} }; - //==================================================================== + //= IToolPanelDeck - //==================================================================== + class SVT_DLLPUBLIC IToolPanelDeck { public: @@ -129,9 +129,9 @@ namespace svt ~IToolPanelDeck() {} }; - //==================================================================== + //= ToolPanelDeck - //==================================================================== + class SVT_DLLPUBLIC ToolPanelDeck :public Control ,public IToolPanelDeck { @@ -175,9 +175,9 @@ namespace svt ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANELDECK_HXX diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 85d538bc2b69..443f8f6c3665 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -23,14 +23,14 @@ #include #include -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= OFileURLControl - //===================================================================== + class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox { private: @@ -45,9 +45,9 @@ namespace svt virtual bool Notify( NotifyEvent& rNEvt ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_URLCONTROL_HXX diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 87102c43e051..f128884d08c2 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -176,9 +176,9 @@ to be set (before Show) with SetStyle(). *************************************************************************/ -// ------------------ + // - ValueSet types - -// ------------------ + #define WB_RADIOSEL ((WinBits)0x00008000) #define WB_ITEMBORDER ((WinBits)0x00010000) @@ -189,9 +189,9 @@ to be set (before Show) with SetStyle(). #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #define WB_MENUSTYLEVALUESET ((WinBits)0x08000000) -// ------------ + // - ValueSet - -// ------------ + #define VALUESET_APPEND ((sal_uInt16)-1) #define VALUESET_ITEM_NOTFOUND ((sal_uInt16)-1) diff --git a/include/svtools/vclxaccessibleheaderbar.hxx b/include/svtools/vclxaccessibleheaderbar.hxx index b02f609d1e43..013322adb791 100644 --- a/include/svtools/vclxaccessibleheaderbar.hxx +++ b/include/svtools/vclxaccessibleheaderbar.hxx @@ -29,9 +29,9 @@ #endif class HeaderBar; -// ---------------------------------------------------- + // class VCLXAccessibleHeaderBar -// ---------------------------------------------------- + typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > > ListItems; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 2924f342d2ef..ecaeb624c34a 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -25,10 +25,10 @@ #include class Bitmap; -//......................................................................... + namespace svt { -//......................................................................... + // wizard buttons #define WZB_NONE 0x0000 @@ -41,9 +41,9 @@ namespace svt // wizard states #define WZS_INVALID_STATE ((WizardState)-1) - //===================================================================== + //= WizardTypes - //===================================================================== + struct WizardTypes { typedef sal_Int16 WizardState; @@ -59,7 +59,7 @@ namespace svt class SAL_NO_VTABLE IWizardPageController { public: - //----------------------------------------------------------------- + // This methods behave somewhat different than ActivatePage/DeactivatePage // The latter are handled by the base class itself whenever changing the pages is in the offing, // i.e., when it's already decided which page is the next. @@ -82,9 +82,9 @@ namespace svt ~IWizardPageController() {} }; - //===================================================================== + //= OWizardPage - //===================================================================== + class OWizardMachine; struct WizardPageImplData; @@ -119,9 +119,9 @@ namespace svt void updateDialogTravelUI(); }; - //===================================================================== + //= OWizardMachine - //===================================================================== + struct WizardMachineImplData; /** implements some kind of finite automata, where the states of the automata exactly correlate with tab pages. @@ -376,9 +376,9 @@ namespace svt OWizardMachine& m_rWizard; }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_WIZARDMACHINE_HXX diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index f80a25a85cfa..517d439c12ea 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -196,16 +196,16 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn ) *************************************************************************/ -// ---------------------- + // - WizardDialog-Types - -// ---------------------- + #define WIZARDDIALOG_BUTTON_STDOFFSET_X 6 #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3 -// ---------------- + // - WizardDialog - -// ---------------- + class SVT_DLLPUBLIC WizardDialog : public ModalDialog { diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 33ce019115e5..14399d0e45bb 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -29,7 +29,7 @@ class Window; -////////////////////////////////////////////////////////////////////// + class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { @@ -51,7 +51,7 @@ public: com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } }; -////////////////////////////////////////////////////////////////////// + #endif -- cgit