diff options
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/brdwin.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/generic/gensys.h | 1 | ||||
-rw-r--r-- | vcl/inc/ilstbox.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/printdlg.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/animate.hxx | 23 | ||||
-rw-r--r-- | vcl/inc/vcl/arrange.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/bmpacc.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/canvastools.hxx | 24 | ||||
-rw-r--r-- | vcl/inc/vcl/combobox.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/ctrl.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/field.hxx | 28 | ||||
-rw-r--r-- | vcl/inc/vcl/fixbrd.hxx | 10 | ||||
-rw-r--r-- | vcl/inc/vcl/image.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/vcl/introwin.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/longcurr.hxx | 16 | ||||
-rw-r--r-- | vcl/inc/vcl/menubtn.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/vcl/print.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/regband.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/svapp.hxx | 1 |
20 files changed, 3 insertions, 127 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index e6374ea032f5..d7e21d0ac70f 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -141,9 +141,6 @@ public: sal_uInt16 nTypeStyle = 0 ); ImplBorderWindow( Window* pParent, WinBits nStyle = 0, sal_uInt16 nTypeStyle = 0 ); - ImplBorderWindow( Window* pParent, - WinBits nStyle, sal_uInt16 nTypeStyle, - const ::com::sun::star::uno::Any& ); ~ImplBorderWindow(); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -174,7 +171,6 @@ public: void SetCloser(); void SetDockButton( sal_Bool bDockButton ); void SetHideButton( sal_Bool bHideButton ); - void SetHelpButton( sal_Bool bHelpButton ); void SetMenuButton( sal_Bool bMenuButton ); void UpdateMenuHeight(); diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index fd21110a4f97..e485cc50f215 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -57,7 +57,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem static const char *getFrameResName(); static const char *getFrameClassName(); static rtl::OString getFrameResName( SalExtStyle nStyle ); - static bool enableExperimentalFeatures(); }; #endif // _SV_GENSYS_H diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 881d4fb08aab..c27a9d49c742 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -447,7 +447,6 @@ public: void Clear(); void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - long GetEntryFlags( sal_uInt16 nPos ) const; void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); void SetNoSelection(); diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index c77e906bd8ae..f474a7eea5a1 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -74,8 +74,6 @@ public: sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); - void ImplDestroy(); - Size ImplGetSize() const; Size ImplGetSourceSize() const; void ImplSetSourceSize( const Size&); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 7aea96b43e54..b754dad2969f 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -295,7 +295,6 @@ namespace vcl virtual ~PrintDialog(); bool isPrintToFile(); - int getCopyCount(); bool isCollate(); bool isSingleJobs(); diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx index c77587d29214..e2a0af235ca2 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -33,16 +33,8 @@ #include <vcl/timer.hxx> #include <vcl/bitmapex.hxx> -// ----------- -// - Defines - -// ----------- - #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L -// --------- -// - Enums - -// --------- - enum Disposal { DISPOSE_NOT, @@ -60,10 +52,6 @@ enum CycleMode CYCLE_REVERS_FALLBACK }; -// ------------------- -// - AnimationBitmap - -// ------------------- - struct VCL_DLLPUBLIC AnimationBitmap { BitmapEx aBmpEx; @@ -115,10 +103,6 @@ struct VCL_DLLPUBLIC AnimationBitmap sal_uLong GetChecksum() const; }; -// ------------------- -// - AnimationBitmap - -// ------------------- - struct AInfo { Bitmap aLastSaveBitmap; @@ -141,10 +125,6 @@ struct AInfo bPause( sal_False ) {} }; -// ------------------- -// - AnimationBitmap - -// ------------------- - class ImplAnimView; typedef ::std::vector< AnimationBitmap* > AnimationBitmapList_impl; typedef ::std::vector< ImplAnimView* > AnimViewList_impl; @@ -192,9 +172,6 @@ public: sal_Bool operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); } - sal_Bool IsEmpty() const; - void SetEmpty(); - void Clear(); sal_Bool Start( diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 5568cc3b05d8..46df6af6b76c 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -251,13 +251,11 @@ namespace vcl // add a managed window at the given index // an index smaller than zero means add the window at the end size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 ); - void remove( Window* ); size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ); // convenience: use for addChild( new WindowArranger( ... ) ) constructs size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ) { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); } - void remove( boost::shared_ptr<WindowArranger> const & ); long getBorderWidth() const { return m_nBorderWidth; } }; diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index 7562accef487..4b4416be8f31 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -203,7 +203,6 @@ public: void DrawRect( const Rectangle& rRect ); void FillPolygon( const Polygon& rPoly ); - void DrawPolygon( const Polygon& rPoly ); private: diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx index 7c9653e1f200..8bb1ffd613a9 100644 --- a/vcl/inc/vcl/canvastools.hxx +++ b/vcl/inc/vcl/canvastools.hxx @@ -81,33 +81,9 @@ namespace vcl { namespace unotools { - // Polygon conversions - // =================================================================== - - /** Create an XPolyPolygon from VCL/Tools polygon - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Polygon& inputPolygon ); - - /** Create an XPolyPolygon from VCL/Tools polyPolygon - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::PolyPolygon& inputPolyPolygon ); - // Bitmap conversions // =================================================================== - /** Create an XBitmap from VCL Bitmap - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Bitmap& inputBitmap ); - /** Create an XBitmap from VCL BitmapEx */ ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 98f9ea30b928..d44a595c0bfb 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -178,7 +178,6 @@ public: void SetEntryData( sal_uInt16 nPos, void* pNewData ); void* GetEntryData( sal_uInt16 nPos ) const; - void SetTopEntry( sal_uInt16 nPos ); sal_uInt16 GetTopEntry() const; void SetProminentEntryType( ProminentEntry eType ); diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index 71d7d88d6003..fdb0607629b4 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -153,8 +153,6 @@ public: // returns the character index for corresponding to rPoint (in control coordinates) // -1 is returned if no character is at that point long GetIndexForPoint( const Point& rPoint ) const; - // returns the number of lines in the result of GetDisplayText() - long GetLineCount() const; // returns the interval [start,end] of line nLine // returns [-1,-1] for an invalid line Pair GetLineStartEnd( long nLine ) const; diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 391a6e6c98e1..f43f7d55f2ed 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -294,8 +294,6 @@ public: class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter { private: - String maCurrencySymbol; - SAL_DLLPRIVATE void ImplInit(); protected: @@ -308,7 +306,6 @@ public: virtual void Reformat(); - void SetCurrencySymbol( const String& rStr ); String GetCurrencySymbol() const; virtual void SetValue( sal_Int64 nNewValue ); @@ -386,8 +383,6 @@ public: void SetDate( const Date& rNewDate ); void SetUserDate( const Date& rNewDate ); Date GetDate() const; - Date GetRealDate() const; - sal_Bool IsDateModified() const; void SetEmptyDate(); sal_Bool IsEmptyDate() const; Date GetCorrectedDate() const { return maCorrectedDate; } @@ -506,7 +501,6 @@ class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: PatternField( Window* pParent, WinBits nWinStyle ); - PatternField( Window* pParent, const ResId& rResId ); ~PatternField(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -622,7 +616,7 @@ protected: public: CurrencyField( Window* pParent, WinBits nWinStyle ); - CurrencyField( Window* pParent, const ResId& rResId ); + ~CurrencyField(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -721,7 +715,6 @@ class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: PatternBox( Window* pParent, WinBits nWinStyle ); - PatternBox( Window* pParent, const ResId& rResId ); ~PatternBox(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -730,13 +723,6 @@ public: virtual void Modify(); virtual void ReformatAll(); - - void InsertString( const XubString& rStr, - sal_uInt16 nPos = COMBOBOX_APPEND ); - void RemoveString( const XubString& rStr ); - using PatternFormatter::GetString; - XubString GetString( sal_uInt16 nPos ) const; - sal_uInt16 GetStringPos( const XubString& rStr ) const; }; @@ -819,14 +805,9 @@ public: virtual void ReformatAll(); - sal_Int64 GetValue( sal_uInt16 nPos ) const; - sal_uInt16 GetValuePos( sal_Int64 nValue ) const; - - // Needed, because GetValue() with nPos hide this function virtual sal_Int64 GetValue() const; }; - // ----------- // - DateBox - // ----------- @@ -835,7 +816,6 @@ class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: DateBox( Window* pParent, WinBits nWinStyle ); - DateBox( Window* pParent, const ResId& rResId ); ~DateBox(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -845,12 +825,6 @@ public: virtual void Modify(); virtual void ReformatAll(); - - void InsertDate( const Date& rDate, sal_uInt16 nPos = COMBOBOX_APPEND ); - void RemoveDate( const Date& rDate ); - using DateFormatter::GetDate; - Date GetDate( sal_uInt16 nPos ) const; - sal_uInt16 GetDatePos( const Date& rDate ) const; }; diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx index e091f68d4fad..67dd7dbee7aa 100644 --- a/vcl/inc/vcl/fixbrd.hxx +++ b/vcl/inc/vcl/fixbrd.hxx @@ -51,10 +51,6 @@ class VCL_DLLPUBLIC FixedBorder : public Control { private: - sal_uInt16 mnType; - sal_Bool mbTransparent; - -private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -64,7 +60,6 @@ private: const Point& rPos, const Size& rSize ); public: - FixedBorder( Window* pParent, WinBits nStyle = 0 ); FixedBorder( Window* pParent, const ResId& rResId ); ~FixedBorder(); @@ -73,11 +68,6 @@ public: virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void SetTransparent( sal_Bool bTransparent ); - sal_Bool IsTransparent() const { return mbTransparent; } - void SetBorderType( sal_uInt16 nType ); - sal_uInt16 GetBorderType() const { return mnType; } }; #endif // _SV_FIXBRD_HXX diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index 3c96eea4d6c7..a28cc817eaa4 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -115,7 +115,6 @@ public: ImageList( const ImageList& rImageList ); ~ImageList(); - void Clear(); void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, const std::vector< rtl::OUString > &rNameVector ); void InsertFromHorizontalBitmap( const ResId& rResId, @@ -131,14 +130,10 @@ public: void AddImage( sal_uInt16 nNewId, const Image& rImage ); void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( sal_uInt16 nId, const Image& rImage ); void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ); - void ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName ); void RemoveImage( sal_uInt16 nId ); - void RemoveImage( const ::rtl::OUString& rImageName ); Image GetImage( sal_uInt16 nId ) const; Image GetImage( const ::rtl::OUString& rImageName ) const; diff --git a/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx index e5503bc5dfd6..44dd0bb7b91b 100644 --- a/vcl/inc/vcl/introwin.hxx +++ b/vcl/inc/vcl/introwin.hxx @@ -47,7 +47,6 @@ public: IntroWindow(); ~IntroWindow(); - void SetBackgroundBitmap( const Bitmap& rBitmap ); void SetBackgroundBitmap( const BitmapEx& rBitmapEx ); }; diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index ca4ebcadc77e..60c4d9ff949f 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -81,15 +81,9 @@ public: void SetValue( BigInt nNewValue ); void SetUserValue( BigInt nNewValue ); BigInt GetValue() const; - sal_Bool IsValueModified() const; - - void SetEmptyValue(); sal_Bool IsEmptyValue() const { return !GetField()->GetText().Len(); } BigInt GetCorrectedValue() const { return mnCorrectedValue; } - - BigInt Normalize( BigInt nValue ) const; - BigInt Denormalize( BigInt nValue ) const; }; // --------------------- @@ -105,12 +99,8 @@ private: BigInt mnFirst; BigInt mnLast; -protected: - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: LongCurrencyField( Window* pParent, WinBits nWinStyle ); - LongCurrencyField( Window* pParent, const ResId& rResId ); ~LongCurrencyField(); long PreNotify( NotifyEvent& rNEvt ); @@ -138,7 +128,6 @@ class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormat { public: LongCurrencyBox( Window* pParent, WinBits nWinStyle ); - LongCurrencyBox( Window* pParent, const ResId& rResId ); ~LongCurrencyBox(); long PreNotify( NotifyEvent& rNEvt ); @@ -147,13 +136,8 @@ public: void Modify(); void ReformatAll(); - void InsertValue( BigInt nValue, - sal_uInt16 nPos = COMBOBOX_APPEND ); - void RemoveValue( BigInt nValue ); BigInt GetValue() const { return LongCurrencyFormatter::GetValue(); } - BigInt GetValue( sal_uInt16 nPos ) const; - sal_uInt16 GetValuePos( BigInt nValue ) const; }; #endif // _LONGCURR_HXX diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index 1e65504b97bc..b9bdd8162194 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -88,7 +88,8 @@ public: void SetPopupMenu( PopupMenu* pNewMenu ); PopupMenu* GetPopupMenu() const { return mpMenu; } - sal_uInt16 GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetCurItemId() const { return mnCurItemId; } + void SetCurItemId( sal_uInt16 nItemId ) { mnCurItemId = nItemId; } void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } const Link& GetActivateHdl() const { return maActivateHdl; } diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index edb47abf55d6..302670cce840 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -677,8 +677,6 @@ class VCL_DLLPUBLIC PrinterOptionsHelper ); }; -VCL_DLLPUBLIC bool useSystemPrintDialog(); - } diff --git a/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx index 0ebacbdb93d4..262130f71a86 100644 --- a/vcl/inc/vcl/regband.hxx +++ b/vcl/inc/vcl/regband.hxx @@ -129,8 +129,6 @@ public: void ScaleX( double fHorzScale ); sal_Bool IsInside( long nX ); - sal_Bool IsInside( long nLeft, long nRight ); - sal_Bool IsOver( long nLeft, long nRight ); sal_Bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index a994ff9ef3a4..6daf5c6fd850 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -255,7 +255,6 @@ public: virtual void AppEvent( const ApplicationEvent& rAppEvent ); virtual void Property( ApplicationProperty& ); - void SetPropertyHandler( PropertyHandler* pHandler ); #ifndef NO_GETAPPWINDOW static WorkWindow* GetAppWindow(); |