1. mst
  2. ooo340

Commits

fs  committed b0d0998

#i10000#

  • Participants
  • Parent commits eb9dd98
  • Branches default

Comments (0)

Files changed (8)

File vcl/inc/vcl/button.hxx

View file
 	SAL_DLLPRIVATE                 PushButton( const PushButton & );
 	SAL_DLLPRIVATE                 PushButton& operator=( const PushButton & );
 
-protected:
-    using Window::ImplInit;
     SAL_DLLPRIVATE void            ImplInit( Window* pParent, WinBits nStyle );
 
+    using Control::ImplInitSettings;
+    using Window::ImplInit;
 public:
     SAL_DLLPRIVATE void            ImplSetDefButton( BOOL bSet );
     SAL_DLLPRIVATE static void     ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, USHORT nStyle );
 	SAL_DLLPRIVATE          RadioButton& operator= (const RadioButton &);
 
 protected:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void     ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 	SAL_DLLPRIVATE              CheckBox& operator= (const CheckBox &);
 
 protected:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void         ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE void         ImplLoadRes( const ResId& rResId );

File vcl/inc/vcl/edit.hxx

View file
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const;
 
 protected:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
 	SAL_DLLPRIVATE void        ImplInit( Window* pParent, WinBits nStyle );
 	SAL_DLLPRIVATE WinBits     ImplInitStyle( WinBits nStyle );

File vcl/inc/vcl/fixbrd.hxx

View file
 	BOOL			mbTransparent;
 
 private:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
 	SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
 	SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );

File vcl/inc/vcl/fixed.hxx

View file
 {
 //#if 0 // _SOLAR__PRIVATE
 private:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
 class VCL_DLLPUBLIC FixedLine : public Control
 {
 private:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
     Bitmap          maBitmap;
     Bitmap          maBitmapHC;
 
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
     BOOL            mbInUserDraw;
 
 private:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );

File vcl/inc/vcl/group.hxx

View file
 class VCL_DLLPUBLIC GroupBox : public Control
 {
 private:
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void     ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits  ImplInitStyle( WinBits nStyle );

File vcl/inc/vcl/ilstbox.hxx

View file
 	void			SetReadOnly( BOOL bReadOnly ) 	{ mbReadOnly = bReadOnly; }
 	BOOL			IsReadOnly() const 				{ return mbReadOnly; }
 
+    using Control::ImplInitSettings;
 	void			ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     USHORT          ImplGetTextStyle() const;
 

File vcl/inc/vcl/slider.hxx

View file
 	Link			maSlideHdl;
 	Link			maEndSlideHdl;
 
+    using Control::ImplInitSettings;
     using Window::ImplInit;
 	SAL_DLLPRIVATE void	ImplInit( Window* pParent, WinBits nStyle );
 	SAL_DLLPRIVATE void	ImplLoadRes( const ResId& rResId );

File vcl/inc/vcl/tabctrl.hxx

View file
     Link                maActivateHdl;
     Link                maDeactivateHdl;
 
+    using Control::ImplInitSettings;
     SAL_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     SAL_DLLPRIVATE ImplTabItem* ImplGetItem( USHORT nId ) const;
     SAL_DLLPRIVATE void         ImplScrollBtnsColor();