diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 09:21:53 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:11:34 +0000 |
| commit | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch) | |
| tree | efbfb952f3236a6f56540ddae6a896c8c73774a0 /include | |
| parent | f12e483589888f87843026ceff5ae3c1e615ca02 (diff) | |
Formatting changes across all modules
+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs
Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include')
70 files changed, 273 insertions, 559 deletions
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx index 541c5d3c4d58..8d68e2bbb1ff 100644 --- a/include/avmedia/modeltools.hxx +++ b/include/avmedia/modeltools.hxx @@ -28,7 +28,7 @@ bool AVMEDIA_DLLPUBLIC Embed3DModel( bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType); -} // namespace avemdia +} // namespace avmedia #endif // INCLUDED_AVMEDIA_MODELTOOLS_HXX diff --git a/include/helpcompiler/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx index 65f77878ed12..869fe535ab7f 100644 --- a/include/helpcompiler/HelpIndexer.hxx +++ b/include/helpcompiler/HelpIndexer.hxx @@ -30,7 +30,7 @@ class Reader; } class L10N_DLLPUBLIC HelpIndexer { - private: + private: OUString d_lang; OUString d_module; OUString d_captionDir; @@ -39,48 +39,48 @@ class L10N_DLLPUBLIC HelpIndexer { OUString d_error; std::set<OUString> d_files; - public: + public: - /** - * @param lang Help files language. - * @param module The module of the helpfiles. - * @param srcDir The help directory to index - * @param outDir The directory to write the "module".idxl directory to - */ + /** + * @param lang Help files language. + * @param module The module of the helpfiles. + * @param srcDir The help directory to index + * @param outDir The directory to write the "module".idxl directory to + */ HelpIndexer(OUString const &lang, OUString const &module, OUString const &srcDir, OUString const &outDir); - /** - * Run the indexer. - * @return true if index successfully generated. - */ - bool indexDocuments(); + /** + * Run the indexer. + * @return true if index successfully generated. + */ + bool indexDocuments(); - /** - * Get the error string (empty if no error occurred). - */ + /** + * Get the error string (empty if no error occurred). + */ OUString const & getErrorMessage() { return d_error;} - private: + private: - /** - * Scan the caption & contents directories for help files. - */ - bool scanForFiles(); + /** + * Scan the caption & contents directories for help files. + */ + bool scanForFiles(); - /** - * Scan for files in the given directory. - */ + /** + * Scan for files in the given directory. + */ bool scanForFiles(OUString const &path); - /** - * Fill the Document with information on the given help file. - */ + /** + * Fill the Document with information on the given help file. + */ void helpDocument(OUString const & fileName, lucene::document::Document *doc); - /** - * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist. - */ + /** + * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist. + */ static lucene::util::Reader *helpFileReader(OUString const & path); }; diff --git a/include/helpcompiler/HelpSearch.hxx b/include/helpcompiler/HelpSearch.hxx index 639bbb2f585a..074373c43c0e 100644 --- a/include/helpcompiler/HelpSearch.hxx +++ b/include/helpcompiler/HelpSearch.hxx @@ -16,23 +16,23 @@ #include <vector> class L10N_DLLPUBLIC HelpSearch{ - private: + private: OString d_indexDir; - public: + public: - /** - * @param indexDir The directory where the index files are stored. - */ + /** + * @param indexDir The directory where the index files are stored. + */ HelpSearch(OUString const &indexDir); - /** - * Query the index for a certain query string. - * @param queryStr The query. - * @param captionOnly Set to true to search in the caption, not the content. - * @param rDocuments Vector to write the paths of the found documents. - * @param rScores Vector to write the scores to. - */ + /** + * Query the index for a certain query string. + * @param queryStr The query. + * @param captionOnly Set to true to search in the caption, not the content. + * @param rDocuments Vector to write the paths of the found documents. + * @param rScores Vector to write the scores to. + */ void query(OUString const &queryStr, bool captionOnly, std::vector<OUString> &rDocuments, std::vector<float> &rScores); }; diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx index 55a3daa96e9d..b942cbcf7f38 100644 --- a/include/i18nutil/paper.hxx +++ b/include/i18nutil/paper.hxx @@ -116,9 +116,6 @@ enum Paper #define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_10 - PAPER_A0 + 1) -// - Paper - - - class I18NUTIL_DLLPUBLIC PaperInfo { Paper m_eType; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 35b4040a7515..283c369f0de4 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -32,9 +32,6 @@ #include <sfx2/tabdlg.hxx> -// - SfxCommonPrintOptionsTabPage - - - class SvtBasePrintOptions; class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index c634ae135000..aef9bed26559 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -49,9 +49,6 @@ typedef ::std::vector< long > DdeFormats; typedef ::std::vector< Conversation* > ConvList; -// - DdeData - - - class SVL_DLLPUBLIC DdeData { friend class DdeInternal; @@ -83,9 +80,6 @@ public: }; -// - DdeTransaction - - - class SVL_DLLPUBLIC DdeTransaction { public: @@ -133,9 +127,6 @@ private: }; -// - DdeLink - - - class SVL_DLLPUBLIC DdeLink : public DdeTransaction { Link<void*,void> aNotify; @@ -150,9 +141,6 @@ public: }; -// - DdeWarmLink - - - class SVL_DLLPUBLIC DdeWarmLink : public DdeLink { public: @@ -160,9 +148,6 @@ public: }; -// - DdeHotLink - - - class SVL_DLLPUBLIC DdeHotLink : public DdeLink { public: @@ -170,9 +155,6 @@ public: }; -// - DdeRequest - - - class SVL_DLLPUBLIC DdeRequest : public DdeTransaction { public: @@ -180,9 +162,6 @@ public: }; -// - DdePoke - - - class SVL_DLLPUBLIC DdePoke : public DdeTransaction { public: @@ -193,9 +172,6 @@ public: }; -// - DdeExecute - - - class SVL_DLLPUBLIC DdeExecute : public DdeTransaction { public: @@ -203,9 +179,6 @@ public: }; -// - DdeConnection - - - class SVL_DLLPUBLIC DdeConnection { friend class DdeInternal; @@ -235,9 +208,6 @@ private: }; -// - DdeItem - - - class SVL_DLLPUBLIC DdeItem { friend class DdeInternal; @@ -264,9 +234,6 @@ public: }; -// - DdeItem - - - class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem { public: @@ -280,9 +247,6 @@ public: }; -// - DdeTopic - - - class SVL_DLLPUBLIC DdeTopic { SVL_DLLPRIVATE void Disconnect( sal_IntPtr ); @@ -330,9 +294,6 @@ private: }; -// - DdeService - - - class SVL_DLLPUBLIC DdeService { friend class DdeInternal; @@ -378,16 +339,9 @@ public: void AddFormat(SotClipboardFormatId); void RemoveFormat(SotClipboardFormatId); bool HasFormat(SotClipboardFormatId); - -private: - // DdeService( const DdeService& ); - //int operator= ( const DdeService& ); }; -// - DdeTransaction - - - inline long DdeTransaction::GetError() { return rDde.GetError(); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index cad8aaaf1d3e..f81fb46fe4eb 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -46,14 +46,11 @@ namespace svt { class BrowseBoxImpl; class IAccessibleFactory; } + namespace utl { class AccessibleStateSetHelper; } - -// - BrowseBox-Types - - - #define BROWSER_INVALIDID SAL_MAX_UINT16 #define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION)) @@ -125,9 +122,6 @@ namespace o3tl #define BROWSER_MOVECOLUMNRIGHT 757 -// - BrowseEvent - - - class BrowseEvent { VclPtr<vcl::Window> pWin; @@ -151,9 +145,6 @@ public: }; -// - BrowserMouseEvent - - - class BrowserMouseEvent: public MouseEvent, public BrowseEvent { public: @@ -165,9 +156,6 @@ public: }; -// - BrowserAcceptDropEvent - - - class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent { public: @@ -176,9 +164,6 @@ public: }; -// - BrowserExecuteDropEvent - - - class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent { public: @@ -187,9 +172,6 @@ public: }; -// - BrowseBox - - - // TODO // The whole selection thingie in this class is somewhat .... suspicious to me. // some oddities: @@ -271,8 +253,7 @@ private: } uRow; MultiSelection* pColSel; // selected column-ids - //fdo#83943, detect if making the cursor position - //visible is impossible to achieve + // fdo#83943, detect if making the cursor position visible is impossible to achieve struct CursorMoveAttempt { long m_nCol; @@ -670,7 +651,6 @@ public: /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive bool isAccessibleAlive( ) const; - // ACCESSIBILITY ========================================================== public: /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< @@ -710,8 +690,6 @@ public: css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 nIndex ) override; - // Conversions ------------------------------------------------------------ - /** Converts a point relative to the data window origin to a cell address. @param rnRow Out-parameter that takes the row index. @param rnColumnId Out-parameter that takes the column ID. @@ -741,8 +719,6 @@ public: @return <TRUE/>, if the point could be converted to a valid index. */ virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) override; - // Object data and state -------------------------------------------------- - /** return the name of the specified object. @param eObjType The type to ask for @@ -825,6 +801,6 @@ inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const return *static_cast<DataFlavorExVector*>(implGetDataFlavors()); } -#endif +#endif // INCLUDED_SVTOOLS_BRWBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index da98035a8dac..265a5983ea80 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -131,15 +131,11 @@ calls or by ending a selection. *************************************************************************/ - -// - Calendar types - - - #define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) #define WB_BOLDTEXT ((WinBits)0x00008000) #define WB_FRAMEINFO ((WinBits)0x00010000) #define WB_WEEKNUMBER ((WinBits)0x00020000) -// Needs to in agreement with the WinBits in the TabBar or +// Needs to be in agreement with the WinBits in the TabBar or // we move it to \vcl\inc\wintypes.hxx #ifndef WB_RANGESELECT #define WB_RANGESELECT ((WinBits)0x00200000) @@ -150,10 +146,6 @@ calls or by ending a selection. #define DIB_BOLD ((sal_uInt16)0x0001) - -// - Calendar - - - typedef std::set<sal_uInt32> IntDateSet; @@ -231,7 +223,7 @@ private: SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const; SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; - SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev = true, bool bDrawNext = true); SVT_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, @@ -241,7 +233,7 @@ private: SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); SVT_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld ); SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, - bool bMove, bool bExpand, bool bExtended ); + bool bMove, bool bExpand, bool bExtended ); SVT_DLLPRIVATE void ImplUpdate( bool bCalcNew = false ); using Window::ImplScroll; SVT_DLLPRIVATE void ImplScroll( bool bPrev ); @@ -343,9 +335,6 @@ method in CalendarField and create an own calendar there ourselves. *************************************************************************/ -// - CalendarField - - - class SVT_DLLPUBLIC CalendarField : public DateField { private: diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 4fe31bfa1d8a..f24e79898eab 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -26,10 +26,6 @@ namespace vcl { class Window; } - -// - ColorDialog - - - namespace svtools { // SELECT is the default diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 0d5dc458a9d8..b2ccc9594659 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -175,18 +175,10 @@ 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 - - - enum class HeaderBarItemBits { NONE = 0x0000, @@ -207,27 +199,21 @@ enum class HeaderBarItemBits USERDRAW = 0x4000, STDSTYLE = LEFT | LEFTIMAGE | VCENTER | CLICKABLE, }; + namespace o3tl { template<> struct typed_flags<HeaderBarItemBits> : is_typed_flags<HeaderBarItemBits, 0x7fff> {}; } - -// - HeaderBar-Types - - - #define HEADERBAR_APPEND ((sal_uInt16)0xFFFF) #define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define HEADERBAR_FULLSIZE ((long)1000000000) #define HEADERBAR_TEXTOFF 2 - -// - HeaderBar - - - class VCLXHeaderBar; + class SVT_DLLPUBLIC HeaderBar : public vcl::Window { private: diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index bf281aa68a86..8025a01228fe 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -27,13 +27,9 @@ #include <unotools/options.hxx> class SvtPrintOptions_Impl; - - -// - SvtBasePrintOptions - - - class PrinterOptions; + class SVT_DLLPUBLIC SvtBasePrintOptions: public utl::detail::Options { protected: @@ -82,9 +78,6 @@ public: }; -// - SvtPrinterOptions - - - class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions { private: @@ -99,9 +92,6 @@ public: }; -// - SvtPrintFileOptions - - - class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions { private: diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 384bc86b7a9b..007294e52656 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -34,9 +34,6 @@ class Printer; class QueueInfo; -// - PrinterSetupDialog - - - class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog { private: @@ -74,9 +71,6 @@ public: }; -// - Helper functions for print dialog - - - #define IMPL_PRINTDLG_STATUS_UPDATE 15000 void ImplFillPrnDlgListBox( const Printer* pPrinter, diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 33106c0b7a47..740e4427ff2f 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -456,13 +456,11 @@ Tips for the use of the ruler: *************************************************************************/ -// - WinBits - #define WB_EXTRAFIELD ((WinBits)0x00004000) #define WB_RIGHT_ALIGNED ((WinBits)0x00008000) #define WB_STDRULER WB_HORZ -// - Ruler-Type - enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2, @@ -483,11 +481,9 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW, #define RULER_MOUSE_BORDERWIDTH 5 #define RULER_MOUSE_MARGINWIDTH 3 -// - RulerMargin - #define RULER_MARGIN_SIZEABLE ((sal_uInt16)0x0001) -// - RulerBorder - #define RULER_BORDER_SIZEABLE ((sal_uInt16)0x0001) #define RULER_BORDER_MOVEABLE ((sal_uInt16)0x0002) @@ -505,7 +501,6 @@ struct RulerBorder long nMaxPos; }; -// - RulerIndent - #define RULER_INDENT_TOP ((sal_uInt16)0x0000) #define RULER_INDENT_BOTTOM ((sal_uInt16)0x0001) @@ -518,7 +513,6 @@ struct RulerIndent sal_uInt16 nStyle; }; -// - RulerTab - #define RULER_TAB_LEFT ((sal_uInt16)0x0000) #define RULER_TAB_RIGHT ((sal_uInt16)0x0001) @@ -535,15 +529,13 @@ struct RulerTab }; - -// - RulerLine - - struct RulerLine { long nPos; sal_uInt16 nStyle; }; + struct RulerSelection { long nPos; @@ -565,6 +557,7 @@ struct RulerSelection {} }; + struct RulerUnitData { MapUnit eMapUnit; // MAP_UNIT for calculation @@ -576,6 +569,7 @@ struct RulerUnitData sal_Char aUnitStr[8]; // Unit string }; + // Data for drawing ruler tabstops struct RulerTabData { @@ -597,7 +591,6 @@ struct RulerTabData sal_uInt16 textoff; }; -// - Ruler - class ImplRulerData; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index b0832842756e..05ba486195a9 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -27,10 +27,6 @@ class DataChangedEvent; - -// - ScrollableWindow-Type - - - enum class ScrollableWindowFlags { THUMBDRAGGING = 1, @@ -38,15 +34,13 @@ enum class ScrollableWindowFlags HCENTER = 4, DEFAULT = THUMBDRAGGING | VCENTER | HCENTER, }; + namespace o3tl { template<> struct typed_flags<ScrollableWindowFlags> : is_typed_flags<ScrollableWindowFlags, 0x07> {}; } -// - ScrollableWindow - - - class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window { private: @@ -55,9 +49,9 @@ private: long nLinePixH; // size of a line/column (pixel) long nColumnPixW; - VclPtr<ScrollBar> aVScroll; // the scrollbars + VclPtr<ScrollBar> aVScroll; // the scrollbars VclPtr<ScrollBar> aHScroll; - VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner + VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner bool bScrolling:1, // user controlled scrolling bHandleDragging:1, // scroll window while dragging bHCenter:1, diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 678981feeb5c..aa2aef2cee27 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -262,9 +262,6 @@ been carried out. class Button; -// - WinBits - - - #define WB_RANGESELECT ((WinBits)0x00200000) #define WB_MULTISELECT ((WinBits)0x00400000) #define WB_TOPBORDER ((WinBits)0x04000000) @@ -273,19 +270,10 @@ class Button; #define WB_INSERTTAB ((WinBits)0x40000000) #define WB_STDTABBAR WB_BORDER - -// - TabBarPageBits - - - typedef sal_uInt16 TabBarPageBits; - -// - Bits for TabBarPages - - - #define TPB_SPECIAL ((TabBarPageBits)0x0001) - // - TabBar-Types - used in TabBar::AllowRenaming enum TabBarAllowRenamingReturnCode { @@ -294,9 +282,6 @@ enum TabBarAllowRenamingReturnCode { TABBAR_RENAMING_CANCEL }; - -// - TabBar - - class MouseEvent; class TrackingEvent; class DataChangedEvent; @@ -308,6 +293,7 @@ struct ImplTabBarItem; struct TabBar_Impl; typedef std::vector<ImplTabBarItem*> ImplTabBarList; + class SVT_DLLPUBLIC TabBar : public vcl::Window { friend class ImplTabButton; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 88da972ee0e8..93ab5891955f 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -179,7 +179,6 @@ to be set (before Show) with SetStyle(). typedef std::vector<ValueSetItem*> ValueItemList; -// - ValueSet types - #define WB_RADIOSEL ((WinBits)0x00008000) #define WB_ITEMBORDER ((WinBits)0x00010000) #define WB_DOUBLEBORDER ((WinBits)0x00020000) @@ -189,10 +188,10 @@ typedef std::vector<ValueSetItem*> ValueItemList; #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #define WB_MENUSTYLEVALUESET ((WinBits)0x08000000) - #define VALUESET_APPEND ((size_t)-1) #define VALUESET_ITEM_NOTFOUND ((size_t)-1) + class SVT_DLLPUBLIC ValueSet : public Control { private: diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index be3de098c17d..9ed4e2bbf949 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -182,17 +182,10 @@ IMPL_LINK_TYPED( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) *************************************************************************/ - -// - WizardDialog-Types - - - #define WIZARDDIALOG_BUTTON_STDOFFSET_X 6 #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3 -// - WizardDialog - - - class SVT_DLLPUBLIC WizardDialog : public ModalDialog { private: diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 5879e201edbd..562111aee892 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -28,12 +28,9 @@ #include <cstdio> #include <vector> - -// - GalleryThemeEntry - - - class SvStream; + class GalleryThemeEntry { private: @@ -86,14 +83,11 @@ public: typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; - -// - Gallery - - - class SfxListener; class GalleryTheme; class GalleryThemeCacheEntry; + class SVX_DLLPUBLIC Gallery : public SfxBroadcaster { // only for gengal utility! diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 6c18776e5431..c9e91ae32042 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -35,8 +35,6 @@ class SotStorage; class SotStorageStream; -// - SgaObjKind - - struct GalleryObject { @@ -52,6 +50,7 @@ struct GalleryObject OUString maPath; }; + typedef ::std::vector< GalleryObject* > GalleryObjectList; class GalleryThemeEntry; @@ -59,17 +58,16 @@ class SgaObject; class FmFormModel; class ListBox; -// - GalleryTheme - - - class Gallery; class GalleryProgress; + namespace unogallery { class GalleryTheme; class GalleryItem; } + class SVX_DLLPUBLIC GalleryTheme : public SfxBroadcaster { friend class Gallery; @@ -82,7 +80,7 @@ private: GalleryObjectList aObjectList; OUString m_aDestDir; bool m_bDestDirRelative; - tools::SvRef<SotStorage> aSvDrawStorageRef; + tools::SvRef<SotStorage> aSvDrawStorageRef; Gallery* pParent; GalleryThemeEntry* pThm; sal_uIntPtr mnThemeLockCount; @@ -219,6 +217,6 @@ public: SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme ); SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme ); -#endif +#endif // INCLUDED_SVX_GALTHEME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index df22c2060061..679f15525753 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -26,9 +26,6 @@ #include <svx/svxdllapi.h> -// - TbxImageItem - - - class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { public: @@ -39,9 +36,6 @@ public: }; -// - SvxGrafToolBoxControl - - - class SvxGrafToolBoxControl : public SfxToolBoxControl { public: @@ -53,9 +47,6 @@ public: }; -// - SvxGrafRedToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl { public: @@ -64,9 +55,6 @@ public: }; -// - SvxGrafGreenToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl { public: @@ -75,9 +63,6 @@ public: }; -// - SvxGrafBlueToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl { public: @@ -86,9 +71,6 @@ public: }; -// - SvxGrafLuminanceToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxControl { public: @@ -97,9 +79,6 @@ public: }; -// - SvxGrafContrastToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl { public: @@ -108,9 +87,6 @@ public: }; -// - SvxGrafGammaToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl { public: @@ -119,9 +95,6 @@ public: }; -// - SvxGrafTransparenceToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxControl { public: @@ -130,9 +103,6 @@ public: }; -// - SvxGrafModeToolBoxControl - - - class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public SfxListener { public: @@ -145,12 +115,10 @@ public: }; -// - SvxGrafAttrHelper - - - class SdrView; class SfxRequest; + class SVX_DLLPUBLIC SvxGrafAttrHelper { public: diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index d4f132beb7eb..4e2f1e0bb39c 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -98,58 +98,61 @@ enum DFF_TextHeader { // 1" = 12700*72 = 914400 EMU // 1" = 25.4mm // 1mm = 36000 EMU + + +// Record Name FBT-Value Instance Contents Wrd Exl Ppt Ver // Transform #define DFF_Prop_Rotation 4 // Fixed Point 16.16 degrees // Protection #define DFF_Prop_LockAgainstGrouping 127 // sal_Bool Do not group this shape // Text -#define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host -#define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs) +#define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host +#define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs) #define DFF_Prop_dyTextTop 130 // LONG #define DFF_Prop_dxTextRight 131 // LONG #define DFF_Prop_dyTextBottom 132 // LONG -#define DFF_Prop_WrapText 133 // MSO_WRAPMODE Wrap text at shape margins -#define DFF_Prop_anchorText 135 // MSO_ANCHOR How to anchor the text -#define DFF_Prop_txflTextFlow 136 // MSO_TXFL Text flow -#define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation -#define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes) +#define DFF_Prop_WrapText 133 // MSO_WRAPMODE Wrap text at shape margins +#define DFF_Prop_anchorText 135 // MSO_ANCHOR How to anchor the text +#define DFF_Prop_txflTextFlow 136 // MSO_TXFL Text flow +#define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation +#define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes) #define DFF_Prop_AutoTextMargin 188 // sal_Bool use host's margin calculations #define DFF_Prop_RotateText 189 // sal_Bool Rotate text with shape #define DFF_Prop_FitTextToShape 191 // sal_Bool Size text to fit shape size // GeoText -#define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string -#define DFF_Prop_gtextAlign 194 // MSO_GEOTEXTALIGN alignment on curve -#define DFF_Prop_gtextSize 195 // LONG default point size -#define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16 -#define DFF_Prop_gtextFont 197 // WCHAR* font family name +#define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string +#define DFF_Prop_gtextAlign 194 // MSO_GEOTEXTALIGN alignment on curve +#define DFF_Prop_gtextSize 195 // LONG default point size +#define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16 +#define DFF_Prop_gtextFont 197 // WCHAR* font family name #define DFF_Prop_gtextFStretch 245 // sal_Bool 400 Stretch to fit shape #define DFF_Prop_gtextFBold 250 // sal_Bool 20 Bold font #define DFF_Prop_gtextFItalic 251 // sal_Bool 10 Italic font #define DFF_Prop_gtextFStrikethrough 255 // sal_Bool 1 Strike through font // Blip -#define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate. +#define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate. #define DFF_Prop_cropFromBottom 257 // LONG #define DFF_Prop_cropFromLeft 258 // LONG #define DFF_Prop_cropFromRight 259 // LONG -#define DFF_Prop_pib 260 // IMsoBlip* Blip to display -#define DFF_Prop_pibName 261 // WCHAR* Blip file name -#define DFF_Prop_pibFlags 262 // MSO_BLIPFLAGS Blip flags -#define DFF_Prop_pictureTransparent 263 // LONG transparent color (none if ~0UL) -#define DFF_Prop_pictureContrast 264 // LONG contrast setting -#define DFF_Prop_pictureBrightness 265 // LONG brightness setting -#define DFF_Prop_pictureGamma 266 // LONG 16.16 gamma -#define DFF_Prop_pictureId 267 // LONG Host-defined ID for OLE objects (usually a pointer) +#define DFF_Prop_pib 260 // IMsoBlip* Blip to display +#define DFF_Prop_pibName 261 // WCHAR* Blip file name +#define DFF_Prop_pibFlags 262 // MSO_BLIPFLAGS Blip flags +#define DFF_Prop_pictureTransparent 263 // LONG transparent color (none if ~0UL) +#define DFF_Prop_pictureContrast 264 // LONG contrast setting +#define DFF_Prop_pictureBrightness 265 // LONG brightness setting +#define DFF_Prop_pictureGamma 266 // LONG 16.16 gamma +#define DFF_Prop_pictureId 267 // LONG Host-defined ID for OLE objects (usually a pointer) #define DFF_Prop_pictureActive 319 // sal_Bool Server is active (OLE objects only) // Geometry -#define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space. +#define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space. #define DFF_Prop_geoTop 321 // LONG #define DFF_Prop_geoRight 322 // LONG #define DFF_Prop_geoBottom 323 // LONG -#define DFF_Prop_pVertices 325 // IMsoArray An array of points, in G units. +#define DFF_Prop_pVertices 325 // IMsoArray An array of points, in G units. #define DFF_Prop_pSegmentInfo 326 // IMsoArray -#define DFF_Prop_adjustValue 327 // LONG Adjustment values corresponding to the positions of the -#define DFF_Prop_adjust2Value 328 // LONG adjust handles of the shape. The number of values used -#define DFF_Prop_adjust3Value 329 // LONG and their allowable ranges vary from shape type to shape type. +#define DFF_Prop_adjustValue 327 // LONG Adjustment values corresponding to the positions of the +#define DFF_Prop_adjust2Value 328 // LONG adjust handles of the shape. The number of values used +#define DFF_Prop_adjust3Value 329 // LONG and their allowable ranges vary from shape type to shape type. #define DFF_Prop_adjust4Value 330 // LONG #define DFF_Prop_adjust5Value 331 // LONG #define DFF_Prop_adjust6Value 332 // LONG @@ -163,112 +166,112 @@ enum DFF_TextHeader { #define DFF_Prop_Handles 341 // H* #define DFF_Prop_pFormulas 342 // LONG #define DFF_Prop_textRectangles 343 // LONG -#define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect +#define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect #define DFF_Prop_f3DOK 379 // sal_Bool 3D may be set #define DFF_Prop_fGtextOK 381 // sal_Bool Text effect (FontWork) supported #define DFF_Prop_fFillShadeShapeOK 382 // BOOL #define DFF_Prop_fFillOK 383 // sal_Bool OK to fill the shape through the UI or VBA? // FillStyle -#define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill -#define DFF_Prop_fillColor 385 // MSO_CLR Foreground color -#define DFF_Prop_fillOpacity 386 // LONG Fixed 16.16 -#define DFF_Prop_fillBackColor 387 // MSO_CLR Background color -#define DFF_Prop_fillBackOpacity 388 // LONG Shades only -#define DFF_Prop_fillBlip 390 // IMsoBlip* Pattern/texture -#define DFF_Prop_fillWidth 393 // LONG How big (A units) to make a metafile texture. +#define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill +#define DFF_Prop_fillColor 385 // MSO_CLR Foreground color +#define DFF_Prop_fillOpacity 386 // LONG Fixed 16.16 +#define DFF_Prop_fillBackColor 387 // MSO_CLR Background color +#define DFF_Prop_fillBackOpacity 388 // LONG Shades only +#define DFF_Prop_fillBlip 390 // IMsoBlip* Pattern/texture +#define DFF_Prop_fillWidth 393 // LONG How big (A units) to make a metafile texture. #define DFF_Prop_fillHeight 394 // LONG -#define DFF_Prop_fillAngle 395 // LONG Fade angle - degrees in 16.16 -#define DFF_Prop_fillFocus 396 // LONG Linear shaded fill focus percent -#define DFF_Prop_fillToRight 399 // LONG Fraction 16.16 -#define DFF_Prop_fillToBottom 400 // LONG Fraction 16.16 -#define DFF_Prop_fillShadeColors 407 // IMsoArray a preset array of colors +#define DFF_Prop_fillAngle 395 // LONG Fade angle - degrees in 16.16 +#define DFF_Prop_fillFocus 396 // LONG Linear shaded fill focus percent +#define DFF_Prop_fillToRight 399 // LONG Fraction 16.16 +#define DFF_Prop_fillToBottom 400 // LONG Fraction 16.16 +#define DFF_Prop_fillShadeColors 407 // IMsoArray a preset array of colors #define DFF_Prop_fFilled 443 // sal_Bool Is shape filled? #define DFF_Prop_fNoFillHitTest 447 // sal_Bool Hit test a shape as though filled // LineStyle -#define DFF_Prop_lineColor 448 // MSO_CLR Color of line -#define DFF_Prop_lineOpacity 449 // LONG Not implemented -#define DFF_Prop_lineBackColor 450 // MSO_CLR Background color -#define DFF_Prop_lineWidth 459 // LONG A units; 1pt == 12700 EMUs -#define DFF_Prop_lineStyle 461 // MSO_LINESTYLE Draw parallel lines? -#define DFF_Prop_lineDashing 462 // MSO_LINEDASHING Can be overridden by: -#define DFF_Prop_lineDashStyle 463 // IMsoArray As Win32 ExtCreatePen -#define DFF_Prop_lineStartArrowhead 464 // MSO_LINEEND Arrow at start -#define DFF_Prop_lineEndArrowhead 465 // MSO_LINEEND Arrow at end -#define DFF_Prop_lineStartArrowWidth 466 // MSO_LINEENDWIDTH Arrow at start -#define DFF_Prop_lineStartArrowLength 467 // MSO_LINEENDLENGTH Arrow at end -#define DFF_Prop_lineEndArrowWidth 468 // MSO_LINEENDWIDTH Arrow at start -#define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end -#define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines -#define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines +#define DFF_Prop_lineColor 448 // MSO_CLR Color of line +#define DFF_Prop_lineOpacity 449 // LONG Not implemented +#define DFF_Prop_lineBackColor 450 // MSO_CLR Background color +#define DFF_Prop_lineWidth 459 // LONG A units; 1pt == 12700 EMUs +#define DFF_Prop_lineStyle 461 // MSO_LINESTYLE Draw parallel lines? +#define DFF_Prop_lineDashing 462 // MSO_LINEDASHING Can be overridden by: +#define DFF_Prop_lineDashStyle 463 // IMsoArray As Win32 ExtCreatePen +#define DFF_Prop_lineStartArrowhead 464 // MSO_LINEEND Arrow at start +#define DFF_Prop_lineEndArrowhead 465 // MSO_LINEEND Arrow at end +#define DFF_Prop_lineStartArrowWidth 466 // MSO_LINEENDWIDTH Arrow at start +#define DFF_Prop_lineStartArrowLength 467 // MSO_LINEENDLENGTH Arrow at end +#define DFF_Prop_lineEndArrowWidth 468 // MSO_LINEENDWIDTH Arrow at start +#define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end +#define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines +#define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines #define DFF_Prop_fLine 508 // sal_Bool Any line? #define DFF_Prop_fNoLineDrawDash 511 // sal_Bool Draw a dashed line if no line // ShadowStyle -#define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect -#define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color -#define DFF_Prop_shadowOpacity 516 // LONG Fixed 16.16 -#define DFF_Prop_shadowOffsetX 517 // LONG Offset shadow -#define DFF_Prop_shadowOffsetY 518 // LONG Offset shadow +#define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect +#define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color +#define DFF_Prop_shadowOpacity 516 // LONG Fixed 16.16 +#define DFF_Prop_shadowOffsetX 517 // LONG Offset shadow +#define DFF_Prop_shadowOffsetY 518 // LONG Offset shadow #define DFF_Prop_fshadowObscured 575 // sal_Bool Excel5-style shadow // PerspectiveStyle #define DFF_Prop_fPerspective 639 // sal_Bool On/off // 3D Object -#define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16 -#define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16 -#define DFF_Prop_c3DShininess 642 // LONG Default gives OK results -#define DFF_Prop_c3DExtrudeForward 644 // LONG Distance of extrusion in EMUs +#define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16 +#define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16 +#define DFF_Prop_c3DShininess 642 // LONG Default gives OK results +#define DFF_Prop_c3DExtrudeForward 644 // LONG Distance of extrusion in EMUs #define DFF_Prop_c3DExtrudeBackward 645 // LONG -#define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. +#define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. #define DFF_Prop_fc3DLightFace 703 // BOOL // 3D Style -#define DFF_Prop_c3DYRotationAngle 704 // LONG degrees (16.16) about y axis -#define DFF_Prop_c3DXRotationAngle 705 // LONG degrees (16.16) about x axis -#define DFF_Prop_c3DRotationCenterX 710 // LONG rotation center x (16.16 or g-units) -#define DFF_Prop_c3DRotationCenterY 711 // LONG rotation center y (16.16 or g-units) -#define DFF_Prop_c3DRotationCenterZ 712 // LONG rotation center z (absolute (emus)) -#define DFF_Prop_c3DRenderMode 713 // MSO_3DRENDERMODE Full,wireframe, or bcube -#define DFF_Prop_c3DTolerance 714 // LONG pixels (16.16) -#define DFF_Prop_c3DXViewpoint 715 // LONG X view point (emus) -#define DFF_Prop_c3DYViewpoint 716 // LONG Y view point (emus) -#define DFF_Prop_c3DZViewpoint 717 // LONG Z view distance (emus) +#define DFF_Prop_c3DYRotationAngle 704 // LONG degrees (16.16) about y axis +#define DFF_Prop_c3DXRotationAngle 705 // LONG degrees (16.16) about x axis +#define DFF_Prop_c3DRotationCenterX 710 // LONG rotation center x (16.16 or g-units) +#define DFF_Prop_c3DRotationCenterY 711 // LONG rotation center y (16.16 or g-units) +#define DFF_Prop_c3DRotationCenterZ 712 // LONG rotation center z (absolute (emus)) +#define DFF_Prop_c3DRenderMode 713 // MSO_3DRENDERMODE Full,wireframe, or bcube +#define DFF_Prop_c3DTolerance 714 // LONG pixels (16.16) +#define DFF_Prop_c3DXViewpoint 715 // LONG X view point (emus) +#define DFF_Prop_c3DYViewpoint 716 // LONG Y view point (emus) +#define DFF_Prop_c3DZViewpoint 717 // LONG Z view distance (emus) #define DFF_Prop_c3DOriginX 718 // LONG #define DFF_Prop_c3DOriginY 719 // LONG -#define DFF_Prop_c3DSkewAngle 720 // LONG degree (16.16) skew angle -#define DFF_Prop_c3DSkewAmount 721 // LONG Percentage skew amount -#define DFF_Prop_c3DAmbientIntensity 722 // LONG Fixed point intensity -#define DFF_Prop_c3DKeyX 723 // LONG Key light source direc- -#define DFF_Prop_c3DKeyY 724 // LONG tion; only their relative -#define DFF_Prop_c3DKeyZ 725 // LONG magnitudes matter -#define DFF_Prop_c3DKeyIntensity 726 // LONG Fixed point intensity -#define DFF_Prop_c3DFillX 727 // LONG Fill light source direc- -#define DFF_Prop_c3DFillY 728 // LONG tion; only their relative -#define DFF_Prop_c3DFillZ 729 // LONG magnitudes matter -#define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity -#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh? +#define DFF_Prop_c3DSkewAngle 720 // LONG degree (16.16) skew angle +#define DFF_Prop_c3DSkewAmount 721 // LONG Percentage skew amount +#define DFF_Prop_c3DAmbientIntensity 722 // LONG Fixed point intensity +#define DFF_Prop_c3DKeyX 723 // LONG Key light source direc- +#define DFF_Prop_c3DKeyY 724 // LONG tion; only their relative +#define DFF_Prop_c3DKeyZ 725 // LONG magnitudes matter +#define DFF_Prop_c3DKeyIntensity 726 // LONG Fixed point intensity +#define DFF_Prop_c3DFillX 727 // LONG Fill light source direc- +#define DFF_Prop_c3DFillY 728 // LONG tion; only their relative +#define DFF_Prop_c3DFillZ 729 // LONG magnitudes matter +#define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity +#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh? // Shape -#define DFF_Prop_hspMaster 769 // MSO_HSP master shape -#define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector -#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape. +#define DFF_Prop_hspMaster 769 // MSO_HSP master shape +#define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector +#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape. // Callout -#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified +#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified // GroupShape -#define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set) -#define DFF_Prop_wzDescription 897 // WCHAR* alternate text -#define DFF_Prop_pihlShape 898 // IHlink* The hyperlink in the shape. -#define DFF_Prop_pWrapPolygonVertices 899 // IMsoArray The polygon that text will be wrapped around (Word) -#define DFF_Prop_dxWrapDistLeft 900 // LONG Left wrapping distance from text (Word) -#define DFF_Prop_dyWrapDistTop 901 // LONG Top wrapping distance from text (Word) -#define DFF_Prop_dxWrapDistRight 902 // LONG Right wrapping distance from text (Word) -#define DFF_Prop_dyWrapDistBottom 903 // LONG Bottom wrapping distance from text (Word) +#define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set) +#define DFF_Prop_wzDescription 897 // WCHAR* alternate text +#define DFF_Prop_pihlShape 898 // IHlink* The hyperlink in the shape. +#define DFF_Prop_pWrapPolygonVertices 899 // IMsoArray The polygon that text will be wrapped around (Word) +#define DFF_Prop_dxWrapDistLeft 900 // LONG Left wrapping distance from text (Word) +#define DFF_Prop_dyWrapDistTop 901 // LONG Top wrapping distance from text (Word) +#define DFF_Prop_dxWrapDistRight 902 // LONG Right wrapping distance from text (Word) +#define DFF_Prop_dyWrapDistBottom 903 // LONG Bottom wrapping distance from text (Word) #define DFF_Prop_tableProperties 927 // LONG #define DFF_Prop_tableRowProperties 928 // LONG* -#define DFF_Prop_fHidden 958 // sal_Bool Do not display -#define DFF_Prop_fPrint 959 // sal_Bool Print this shape +#define DFF_Prop_fHidden 958 // sal_Bool Do not display +#define DFF_Prop_fPrint 959 // sal_Bool Print this shape // entsprechende BitFlags // properties of the second property set -#define DFF_Prop_metroBlob 937 // XML ZipPackage* +#define DFF_Prop_metroBlob 937 // XML ZipPackage* // linchpin: the shape type enum MSO_SPT: sal_Int32 { diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 307c4d0b3fdf..9ea8d917d521 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -29,9 +29,6 @@ class Graphic; namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } -// - SdrMediaObj - - - class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj { friend class sdr::contact::ViewContactOfSdrMediaObj; diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index cc496a347bd8..3b4226503d39 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -29,30 +29,21 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svxdllapi.h> - -// - SvXMLEmbeddedObjectHelper - - - enum SvXMLEmbeddedObjectHelperMode { EMBEDDEDOBJECTHELPER_MODE_READ = 0, EMBEDDEDOBJECTHELPER_MODE_WRITE = 1 }; +namespace comphelper { class IEmbeddedHelper; } -// - SvXMLEmbeddedObjectHelper - - - -namespace comphelper { -class IEmbeddedHelper; -} class SvGlobalName; struct OUStringLess; class OutputStorageWrapper_Impl; -class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper2< - css::document::XEmbeddedObjectResolver, - css::container::XNameAccess > + +class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : + public ::cppu::WeakComponentImplHelper2< css::document::XEmbeddedObjectResolver, css::container::XNameAccess > { typedef ::std::map< OUString, OutputStorageWrapper_Impl*, OUStringLess > SvXMLEmbeddedObjectHelper_Impl; @@ -141,6 +132,6 @@ public: OUString& rObjectStorageName); }; -#endif +#endif // INCLUDED_SVX_XMLEOHLP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/util/xreplaceable.hxx b/include/test/util/xreplaceable.hxx index 37caf17393e0..9f33feeb5d9d 100644 --- a/include/test/util/xreplaceable.hxx +++ b/include/test/util/xreplaceable.hxx @@ -22,8 +22,8 @@ public: maSearchString(rSearchString), maReplaceString(rReplaceString) {} virtual css::uno::Reference< css::uno::XInterface > init() = 0; - void testCreateReplaceDescriptor(); - void testReplaceAll(); + void testCreateReplaceDescriptor(); + void testReplaceAll(); protected: ~XReplaceable() {} diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index a5e137c2d0c4..388796bb20e1 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -48,9 +48,9 @@ public: virtual ~BootstrapFixtureBase(); css::uno::Reference<css::uno::XComponentContext> - getComponentContext() { return m_xContext; } + getComponentContext() { return m_xContext; } css::uno::Reference<css::lang::XMultiServiceFactory> - getMultiServiceFactory() { return m_xSFactory; } + getMultiServiceFactory() { return m_xSFactory; } OUString getSrcRootURL() { return m_aSrcRootURL; } OUString getSrcRootPath() { return m_aSrcRootPath; } diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index 567be3b60b5d..d8080734ea5e 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -25,7 +25,6 @@ #include <tools/solar.h> #include <o3tl/typed_flags_set.hxx> -// - FontToSubsFont - enum class FontToSubsFontFlags { @@ -44,26 +43,26 @@ UNOTOOLS_DLLPUBLIC void DestroyFontToSubsFontConverter( F UNOTOOLS_DLLPUBLIC sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c ); UNOTOOLS_DLLPUBLIC OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter ); -// - StarSymbolToMSMultiFont - class UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont { public: - //Returns the name of the best windows symbol font which this char can be - //mapped to. Sets rChar to the correct position for that font. If no - //match found, then no name is returned, and rChar is unchanged. If you - //want to convert a string, you don't want to use this. + // Returns the name of the best windows symbol font which this char can be + // mapped to. Sets rChar to the correct position for that font. If no + // match found, then no name is returned, and rChar is unchanged. If you + // want to convert a string, you don't want to use this. virtual OUString ConvertChar(sal_Unicode &rChar) = 0; virtual ~StarSymbolToMSMultiFont() {} }; -//with bPerfect set the converter will only try and convert symbols which have -//perfect mappings to the windows symbols fonts. With it not set, it will -//allow somewhat more dubious transformations that are nevertheless -//recognizably similar. Even in this mode there will be characters that fail. -//The users of this might want to make a distinction between failed characters -//which were inside and those outside the unicode private area. + +// with bPerfect set the converter will only try and convert symbols which have +// perfect mappings to the windows symbols fonts. With it not set, it will +// allow somewhat more dubious transformations that are nevertheless +// recognizably similar. Even in this mode there will be characters that fail. +// The users of this might want to make a distinction between failed characters +// which were inside and those outside the unicode private area. UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false); #endif // INCLUDED_UNOTOOLS_FONTCVT_HXX diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index 37d78cefd45a..3f86b37a16e6 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -31,8 +31,6 @@ namespace utl { struct FontNameAttr; } -// - SubsFontName - - enum class SubsFontFlags { ONLYONE = 0x01, @@ -40,6 +38,7 @@ enum class SubsFontFlags PS = 0x04, HTML = 0x08, }; + namespace o3tl { template<> struct typed_flags<SubsFontFlags> : is_typed_flags<SubsFontFlags, 0x0f> {}; @@ -49,7 +48,6 @@ UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, SubsFontFlag UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewToken ); -// - ConvertChar - class UNOTOOLS_DLLPUBLIC ConvertChar { @@ -62,7 +60,7 @@ public: static const ConvertChar* GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName ); }; -// Default-Font + enum class DefaultFontType { SANS_UNICODE = 1, @@ -91,7 +89,6 @@ enum class DefaultFontType }; UNOTOOLS_DLLPUBLIC OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex ); - UNOTOOLS_DLLPUBLIC OUString GetEnglishSearchFontName( const OUString& rName ); /** Strip any "script font suffix" from the font name @@ -113,6 +110,6 @@ UNOTOOLS_DLLPUBLIC OUString StripScriptFromName(const OUString& rName); // FIXME It's quite possible that code using this should instead check for RTL_TEXTENCODING_SYMBOL. UNOTOOLS_DLLPUBLIC bool IsStarSymbol(const OUString &rFontName); -#endif +#endif // INCLUDED_UNOTOOLS_FONTDEFS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index 4e9c44f81578..051beb8a2b13 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -25,11 +25,10 @@ #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> -// - Access functions - typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask); typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); -// - BitmapInfoAccess - + class VCL_DLLPUBLIC BitmapInfoAccess { friend class BitmapReadAccess; @@ -86,7 +85,7 @@ protected: BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode); }; -// - BitmapReadAccess - + class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess { friend class BitmapWriteAccess; @@ -181,7 +180,7 @@ protected: BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode); }; -// - BitmapWriteAccess - + class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess { public: @@ -233,22 +232,25 @@ private: } }; -// - Inlines - + inline bool BitmapInfoAccess::operator!() const { return mpBuffer == nullptr; } + inline long BitmapInfoAccess::Width() const { return mpBuffer ? mpBuffer->mnWidth : 0L; } + inline long BitmapInfoAccess::Height() const { return mpBuffer ? mpBuffer->mnHeight : 0L; } + inline bool BitmapInfoAccess::IsTopDown() const { assert(mpBuffer && "Access is not valid!"); @@ -256,11 +258,13 @@ inline bool BitmapInfoAccess::IsTopDown() const return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN); } + inline bool BitmapInfoAccess::IsBottomUp() const { return !IsTopDown(); } + inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const { assert(mpBuffer && "Access is not valid!"); @@ -268,6 +272,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL; } + inline sal_uLong BitmapInfoAccess::GetScanlineSize() const { assert(mpBuffer && "Access is not valid!"); @@ -275,6 +280,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineSize() const return mpBuffer ? mpBuffer->mnScanlineSize : 0UL; } + inline sal_uInt16 BitmapInfoAccess::GetBitCount() const { assert(mpBuffer && "Access is not valid!"); @@ -282,6 +288,7 @@ inline sal_uInt16 BitmapInfoAccess::GetBitCount() const return mpBuffer ? mpBuffer->mnBitCount : 0; } + inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor) { if (HasPalette()) @@ -290,6 +297,7 @@ inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBi return rBitmapColor; } + inline bool BitmapInfoAccess::HasPalette() const { assert(mpBuffer && "Access is not valid!"); @@ -297,6 +305,7 @@ inline bool BitmapInfoAccess::HasPalette() const return mpBuffer && !!mpBuffer->maPalette; } + inline const BitmapPalette& BitmapInfoAccess::GetPalette() const { assert(mpBuffer && "Access is not valid!"); @@ -304,6 +313,7 @@ inline const BitmapPalette& BitmapInfoAccess::GetPalette() const return mpBuffer->maPalette; } + inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const { assert(HasPalette() && "Bitmap has no palette!"); @@ -311,6 +321,7 @@ inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0; } + inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const { assert(mpBuffer && "Access is not valid!"); @@ -319,13 +330,13 @@ inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) return mpBuffer->maPalette[nColor]; } + inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const { return GetPaletteColor(GetBestPaletteIndex(rBitmapColor)); } - inline ColorMask& BitmapInfoAccess::GetColorMask() const { assert(mpBuffer && "Access is not valid!"); @@ -333,6 +344,7 @@ inline ColorMask& BitmapInfoAccess::GetColorMask() const return mpBuffer->maColorMask; } + inline Scanline BitmapReadAccess::GetBuffer() const { assert(mpBuffer && "Access is not valid!"); @@ -340,6 +352,7 @@ inline Scanline BitmapReadAccess::GetBuffer() const return mpBuffer ? mpBuffer->mpBits : nullptr; } + inline Scanline BitmapReadAccess::GetScanline(long nY) const { assert(mpBuffer && mpScanBuf && "Access is not valid!"); @@ -348,6 +361,7 @@ inline Scanline BitmapReadAccess::GetScanline(long nY) const return mpScanBuf[nY]; } + inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const { assert(mpBuffer && mpScanBuf && "Access is not valid!"); @@ -357,11 +371,13 @@ inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const return mFncGetPixel(mpScanBuf[nY], nX, maColorMask ); } + inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const { return GetPixel(nY, nX).GetBlueOrIndex(); } + inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const { assert(pData && "Access is not valid!"); @@ -369,6 +385,7 @@ inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, lo return mFncGetPixel( pData, nX, maColorMask ); } + inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor) { assert(pData && "Access is not valid!"); @@ -376,6 +393,7 @@ inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const Bi mFncSetPixel(pData, nX, rBitmapColor, maColorMask); } + inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const { if (HasPalette()) @@ -384,11 +402,13 @@ inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const return GetPixel(nY, nX); } + inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const { return GetColor(nY, nX).GetLuminance(); } + inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette) { assert(mpBuffer && "Access is not valid!"); @@ -396,6 +416,7 @@ inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette) mpBuffer->maPalette = rPalette; } + inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount) { assert(mpBuffer && "Access is not valid!"); @@ -403,6 +424,7 @@ inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount) mpBuffer->maPalette.SetEntryCount(nCount); } + inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor) { assert(mpBuffer && "Access is not valid!"); @@ -411,6 +433,7 @@ inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapCo mpBuffer->maPalette[nColor] = rBitmapColor; } + inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor) { assert(mpBuffer && "Access is not valid!"); @@ -420,6 +443,7 @@ inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBi mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask); } + inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex) { SetPixel(nY, nX, BitmapColor(cIndex)); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 9665dfd10ea1..2cea4564235c 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -37,6 +37,7 @@ class UserDrawEvent; class ImplCommonButtonData; enum class DrawButtonFlags; + class VCL_DLLPUBLIC Button : public Control { private: @@ -103,9 +104,6 @@ protected: }; -// - PushButton-Types - - - enum class PushButtonDropdownStyle { NONE = 0x0000, @@ -114,9 +112,6 @@ enum class PushButtonDropdownStyle }; -// - PushButton - - - class VCL_DLLPUBLIC PushButton : public Button { protected: @@ -207,16 +202,19 @@ public: virtual void ShowFocus(const Rectangle& rRect) override; }; + inline void PushButton::Check( bool bCheck ) { SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE ); } + inline bool PushButton::IsChecked() const { return (GetState() == TRISTATE_TRUE); } + class VCL_DLLPUBLIC OKButton : public PushButton { protected: @@ -233,6 +231,7 @@ public: virtual void Click() override; }; + class VCL_DLLPUBLIC CancelButton : public PushButton { protected: @@ -249,6 +248,7 @@ public: virtual void Click() override; }; + class VCL_DLLPUBLIC CloseButton : public CancelButton { public: @@ -256,10 +256,6 @@ public: }; - -// - HelpButton - - - class VCL_DLLPUBLIC HelpButton : public PushButton { protected: @@ -277,7 +273,6 @@ public: }; -// - RadioButton - class VCL_DLLPUBLIC RadioButton : public Button { private: @@ -404,9 +399,6 @@ public: }; -// - CheckBox - - - class VCL_DLLPUBLIC CheckBox : public Button { private: @@ -495,24 +487,24 @@ public: virtual void ShowFocus(const Rectangle& rRect) override; }; + inline void CheckBox::Check( bool bCheck ) { SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE ); } + inline bool CheckBox::IsChecked() const { return (GetState() == TRISTATE_TRUE); } -// - Control-Layer fuer alten Code - - - class VCL_DLLPUBLIC ImageButton : public PushButton { protected: using PushButton::ImplInitStyle; + private: SAL_DLLPRIVATE void ImplInitStyle(); @@ -524,6 +516,7 @@ public: ImageButton( vcl::Window* pParent, const ResId& rResId ); }; + class VCL_DLLPUBLIC ImageRadioButton : public RadioButton { ImageRadioButton( const ImageRadioButton & ) = delete; @@ -533,6 +526,7 @@ public: explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); }; + class VCL_DLLPUBLIC TriStateBox : public CheckBox { TriStateBox( const TriStateBox & ) = delete; @@ -542,10 +536,12 @@ public: explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; + class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override; + public: explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index bba39cc97ddd..d3ec4ffc9435 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -26,10 +26,6 @@ #include <vcl/keycod.hxx> #include <vcl/font.hxx> - -// - CommandExtTextInputData - - - #define EXTTEXTINPUT_ATTR_GRAYWAVELINE ((sal_uInt16)0x0100) #define EXTTEXTINPUT_ATTR_UNDERLINE ((sal_uInt16)0x0200) #define EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((sal_uInt16)0x0400) @@ -42,6 +38,7 @@ #define EXTTEXTINPUT_CURSOR_INVISIBLE ((sal_uInt16)0x0001) #define EXTTEXTINPUT_CURSOR_OVERWRITE ((sal_uInt16)0x0002) + class VCL_DLLPUBLIC CommandExtTextInputData { private: @@ -70,9 +67,6 @@ public: }; -// - CommandInputContextData - - - class VCL_DLLPUBLIC CommandInputContextData { private: @@ -83,20 +77,19 @@ public: CommandInputContextData( LanguageType eLang ); }; + inline CommandInputContextData::CommandInputContextData() { meLanguage = LANGUAGE_DONTKNOW; } + inline CommandInputContextData::CommandInputContextData( LanguageType eLang ) { meLanguage = eLang; } -// - CommandWheelData - - - enum class CommandWheelMode { NONE = 0, @@ -106,6 +99,7 @@ enum class CommandWheelMode DATAZOOM = 4 }; + // Magic value used in mnLines field in CommandWheelData #define COMMAND_WHEEL_PAGESCROLL ((sal_uLong)0xFFFFFFFF) @@ -145,6 +139,7 @@ public: { return ((mnCode & KEY_MOD2) != 0); } }; + inline CommandWheelData::CommandWheelData() { mnDelta = 0; @@ -156,6 +151,7 @@ inline CommandWheelData::CommandWheelData() mbDeltaIsPixel = false; } + inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta, sal_uLong nScrollLines, CommandWheelMode nWheelMode, sal_uInt16 nKeyModifier, @@ -171,9 +167,6 @@ inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDel } -// - CommandScrollData - - - class VCL_DLLPUBLIC CommandScrollData { private: @@ -188,12 +181,14 @@ public: long GetDeltaY() const { return mnDeltaY; } }; + inline CommandScrollData::CommandScrollData() { mnDeltaX = 0; mnDeltaY = 0; } + inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY ) { mnDeltaX = nDeltaX; @@ -201,9 +196,6 @@ inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY ) } -// - CommandModKeyData - - - class VCL_DLLPUBLIC CommandModKeyData { private: @@ -219,26 +211,26 @@ public: bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) != 0; } }; + inline CommandModKeyData::CommandModKeyData() { mnCode = 0L; } + inline CommandModKeyData::CommandModKeyData( sal_uInt16 nCode ) { mnCode = nCode; } -// - CommandDialogData - - - enum class ShowDialogId { Preferences = 1, About = 2, }; + class VCL_DLLPUBLIC CommandDialogData { ShowDialogId m_nDialogId; @@ -250,6 +242,7 @@ public: ShowDialogId GetDialogId() const { return m_nDialogId; } }; + // Media Commands enum class MediaCommand { @@ -277,6 +270,7 @@ enum class MediaCommand PreviousTrackHold = 22,// Button Left holding pressed. }; + class VCL_DLLPUBLIC CommandMediaData { MediaCommand m_nMediaId; @@ -292,7 +286,7 @@ public: bool GetPassThroughToOS() const { return m_bPassThroughToOS; } }; -// - CommandSelectionChangeData - + class VCL_DLLPUBLIC CommandSelectionChangeData { private: @@ -307,11 +301,13 @@ public: sal_uLong GetEnd() const { return mnEnd; } }; + inline CommandSelectionChangeData::CommandSelectionChangeData() { mnStart = mnEnd = 0; } + inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd ) { @@ -319,6 +315,7 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, mnEnd = nEnd; } + class VCL_DLLPUBLIC CommandSwipeData { double mnVelocityX; @@ -334,6 +331,7 @@ public: double getVelocityX() const { return mnVelocityX; } }; + class VCL_DLLPUBLIC CommandLongPressData { double mnX; @@ -354,7 +352,6 @@ public: }; -// - CommandEvent - enum class CommandEventId { NONE = 0, @@ -381,6 +378,7 @@ enum class CommandEventId LongPress = 22, }; + class VCL_DLLPUBLIC CommandEvent { private: @@ -410,6 +408,7 @@ public: const CommandLongPressData* GetLongPressData() const; }; + inline CommandEvent::CommandEvent() { mpData = nullptr; @@ -417,6 +416,7 @@ inline CommandEvent::CommandEvent() mbMouseEvent = false; } + inline CommandEvent::CommandEvent( const Point& rMousePos, CommandEventId nCmd, bool bMEvt, const void* pCmdData ) : maPos( rMousePos ) @@ -426,6 +426,7 @@ inline CommandEvent::CommandEvent( const Point& rMousePos, mbMouseEvent = bMEvt; } + inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const { if ( mnCommand == CommandEventId::ExtTextInput ) @@ -434,6 +435,7 @@ inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const return nullptr; } + inline const CommandWheelData* CommandEvent::GetWheelData() const { if ( mnCommand == CommandEventId::Wheel ) @@ -442,6 +444,7 @@ inline const CommandWheelData* CommandEvent::GetWheelData() const return nullptr; } + inline const CommandScrollData* CommandEvent::GetAutoScrollData() const { if ( mnCommand == CommandEventId::AutoScroll ) @@ -450,6 +453,7 @@ inline const CommandScrollData* CommandEvent::GetAutoScrollData() const return nullptr; } + inline const CommandModKeyData* CommandEvent::GetModKeyData() const { if( mnCommand == CommandEventId::ModKeyChange ) @@ -458,6 +462,7 @@ inline const CommandModKeyData* CommandEvent::GetModKeyData() const return nullptr; } + inline const CommandDialogData* CommandEvent::GetDialogData() const { if( mnCommand == CommandEventId::ShowDialog ) @@ -466,6 +471,7 @@ inline const CommandDialogData* CommandEvent::GetDialogData() const return nullptr; } + inline CommandMediaData* CommandEvent::GetMediaData() const { if( mnCommand == CommandEventId::Media ) @@ -474,6 +480,7 @@ inline CommandMediaData* CommandEvent::GetMediaData() const return nullptr; } + inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() const { if( mnCommand == CommandEventId::SelectionChange ) @@ -482,6 +489,7 @@ inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() return nullptr; } + inline const CommandSwipeData* CommandEvent::GetSwipeData() const { if( mnCommand == CommandEventId::Swipe ) @@ -490,6 +498,7 @@ inline const CommandSwipeData* CommandEvent::GetSwipeData() const return nullptr; } + inline const CommandLongPressData* CommandEvent::GetLongPressData() const { if( mnCommand == CommandEventId::LongPress ) diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 3ede0ebb4271..803f2f5e0ef7 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -31,7 +31,6 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; } class StyleSettings; -// - Control - class VCL_DLLPUBLIC Control : public vcl::Window diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index f9f427684f8b..e11cdeb22fad 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -25,7 +25,6 @@ #include <vcl/salctype.hxx> -// - GraphicConverter - struct ConvertData; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 1c0b92f291cc..3aa38f543802 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -25,7 +25,6 @@ #include <vcl/syswin.hxx> #include <vcl/vclptr.hxx> -// - Dialog - struct DialogImpl; class VclBox; @@ -123,7 +122,6 @@ public: void GrabFocusToFirstControl(); }; -// - ModelessDialog - class VCL_DLLPUBLIC ModelessDialog : public Dialog { ModelessDialog (const ModelessDialog &) = delete; @@ -133,7 +131,6 @@ public: explicit ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); }; -// - ModalDialog - class VCL_DLLPUBLIC ModalDialog : public Dialog { public: diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 65b70c7028df..3f8f2f6acdf7 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -209,7 +209,6 @@ public: }; -// - DockingWindow - class VCL_DLLPUBLIC DockingWindow diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 3e6fbb77c5da..ec947b672db0 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -47,7 +47,6 @@ struct DDInfo; struct Impl_IMEInfos; -// - Edit-Types - #define EDIT_NOLIMIT SAL_MAX_INT32 #define EDIT_UPDATEDATA_TIMEOUT 350 @@ -70,7 +69,6 @@ enum AutocompleteAction{ AUTOCOMPLETE_KEYINPUT, AUTOCOMPLETE_TABFORWARD, AUTOCOM class Timer; -// - Edit - class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient { private: diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 6db6d3adfaf5..119027cf0fdc 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -81,7 +81,6 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode, } -// - MouseEvent-Types - enum class MouseEventModifiers @@ -112,7 +111,6 @@ namespace o3tl #define MOUSE_RIGHT ((sal_uInt16)0x0004) -// - MouseEvent - class VCL_DLLPUBLIC MouseEvent @@ -244,7 +242,6 @@ public: }; -// - HelpEvent - enum class HelpEventMode { @@ -341,7 +338,6 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR } -// - TrackingEvent - class VCL_DLLPUBLIC TrackingEvent @@ -378,7 +374,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, } -// - NotifyEvent - enum class MouseNotifyEvent { @@ -445,7 +440,6 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const } -// - DataChangedEvent - enum class DataChangedEventType { diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 0f855a35b00f..0741efdf2d37 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -35,7 +35,6 @@ class LocaleDataWrapper; class LanguageTag; -// - FormatterBase - class VCL_DLLPUBLIC FormatterBase @@ -91,7 +90,6 @@ public: -// - PatternFormatter - #define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) @@ -130,7 +128,6 @@ public: }; -// - NumericFormatter - class VCL_DLLPUBLIC NumericFormatter : public FormatterBase @@ -209,7 +206,6 @@ public: }; -// - MetricFormatter - class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter @@ -267,7 +263,6 @@ public: -// - CurrencyFormatter - class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter @@ -293,7 +288,6 @@ public: -// - DateFormatter - class VCL_DLLPUBLIC DateFormatter : public FormatterBase @@ -387,7 +381,6 @@ public: -// - TimeFormatter - class VCL_DLLPUBLIC TimeFormatter : public FormatterBase @@ -465,7 +458,6 @@ public: -// - PatternField - class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter @@ -481,7 +473,6 @@ public: -// - NumericField - class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter @@ -511,7 +502,6 @@ public: -// - MetricField - class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter @@ -582,7 +572,6 @@ public: -// - CurrencyField - class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter @@ -605,7 +594,6 @@ public: -// - DateField - class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter @@ -639,7 +627,6 @@ public: }; -// - TimeField - class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter @@ -676,7 +663,6 @@ public: -// - PatternBox - class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter @@ -695,7 +681,6 @@ public: -// - NumericBox - class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter @@ -719,7 +704,6 @@ public: -// - MetricBox - class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter @@ -753,7 +737,6 @@ public: -// - CurrencyBox - class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter @@ -774,7 +757,6 @@ public: }; -// - DateBox - class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter @@ -794,7 +776,6 @@ public: -// - TimeBox - class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 3c9e3a35446b..85188d288821 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -30,7 +30,6 @@ class UserDrawEvent; -// - FixedText - class VCL_DLLPUBLIC FixedText : public Control @@ -92,7 +91,6 @@ public: }; -// - FixedLine - class VCL_DLLPUBLIC FixedLine : public Control @@ -126,7 +124,6 @@ public: virtual Size GetOptimalSize() const override; }; -// - FixedBitmap - class VCL_DLLPUBLIC FixedBitmap : public Control { private: @@ -155,7 +152,6 @@ public: }; -// - FixedImage - class VCL_DLLPUBLIC FixedImage : public Control diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 20b0688adc97..01672f0b7650 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -28,7 +28,6 @@ class ToolBox; -// - FloatingWindow-Types - enum class FloatWinPopupFlags @@ -87,7 +86,6 @@ enum HitTest HITTEST_RECT }; -// - FloatingWindow - class VCL_DLLPUBLIC FloatingWindow : public SystemWindow { diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 6875a5074ca4..15461dcc2031 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -40,7 +40,6 @@ namespace tools { class Gradient; -// - GDIMetaFile-Types - #define GDI_METAFILE_END ((size_t)0xFFFFFFFF) @@ -54,7 +53,6 @@ enum MtfConversion }; -// - Color conversion routines - typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index b9e461761d2c..f31824dfb8cd 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -29,7 +29,6 @@ class SvStream; -// - ImpBuffer - struct ImpBuffer @@ -49,7 +48,6 @@ struct ImpBuffer }; -// - ImpSwap - struct ImpSwap @@ -69,7 +67,6 @@ struct ImpSwap }; -// - ImpGfxLink - struct ImpGfxLink @@ -90,7 +87,6 @@ struct ImpGfxLink //#endif // __PRIVATE -// - GfxLinkType - enum GfxLinkType @@ -115,7 +111,6 @@ enum GfxLinkType #define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP -// - GfxLink - struct ImpBuffer; diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 3f2404b5ba0a..5c44fc5486d6 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -28,7 +28,6 @@ #include <o3tl/cow_wrapper.hxx> -// - Impl_Gradient - class Rectangle; @@ -60,7 +59,6 @@ public: }; -// - Gradient - class VCL_DLLPUBLIC Gradient diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a1d987f7fbe5..bd83af4bb493 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -129,7 +129,6 @@ enum class GraphicFileFormat XXX = 0xffff }; -// - GraphicDescriptor - class VCL_DLLPUBLIC GraphicDescriptor diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index a781cf96d6d2..0ba7e3ad77bd 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -25,7 +25,6 @@ #include <vcl/ctrl.hxx> -// - GroupBox - class VCL_DLLPUBLIC GroupBox : public Control diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 935ea9ac6e06..0dd3e8c3601d 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -26,7 +26,6 @@ #include <vcl/vclenum.hxx> -// - Impl_Hatch - class SvStream; @@ -47,7 +46,6 @@ struct ImplHatch }; -// - Hatch - class VCL_DLLPUBLIC Hatch diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index 4d226a8122f8..1970c21dd99a 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -30,7 +30,6 @@ class Rectangle; namespace vcl { class Window; } -// - Help-Types - enum class QuickHelpFlags { @@ -59,7 +58,6 @@ namespace o3tl #define OOO_HELP_INDEX ".help:index" -// - Help - class VCL_DLLPUBLIC Help { diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index cdfd9498916f..582b73274fdb 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -26,7 +26,6 @@ #include <vcl/bitmapex.hxx> -// - ImageControl - class VCL_DLLPUBLIC ImageControl : public FixedImage diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index d1f3f9ff3f5b..ced1d2903bc3 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -26,7 +26,6 @@ #include <o3tl/typed_flags_set.hxx> -// - InputContext-Flags - enum class InputContextFlags @@ -43,7 +42,6 @@ namespace o3tl } -// - InputContext - class VCL_DLLPUBLIC InputContext diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 2faf4a0c93c3..3495bb28dd33 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/drawing/LineCap.hpp> -// - ImplLineInfo - class SvStream; @@ -57,7 +56,6 @@ struct ImplLineInfo }; -// - LineInfo - class VCL_DLLPUBLIC LineInfo diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index ad92f1a7c2be..d159d9255b67 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -27,7 +27,6 @@ class LocaleDataWrapper; -// - LongCurrencyFormatter - class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase @@ -73,7 +72,6 @@ public: }; -// - LongCurrencyField - class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter @@ -106,7 +104,6 @@ public: }; -// - LongCurrencyBox - class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 2edd16f09923..1fef4f749864 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -29,7 +29,6 @@ class SvStream; class OutputDevice; -// - MapMode - class VCL_DLLPUBLIC MapMode diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index be86fa9e3603..3e47a87df4fd 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -26,7 +26,6 @@ #include <vcl/dllapi.h> -// - ImplMnemonicTypes - // Mnemonic Chars, which we want support @@ -52,7 +51,6 @@ #define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) -// - MnemonicGenerator - class VCL_DLLPUBLIC MnemonicGenerator diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index bc627a4c559a..5e96c3a9eb5a 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -28,7 +28,6 @@ struct ImplMoreButtonData; -// - MoreButton - class VCL_DLLPUBLIC MoreButton : public PushButton diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 13eac89d1686..884e8076edc7 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -46,13 +46,11 @@ ************************************************************************/ -// - WinBits - #define WB_STDPROGRESSBAR WB_BORDER -// - ProgressBar - class VCL_DLLPUBLIC ProgressBar : public vcl::Window diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 3dfa9ca6b864..2d5d9b969e10 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -25,19 +25,16 @@ #include <o3tl/typed_flags_set.hxx> -// - Duplex Mode - enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE }; -// - Orientation - enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; -// - QueueInfo-Types - enum class PrintQueueFlags { @@ -76,7 +73,6 @@ namespace o3tl #define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) -// - Printer-Types - enum class PrinterCapType { diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 6037bdcfb1dc..63664484a413 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -29,13 +29,11 @@ #include <vcl/dllapi.h> -// - Memory - typedef sal_uInt8* Scanline; typedef const sal_uInt8* ConstScanline; -// - Bitmap formats - #define BMP_FORMAT_BOTTOM_UP 0x00000000UL #define BMP_FORMAT_TOP_DOWN 0x80000000UL @@ -86,7 +84,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) | \ d_ALPHA ) -// - BitmapColor - class Color; @@ -139,7 +136,6 @@ public: inline sal_uInt16 GetColorError( const BitmapColor& rBitmapColor ) const; }; -// - BitmapPalette - class Palette; class VCL_DLLPUBLIC BitmapPalette @@ -223,7 +219,6 @@ struct VCL_DLLPUBLIC ColorMaskElement } }; -// - ColorMask - class VCL_DLLPUBLIC ColorMask { ColorMaskElement maR; @@ -264,7 +259,6 @@ public: inline void SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const; }; -// - BitmapBuffer - struct VCL_DLLPUBLIC BitmapBuffer { sal_uLong mnFormat; @@ -277,7 +271,6 @@ struct VCL_DLLPUBLIC BitmapBuffer sal_uInt8* mpBits; }; -// - Access modes - typedef enum { BITMAP_INFO_ACCESS, @@ -286,7 +279,6 @@ typedef enum } BitmapAccessMode; -// - StretchAndConvert - VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = nullptr, const ColorMask* pDstMask = nullptr ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 99b547baf1d8..e9864609280c 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -27,14 +27,12 @@ class AutoTimer; -// - ScrollBar-Types - enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN, SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET }; -// - ScrollBar - struct ImplScrollBarData; @@ -141,7 +139,6 @@ public: }; -// - ScrollBarBox - class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index aa0c256d20b6..7576c61dfba5 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -37,7 +37,6 @@ class CommandEvent; enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION }; -// - FunctionSet - class VCL_DLLPUBLIC FunctionSet @@ -62,7 +61,6 @@ public: }; -// - SelectionEngine - enum class SelectionEngineFlags { DRG_ENAB = 0x0001, diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 46de94d538f9..aa6f4d51e77f 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -53,7 +53,6 @@ namespace vcl { class IconThemeInfo; } -// - MouseSettings - enum class MouseSettingsOptions { @@ -177,7 +176,6 @@ struct FrameStyle -// - StyleSettings - enum class StyleSettingsOptions @@ -626,7 +624,6 @@ public: }; -// - MiscSettings - class VCL_DLLPUBLIC MiscSettings @@ -654,7 +651,6 @@ public: }; -// - HelpSettings - class VCL_DLLPUBLIC HelpSettings { @@ -675,7 +671,6 @@ public: }; -// - AllSettings - enum class AllSettingsFlags { NONE = 0x0000, diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 7f4bc6f04517..d99b4ff9a431 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -25,7 +25,6 @@ namespace vcl { class Window; } -// - Sound - class VCL_DLLPUBLIC Sound diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 6f55421e7c00..68392f0f15fb 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -26,7 +26,6 @@ #include <vcl/timer.hxx> -// - SpinButton - class VCL_DLLPUBLIC SpinButton : public Control diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 571e8d05b50c..23339b164dc6 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -29,7 +29,6 @@ struct ImplStatusItem; typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; -// - Progress-Ausgabe - void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, @@ -37,13 +36,11 @@ void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRende const Rectangle& rFramePosSize); -// - StatusBarItemBits - typedef sal_uInt16 StatusBarItemBits; -// - Bits fuer StatusBarItems - #define SIB_LEFT ((StatusBarItemBits)0x0001) @@ -56,7 +53,6 @@ typedef sal_uInt16 StatusBarItemBits; #define SIB_USERDRAW ((StatusBarItemBits)0x0080) -// - StatusBar-Types - #define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) @@ -64,7 +60,6 @@ typedef sal_uInt16 StatusBarItemBits; #define STATUSBAR_OFFSET ((long)5) -// - StatusBar - class VCL_DLLPUBLIC StatusBar : public vcl::Window diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index e95cbf93f7bb..58771f29da92 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -32,7 +32,6 @@ class NotebookBarWindow; class TaskPaneList; class VclContainer; -// - Icon-Types - #define ICON_LO_DEFAULT 1 #define ICON_TEXT_DOCUMENT 2 #define ICON_SPREADSHEET_DOCUMENT 4 @@ -44,7 +43,6 @@ class VclContainer; #define ICON_MACROLIBRARY 1 -// - WindowStateData - #define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001) @@ -121,7 +119,6 @@ public: }; -// - SystemWindow-Types - enum class MenuBarMode @@ -136,7 +133,6 @@ enum class TitleButton Menu = 4, }; -// - SystemWindow - class VCL_DLLPUBLIC SystemWindow : public vcl::Window , public VclBuilderContainer diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index ff04ade6181c..734607a450b5 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -26,7 +26,6 @@ #include <vcl/window.hxx> -// - TabPage - class VCL_DLLPUBLIC TabPage diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 5487745d36ab..060c068ead4e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -121,7 +121,6 @@ namespace o3tl } -// - WindowTypes - // Type fuer GetWindow() @@ -430,7 +429,6 @@ enum class GetDlgWindowType }; -// - Window - #ifdef DBG_UTIL diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 5f0523858596..507de99dddbe 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} struct SystemParentData; -// - WorkWindow - Types - // Presentation Flags @@ -47,7 +46,6 @@ namespace o3tl } -// - WorkWindow - class VCL_DLLPUBLIC WorkWindow : public SystemWindow diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx index 151d57da8bf7..e78ae0a82ca3 100644 --- a/include/xmloff/settingsstore.hxx +++ b/include/xmloff/settingsstore.hxx @@ -22,13 +22,13 @@ class DocumentSettingsSerializer { public: // Import objects and update properties (eliding URLs) virtual css::uno::Sequence<css::beans::PropertyValue> - filterStreamsFromStorage( + filterStreamsFromStorage( OUString const & referer, const css::uno::Reference< css::embed::XStorage > &xStorage, const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0; // Export objects and update properties with relative URLs into this storage virtual css::uno::Sequence<css::beans::PropertyValue> - filterStreamsToStorage( + filterStreamsToStorage( const css::uno::Reference< css::embed::XStorage > &xStorage, const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0; diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx index 28156d0570d7..50b70eee5346 100644 --- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx +++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -74,7 +74,7 @@ private: bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; void insertReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); - IdMap_t maEntries; + IdMap_t maEntries; sal_Int32 mnNextId; }; diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx index 2d22d208f89d..b57f7549ab23 100644 --- a/include/xmloff/xmltypes.hxx +++ b/include/xmloff/xmltypes.hxx @@ -152,7 +152,7 @@ #define XML_TYPE_NEG_PERCENT8 0x00002022 // (100-x)% #define XML_TYPE_NEG_PERCENT16 0x00002023 // (100-x) #define XML_TYPE_DOUBLE_PERCENT 0x00002024 // 50% (source is a double from 0.0 to 1.0) -#define XML_TYPE_HEX 0x00002025 // 00544F1B +#define XML_TYPE_HEX 0x00002025 // 00544F1B // special basic types #define XML_TYPE_RECTANGLE_LEFT 0x00000100 // the Left member of a awt::Rectangle as a measure diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 31ba45faa815..128dc726e231 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -143,7 +143,7 @@ public: ::xmloff::token::XML_TOKEN_INVALID ); /** convert double number to string (using ::rtl::math) and DO - convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */ + convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */ void convertDouble(OUStringBuffer& rBuffer, double fNumber, bool bWriteUnits) const; |