summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/ImageListProvider.hxx51
-rw-r--r--include/vcl/accel.hxx6
-rw-r--r--include/vcl/btndlg.hxx2
-rw-r--r--include/vcl/button.hxx6
-rw-r--r--include/vcl/dockwin.hxx10
-rw-r--r--include/vcl/edit.hxx6
-rw-r--r--include/vcl/fixed.hxx6
-rw-r--r--include/vcl/gdimtf.hxx4
-rw-r--r--include/vcl/menu.hxx24
-rw-r--r--include/vcl/outdev.hxx8
-rw-r--r--include/vcl/print.hxx2
-rw-r--r--include/vcl/scrbar.hxx2
-rw-r--r--include/vcl/slider.hxx4
-rw-r--r--include/vcl/spin.hxx4
-rw-r--r--include/vcl/split.hxx12
-rw-r--r--include/vcl/status.hxx4
-rw-r--r--include/vcl/timer.hxx2
-rw-r--r--include/vcl/toolbox.hxx48
-rw-r--r--include/vcl/vclmedit.hxx2
-rw-r--r--include/vcl/window.hxx8
20 files changed, 77 insertions, 134 deletions
diff --git a/include/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx
deleted file mode 100644
index 1aa35dc238cd..000000000000
--- a/include/vcl/ImageListProvider.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_IMAGELISTPROVIDER_HXX
-#define INCLUDED_VCL_IMAGELISTPROVIDER_HXX
-
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star { namespace lang { class IllegalArgumentException; }}}}
-
-class ImageList;
-
-
-namespace vcl
-{
- enum ImageListType
- {
- IMAGELISTTYPE_UNKNOWN = 0,
- HIGHCONTRAST_NO = 1,
- HIGHCONTRAST_YES = 2
- };
-
- /* abstract */ class IImageListProvider
- {
- public:
- ;
-
- protected:
- ~IImageListProvider() {}
- };
-} /* vcl */
-
-#endif // INCLUDED_VCL_IMAGELISTPROVIDER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index d0394bb94cf5..d7d9d296ca2d 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -68,9 +68,9 @@ public:
Accelerator( const ResId& rResId );
virtual ~Accelerator();
- void Activate();
- void Deactivate();
- void Select();
+ void Activate();
+ void Deactivate();
+ void Select();
void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode );
void InsertItem( const ResId& rResId );
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 5601f1ffc93d..d537592de190 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -44,7 +44,7 @@ public:
virtual void Resize() SAL_OVERRIDE;
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
- void Click();
+ void Click();
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
const Size& GetPageSizePixel() const { return maPageSize; }
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 7e59b06e3ede..3ea832d9525d 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -168,16 +168,16 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void UserDraw( const UserDrawEvent& rUDEvt );
+ void UserDraw( const UserDrawEvent& rUDEvt );
- void Toggle();
+ void Toggle();
void SetSymbol( SymbolType eSymbol );
SymbolType GetSymbol() const { return meSymbol; }
void SetSymbolAlign( SymbolAlign eAlign );
void SetDropDown( sal_uInt16 nStyle );
- sal_uInt16 GetDropDown() const { return mnDDStyle; }
+ sal_uInt16 GetDropDown() const { return mnDDStyle; }
void SetState( TriState eState );
TriState GetState() const { return meState; }
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index ca9325a1494f..1ae7479a19db 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -173,7 +173,7 @@ public:
void SetFloatStyle( WinBits nWinStyle );
WinBits GetFloatStyle() const { return mnFloatBits;}
- void setPosSizePixel( long nX, long nY,
+ void setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
void SetPosSizePixel( const Point& rNewPos,
@@ -311,10 +311,10 @@ public:
virtual bool PrepareToggleFloatingMode();
virtual void ToggleFloatingMode();
- void TitleButtonClick( sal_uInt16 nButton );
- void Pin();
- void Roll();
- void PopupModeEnd();
+ void TitleButtonClick( sal_uInt16 nButton );
+ void Pin();
+ void Roll();
+ void PopupModeEnd();
virtual void Resizing( Size& rSize );
virtual bool Close();
virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 9479fcbdeba8..d4169265a024 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -223,8 +223,8 @@ public:
virtual void SetText( const OUString& rStr, const Selection& rNewSelection );
virtual OUString GetText() const SAL_OVERRIDE;
- void SetPlaceholderText( const OUString& rStr );
- OUString GetPlaceholderText() const;
+ void SetPlaceholderText( const OUString& rStr );
+ OUString GetPlaceholderText() const;
void SaveValue() { maSaveValue = GetText(); }
const OUString& GetSavedValue() const { return maSaveValue; }
@@ -244,7 +244,7 @@ public:
virtual Size CalcMinimumSizeForText(const OUString &rString) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
virtual Size CalcSize(sal_Int32 nChars) const;
- sal_Int32 GetMaxVisChars() const;
+ sal_Int32 GetMaxVisChars() const;
sal_Int32 GetCharPos( const Point& rWindowPos ) const;
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 92b0967127f3..0119e9dc0d5f 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -185,15 +185,15 @@ public:
virtual void Resize() SAL_OVERRIDE;
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void UserDraw( const UserDrawEvent& rUDEvt );
+ void UserDraw( const UserDrawEvent& rUDEvt );
virtual Size GetOptimalSize() const SAL_OVERRIDE;
void SetImage( const Image& rImage );
const Image& GetImage() const { return maImage; }
- bool SetModeImage( const Image& rImage );
+ bool SetModeImage( const Image& rImage );
const Image& GetModeImage( ) const { return maImage;}
- virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
+ virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
static Image loadThemeImage(const OString &rFileName);
};
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 8ff335346d8f..05ab48ad2c98 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -118,8 +118,8 @@ private:
protected:
- void Linker( OutputDevice* pOut, bool bLink );
- long Hook();
+ void Linker( OutputDevice* pOut, bool bLink );
+ long Hook();
public:
GDIMetaFile();
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index a1986ba634f0..8bd9c77a2b27 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -213,11 +213,11 @@ protected:
public:
virtual ~Menu();
- void Activate();
- void Deactivate();
+ void Activate();
+ void Deactivate();
virtual void Highlight();
virtual void Select();
- void RequestHelp( const HelpEvent& rHEvt );
+ void RequestHelp( const HelpEvent& rHEvt );
void InsertItem( sal_uInt16 nItemId, const OUString& rStr,
MenuItemBits nItemBits = MenuItemBits::NONE,
@@ -243,9 +243,9 @@ public:
void CreateAutoMnemonics();
void SetMenuFlags( sal_uInt16 nFlags ) { nMenuFlags = nFlags; }
- sal_uInt16 GetMenuFlags() const { return nMenuFlags; }
+ sal_uInt16 GetMenuFlags() const { return nMenuFlags; }
- sal_uInt16 GetItemCount() const;
+ sal_uInt16 GetItemCount() const;
sal_uInt16 GetItemId(sal_uInt16 nPos) const;
sal_uInt16 GetItemId(const OString &rIdent) const;
sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
@@ -280,17 +280,17 @@ public:
{
EnableItem(GetItemId(rIdent), bEnable);
}
- bool IsItemEnabled( sal_uInt16 nItemId ) const;
+ bool IsItemEnabled( sal_uInt16 nItemId ) const;
void ShowItem( sal_uInt16 nItemId, bool bVisible = true );
void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, false ); }
- bool IsItemPosVisible( sal_uInt16 nItemPos ) const;
- bool IsMenuVisible() const;
+ bool IsItemPosVisible( sal_uInt16 nItemPos ) const;
+ bool IsMenuVisible() const;
virtual bool IsMenuBar() const = 0;
void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false );
- bool HasValidEntries( bool bCheckPopups = true );
+ bool HasValidEntries( bool bCheckPopups = true );
void SetItemText( sal_uInt16 nItemId, const OUString& rStr );
OUString GetItemText( sal_uInt16 nItemId ) const;
@@ -359,15 +359,15 @@ public:
void SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
// gets the activation key of the specified item
- KeyEvent GetActivationKey( sal_uInt16 nItemId ) const;
+ KeyEvent GetActivationKey( sal_uInt16 nItemId ) const;
- vcl::Window* GetWindow() const { return pWindow; }
+ vcl::Window* GetWindow() const { return pWindow; }
void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr );
OUString GetAccessibleName( sal_uInt16 nItemId ) const;
// returns whether the item a position nItemPos is highlighted or not.
- bool IsHighlighted( sal_uInt16 nItemPos ) const;
+ bool IsHighlighted( sal_uInt16 nItemPos ) const;
void HighlightItem( sal_uInt16 nItemPos );
void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c8adafd90137..6a2aaa2ea85e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -498,8 +498,8 @@ public:
sal_uInt16 nFlags = 0 );
// Call before and after a paint operation to reduce flushing
- void BeginPaint();
- void EndPaint();
+ void BeginPaint();
+ void EndPaint();
protected:
@@ -1569,9 +1569,9 @@ public:
void EnableMapMode( bool bEnable = true );
bool IsMapModeEnabled() const { return mbMap; }
- void SetMapMode();
+ void SetMapMode();
virtual void SetMapMode( const MapMode& rNewMapMode );
- void SetRelativeMapMode( const MapMode& rNewMapMode );
+ void SetRelativeMapMode( const MapMode& rNewMapMode );
const MapMode& GetMapMode() const { return maMapMode; }
// #i75163#
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index bfa9469f5a48..d6cfc2d1010b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -304,7 +304,7 @@ public:
static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate );
static OUString GetDefaultPrinterName();
- void Error();
+ void Error();
const OUString& GetName() const { return maPrinterName; }
const OUString& GetDriverName() const { return maDriver; }
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 0208635477ce..da949dfdf8d2 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -105,7 +105,7 @@ public:
virtual void LoseFocus() SAL_OVERRIDE;
using Window::Scroll;
- void Scroll();
+ void Scroll();
virtual void EndScroll();
long DoScroll( long nNewPos );
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 859852e458c1..3eb720a89fc4 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -83,8 +83,8 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void Slide();
- void EndSlide();
+ void Slide();
+ void EndSlide();
void EnableDrag( bool bEnable = true )
{ mbFullDrag = bEnable; }
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index 243107afd804..4fb25f31829f 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -59,8 +59,8 @@ public:
explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 );
virtual ~SpinButton();
- void Up();
- void Down();
+ void Up();
+ void Down();
virtual void Resize() SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 81ffe4ffe14f..c24556e5d72f 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -65,9 +65,9 @@ public:
explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL );
virtual ~Splitter();
- void StartSplit();
- void EndSplit();
- void Split();
+ void StartSplit();
+ void EndSplit();
+ void Split();
virtual void Splitting( Point& rSplitPos );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -87,12 +87,12 @@ public:
void SetDragRectPixel( const Rectangle& rDragRect,
vcl::Window* pRefWin = NULL );
const Rectangle& GetDragRectPixel() const { return maDragRect; }
- vcl::Window* GetDragWindow() const { return mpRefWin; }
+ vcl::Window* GetDragWindow() const { return mpRefWin; }
- void SetSplitPosPixel( long nPos );
+ void SetSplitPosPixel( long nPos );
long GetSplitPosPixel() const { return mnSplitPos; }
- bool IsHorizontal() const { return mbHorzSplit; }
+ bool IsHorizontal() const { return mbHorzSplit; }
void SetHorizontal(bool bNew);
// set the stepsize of the splitter for cursor movement
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 124f26c9302e..a9ad080e8715 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -125,8 +125,8 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void Click();
- void DoubleClick();
+ void Click();
+ void DoubleClick();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 602bad2b4aea..8da2381cd7e7 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -110,7 +110,7 @@ class VCL_DLLPUBLIC Idle : public Timer
void Start() { Timer::Start(); }
void Stop() { Timer::Stop(); }
- void DoIdle();
+ void DoIdle();
virtual void Timeout() SAL_OVERRIDE { DoIdle(); }
};
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9b9d2c21f6e9..d4baf3e16800 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -36,11 +36,6 @@ struct ImplToolBoxPrivateData;
class ImplTrackRect;
class PopupMenu;
-namespace vcl
-{
- class IImageListProvider;
-}
-
#define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE)
class VCL_DLLPUBLIC ToolBoxCustomizeEvent
@@ -249,7 +244,6 @@ private:
SAL_DLLPRIVATE ToolBox (const ToolBox &);
SAL_DLLPRIVATE ToolBox& operator= (const ToolBox &);
- SAL_DLLPRIVATE void ImplUpdateImageList(); // called if StateChanged
public:
SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL );
SAL_DLLPRIVATE void ImplDisableFlatButtons();
@@ -290,13 +284,13 @@ public:
virtual ~ToolBox();
virtual void Click();
- void DoubleClick();
+ void DoubleClick();
virtual void Activate() SAL_OVERRIDE;
virtual void Deactivate() SAL_OVERRIDE;
- void Highlight();
+ void Highlight();
virtual void Select();
- void Customize( const ToolBoxCustomizeEvent& rCEvt );
- void UserDraw( const UserDrawEvent& rUDEvt );
+ void Customize( const ToolBoxCustomizeEvent& rCEvt );
+ void UserDraw( const UserDrawEvent& rUDEvt );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -368,19 +362,19 @@ public:
bool IsHorizontal() const { return mbHorz; }
void SetLineCount( sal_uInt16 nNewLines );
- sal_uInt16 GetLineCount() const { return mnLines; }
- sal_uInt16 GetCurLine() const { return mnCurLine; }
+ sal_uInt16 GetLineCount() const { return mnLines; }
+ sal_uInt16 GetCurLine() const { return mnCurLine; }
void ShowLine( bool bNext );
// Used to enable/disable scrolling one page at a time for toolbar
void SetPageScroll( bool b );
- sal_uInt16 GetItemCount() const;
+ sal_uInt16 GetItemCount() const;
ToolBoxItemType GetItemType( sal_uInt16 nPos ) const;
- sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
- sal_uInt16 GetItemPos( const Point& rPos ) const;
- sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
- sal_uInt16 GetItemId( const Point& rPos ) const;
+ sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
+ sal_uInt16 GetItemPos( const Point& rPos ) const;
+ sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
+ sal_uInt16 GetItemId( const Point& rPos ) const;
/// Map the command name (like .uno:Save) back to item id.
sal_uInt16 GetItemId( const OUString& rCommand ) const;
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
@@ -393,11 +387,11 @@ public:
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
Rectangle GetScrollRect() const;
- sal_uInt16 GetCurItemId() const { return mnCurItemId; }
- sal_uInt16 GetDownItemId() const { return mnDownItemId; }
- sal_uInt16 GetClicks() const { return mnMouseClicks; }
- sal_uInt16 GetModifier() const { return mnMouseModifier; }
- sal_uInt16 GetKeyModifier() const { return mnKeyModifier; }
+ sal_uInt16 GetCurItemId() const { return mnCurItemId; }
+ sal_uInt16 GetDownItemId() const { return mnDownItemId; }
+ sal_uInt16 GetClicks() const { return mnMouseClicks; }
+ sal_uInt16 GetModifier() const { return mnMouseModifier; }
+ sal_uInt16 GetKeyModifier() const { return mnKeyModifier; }
void SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits );
ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const;
@@ -413,8 +407,8 @@ public:
void SetItemText( sal_uInt16 nItemId, const OUString& rText );
const OUString& GetItemText( sal_uInt16 nItemId ) const;
void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow );
- vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const;
- sal_uInt16 GetHighlightItemId() const { return mnHighItemId; }
+ vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const;
+ sal_uInt16 GetHighlightItemId() const { return mnHighItemId; }
void StartSelection();
void EndSelection();
@@ -478,7 +472,7 @@ public:
void SetDockingRects( const Rectangle& rOutRect,
const Rectangle& rInRect );
void SetFloatingLines( sal_uInt16 nFloatLines );
- sal_uInt16 GetFloatingLines() const;
+ sal_uInt16 GetFloatingLines() const;
void SetStyle( WinBits nNewStyle );
WinBits GetStyle() const { return mnWinStyle; }
@@ -493,7 +487,7 @@ public:
bool IsMenuStringsEnabled() const { return mbMenuStrings; }
void SetOutStyle( sal_uInt16 nNewStyle );
- sal_uInt16 GetOutStyle() const { return mnOutStyle; }
+ sal_uInt16 GetOutStyle() const { return mnOutStyle; }
void EnableCustomize( bool bEnable = true );
bool IsCustomize() { return mbCustomize; }
@@ -538,7 +532,7 @@ public:
// to allow for customization of the menu the coresponding handler is called
// when the menu button was clicked and before the menu is executed
void SetMenuType( sal_uInt16 aType = TOOLBOX_MENUTYPE_CUSTOMIZE );
- sal_uInt16 GetMenuType() const;
+ sal_uInt16 GetMenuType() const;
bool IsMenuEnabled() const;
PopupMenu* GetMenu() const;
void UpdateCustomMenu();
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 786764bdf7bf..d0ecd51c0b06 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -89,7 +89,7 @@ public:
virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE;
virtual void DeleteSelected() SAL_OVERRIDE;
virtual OUString GetSelected() const SAL_OVERRIDE;
- OUString GetSelected( LineEnd aSeparator ) const;
+ OUString GetSelected( LineEnd aSeparator ) const;
virtual void Cut() SAL_OVERRIDE;
virtual void Copy() SAL_OVERRIDE;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d4827439bfd5..72fc3cc72bc2 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -704,7 +704,7 @@ public:
virtual void Erase() SAL_OVERRIDE;
virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); }
- void PostPaint();
+ void PostPaint();
virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Move();
virtual void Resize();
@@ -797,7 +797,7 @@ public:
using ::OutputDevice::SetSettings;
virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE;
- void SetSettings( const AllSettings& rSettings, bool bChild );
+ void SetSettings( const AllSettings& rSettings, bool bChild );
void UpdateSettings( const AllSettings& rSettings, bool bChild = false );
void NotifyAllChildren( DataChangedEvent& rDCEvt );
@@ -959,10 +959,10 @@ public:
// window extents of the client window, coordinates to be used in SetPosPixel
Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const;
- bool IsScrollable() const;
+ bool IsScrollable() const;
virtual void Scroll( long nHorzScroll, long nVertScroll,
sal_uInt16 nFlags = 0 );
- void Scroll( long nHorzScroll, long nVertScroll,
+ void Scroll( long nHorzScroll, long nVertScroll,
const Rectangle& rRect, sal_uInt16 nFlags = 0 );
virtual void Invalidate( sal_uInt16 nFlags = 0 );
virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
generated by cgit (git 2.34.1) at 2024-08-04 11:49:23 +0000