diff options
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/button.hxx | 6 | ||||
-rw-r--r-- | include/vcl/ctrl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/embeddedfontshelper.hxx | 2 | ||||
-rw-r--r-- | include/vcl/field.hxx | 6 | ||||
-rw-r--r-- | include/vcl/fixed.hxx | 3 | ||||
-rw-r--r-- | include/vcl/group.hxx | 2 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 2 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
-rw-r--r-- | include/vcl/pdfextoutdevdata.hxx | 4 | ||||
-rw-r--r-- | include/vcl/splitwin.hxx | 6 | ||||
-rw-r--r-- | include/vcl/tabctrl.hxx | 4 | ||||
-rw-r--r-- | include/vcl/texteng.hxx | 12 | ||||
-rw-r--r-- | include/vcl/textview.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 6 | ||||
-rw-r--r-- | include/vcl/vclmedit.hxx | 2 |
15 files changed, 28 insertions, 33 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 1c9fd19f421f..d0e9c802f31f 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -171,7 +171,7 @@ protected: SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice* pDev, DrawFlags nDrawFlags, const tools::Rectangle& rRect, bool bMenuBtnSep); SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext); @@ -286,7 +286,7 @@ private: bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitRadioButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, @@ -408,7 +408,7 @@ private: bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, tools::Rectangle& rStateRect, diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 522ab4a7fa84..cb68cfe8f78a 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -98,7 +98,7 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; - void ImplInitSettings( const bool _bFont, const bool _bForeground ); + void ImplInitSettings(); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx index 057b340ecd5a..4ffa0bd59a79 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontshelper.hxx @@ -36,7 +36,7 @@ public: Returns URL for a font file for the given font, or empty if it does not exist. */ static OUString fontFileUrl( const OUString& familyName, FontFamily family, FontItalic italic, - FontWeight weight, FontPitch pitch, rtl_TextEncoding encoding, FontRights rights ); + FontWeight weight, FontPitch pitch, FontRights rights ); /** Reads a font from the input stream, saves it to a temporary font file and activates the font. diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 934f922411a4..501d2fda0cce 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -286,12 +286,10 @@ protected: DateFormatter(); SAL_DLLPRIVATE const Date& ImplGetFieldDate() const { return maFieldDate; } - SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString& rOutStr, - const AllSettings& rSettings ); + SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString& rOutStr ); SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate, Selection* pNewSelection = nullptr ); - SAL_DLLPRIVATE OUString ImplGetDateAsText( const Date& rDate, - const AllSettings& rSettings ) const; + SAL_DLLPRIVATE OUString ImplGetDateAsText( const Date& rDate ) const; SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate ); CalendarWrapper& GetCalendarWrapper() const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 5cb5102632bc..d73c91e26789 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -127,8 +127,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, - const Point& rPos, const Size& rSize ); + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, const Point& rPos, const Size& rSize ); public: explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 1669cfe1cf91..5d8ce8944813 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -32,7 +32,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index d5510780831c..ca63ecf64e98 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -439,7 +439,7 @@ public: virtual void SelectItem(sal_uInt16 nId) override; bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; - bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId); + bool HandleMenuButtonEvent(sal_uInt16 nEventId); void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; } const Link<void*,void>& GetCloseButtonClickHdl() const { return maCloseHdl; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d0586a7a7868..d08e80a1d632 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1225,7 +1225,7 @@ public: SystemFontData GetSysFontData( int nFallbacklevel ) const; SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, tools::Rectangle& rRect1, tools::Rectangle& rRect2, - long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); + long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const vcl::Font& rFont ); diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index c28663ae8232..ed4a574d033e 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -187,9 +187,7 @@ public: const tools::Rectangle& rVisibleOutputRect ); /// Detect if stream is compressed enough to avoid de-compress / scale & re-compress - bool HasAdequateCompression( const Graphic &rGraphic, - const tools::Rectangle &rOutputRect, - const tools::Rectangle &rVisibleOutputRect ) const; + bool HasAdequateCompression( const Graphic &rGraphic ) const; //--->i56629 /** Create a new named destination to be used in a link to this document from another PDF document diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 144ecc7c8a7a..ad011c2fa627 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -91,7 +91,7 @@ private: SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos ); SAL_DLLPRIVATE void ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const; SAL_DLLPRIVATE void ImplGetFadeInRect( tools::Rectangle& rRect, bool bTest = false ) const; - SAL_DLLPRIVATE void ImplGetFadeOutRect( tools::Rectangle& rRect, bool bTest = false ) const; + SAL_DLLPRIVATE void ImplGetFadeOutRect( tools::Rectangle& rRect ) const; SAL_DLLPRIVATE void ImplDrawFadeIn(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawFadeOut(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplNewAlign(); @@ -101,13 +101,13 @@ private: SAL_DLLPRIVATE void ImplDrawBorder(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawBorderLine(vcl::RenderContext& rRenderContext); static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, - bool bRows, bool bDown = true ); + bool bRows ); SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext, ImplSplitSet* pSet ); SAL_DLLPRIVATE static void ImplDrawBack(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, - bool bRows, bool bDown = true ); + bool bRows ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( SplitWindow* pWindow, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 2032b7eb1bce..0e195f10890d 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -63,7 +63,7 @@ protected: Link<TabControl*,bool> maDeactivateHdl; using Control::ImplInitSettings; - SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE ImplTabItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ); SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); @@ -73,7 +73,7 @@ protected: SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem* pItem, const tools::Rectangle& rCurRect, bool bFirstInGroup, - bool bLastInGroup, bool bIsCurrentItem); + bool bLastInGroup); SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index e8751bbf096f..2863ce4ac78d 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -177,7 +177,7 @@ protected: bool CreateLines( sal_uInt32 nPara ); void CreateAndInsertEmptyLine( sal_uInt32 nPara ); - void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, TETextPortion* pPortion, sal_Int32 nPortionStart, long nRemainingWidth ); + void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nPortionStart, long nRemainingWidth ); std::size_t SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos ); void CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ); void RecalcTextPortion( sal_uInt32 nPara, sal_Int32 nStartPos, sal_Int32 nNewChars ); @@ -193,9 +193,9 @@ protected: bool IsFormatted() const { return mbFormatted; } - sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, long nDocPosX, bool bSmart = false ); - tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); - sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara, bool bSmart ); + sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, long nDocPosX ); + tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); + sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara ); long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine, std::size_t nTextPortion ); long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 ); @@ -289,8 +289,8 @@ public: bool Write( SvStream& rOutput, const TextSelection* pSel = nullptr, bool bHTML = false ); - TextPaM GetPaM( const Point& rDocPos, bool bSmart = true ); - tools::Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); + TextPaM GetPaM( const Point& rDocPos ); + tools::Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = nullptr ); bool HasAttrib( sal_uInt16 nWhich ) const; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 347f02d8b667..b46bc5f3891c 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -69,7 +69,7 @@ protected: void ShowSelection(); void HideSelection(); void ShowSelection( const TextSelection& rSel ); - void ImpShowHideSelection( bool bShow, const TextSelection* pRange = nullptr ); + void ImpShowHideSelection( const TextSelection* pRange = nullptr ); TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 650fe127f55c..5bd95678c888 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -236,9 +236,9 @@ public: WindowAlign eAlign, bool bHorz); SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext); - SAL_DLLPRIVATE void ImplDrawGradientBackground(vcl::RenderContext& rRenderContext, ImplDockingWindowWrapper *pWrapper); - SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); - SAL_DLLPRIVATE void ImplDrawTransparentBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); + SAL_DLLPRIVATE void ImplDrawGradientBackground(vcl::RenderContext& rRenderContext); + SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext); + SAL_DLLPRIVATE void ImplDrawTransparentBackground(const vcl::Region &rRegion); SAL_DLLPRIVATE static void ImplDrawConstantBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode); SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index b772aea6829d..3a8bc9ccd47f 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -51,7 +51,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool EventNotify( NotifyEvent& rNEvt ) override; using Control::ImplInitSettings; - void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + void ImplInitSettings( bool bBackground ); static WinBits ImplInitStyle( WinBits nStyle ); ExtTextEngine* GetTextEngine() const; |