diff options
44 files changed, 188 insertions, 376 deletions
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 40ea0173f537..4dc7ed5a916b 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -269,7 +269,7 @@ public: OUString GetExportFormatName( sal_uInt16 nFormat ); OUString GetExportFormatMediaType( sal_uInt16 nFormat ); OUString GetExportFormatShortName( sal_uInt16 nFormat ); - OUString GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + OUString GetExportWildcard( sal_uInt16 nFormat ); bool IsExportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx index c7cbbefe1cd5..5983825f4236 100644 --- a/include/vcl/imagerepository.hxx +++ b/include/vcl/imagerepository.hxx @@ -43,17 +43,13 @@ namespace vcl will take the image upon successful return. @param bSearchLanguageDependent determines whether a language-dependent image is to be searched. - @param loadMissing - if set to true, then load a default image if no image can be found, - otherwise don't load anything @return whether or not the image could be loaded successfully. */ static bool loadImage( const OUString& _rName, BitmapEx& _out_rImage, - bool bSearchLanguageDependent, - bool loadMissing = false + bool bSearchLanguageDependent ); static bool loadDefaultImage( diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 2ce8ba4ad610..f8d44e0c1567 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -248,15 +248,14 @@ public: MenuItemBits nItemBits = MenuItemBits::NONE, const OString &rIdent = OString(), sal_uInt16 nPos = MENU_APPEND); - void InsertItem(const ResId& rResId, sal_uInt16 nPos = MENU_APPEND ); + void InsertItem(const ResId& rResId); void InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, MenuItemBits nBits = MenuItemBits::NONE, - const OString &rIdent = OString(), - sal_uInt16 nPos = MENU_APPEND); + const OString &rIdent = OString()); void InsertSeparator(const OString &rIdent = OString(), sal_uInt16 nPos = MENU_APPEND); void RemoveItem( sal_uInt16 nPos ); - void CopyItem(const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos = MENU_APPEND ); + void CopyItem(const Menu& rMenu, sal_uInt16 nPos ); void Clear(); void CreateAutoMnemonics(); @@ -308,7 +307,7 @@ public: virtual bool IsMenuBar() const = 0; void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false ); - bool HasValidEntries( bool bCheckPopups = true ); + bool HasValidEntries(); void UpdateNativeMenu(); @@ -533,7 +532,7 @@ public: sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, PopupMenuFlags nFlags = PopupMenuFlags::NONE ); // Fuer das TestTool - void EndExecute( sal_uInt16 nSelect = 0 ); + void EndExecute(); virtual void SelectItem(sal_uInt16 nId) override; void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index b0527b071be5..cb9e0da762d3 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1131,8 +1131,7 @@ public: DrawTextFlags nStyle = DrawTextFlags::EndEllipsis ) const; long GetCtrlTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, - sal_Int32 nLen = -1, - DrawTextFlags nStyle = DrawTextFlags::Mnemonic ) const; + sal_Int32 nLen = -1 ) const; static OUString GetNonMnemonicString( const OUString& rStr, sal_Int32& rMnemonicPos ); @@ -1198,8 +1197,7 @@ public: bool GetCaretPositions( const OUString&, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, - long* pDXAry = nullptr, long nWidth = 0, - bool bCellBreaking = true ) const; + long* pDXAry = nullptr, long nWidth = 0 ) const; void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1); diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 3c3d49a88522..6fcb45eed90c 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -479,11 +479,8 @@ public: @param nMilliSec the duration of the transitional effect in milliseconds; set 0 to disable transitional effects - - @param nPageNr - the page number to apply the effect to; -1 denotes the current page */ - void SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr = -1 ); + void SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec ); /** create a new form control @@ -493,11 +490,8 @@ public: @param rControlType a descendant of AnyWidget determining the control's properties - - @param nPageNr - the page number to apply the effect to; -1 denotes the current page */ - void CreateControl( const PDFWriter::AnyWidget& rControlType, sal_Int32 nPageNr = -1 ); + void CreateControl( const PDFWriter::AnyWidget& rControlType ); }; } diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 6b8e43f0eb2f..6f859bdf095c 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -765,8 +765,7 @@ The following structure describes the permissions used in PDF security void DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, - FontLineStyle eOverline, - bool bUnderlineAbove = false ); + FontLineStyle eOverline ); void DrawTextArray( const Point& rStartPt, const OUString& rStr, const long* pDXAry, sal_Int32 nIndex, @@ -1236,13 +1235,10 @@ The following structure describes the permissions used in PDF security @param rControlType a descendant of AnyWidget determining the control's properties - @param nPageNr - the page number to apply the effect to; -1 denotes the current page - @returns the new control's id for reference purposes */ - sal_Int32 CreateControl( const AnyWidget& rControlType, sal_Int32 nPageNr = -1 ); + sal_Int32 CreateControl( const AnyWidget& rControlType ); /** Inserts an additional stream to the PDF file diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index dbbed2dff45c..418f4b07c74c 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -231,11 +231,9 @@ public: static void getResolutionFromString( const OUString&, int&, int& ); // helper function - OUString translateKey( const OUString& i_rKey, - const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; + OUString translateKey( const OUString& i_rKey ) const; OUString translateOption( const OUString& i_rKey, - const OUString& i_rOption, - const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; + const OUString& i_rOption ) const; }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 423b4e0b45b1..b594cc7c76c1 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -605,10 +605,8 @@ public: /** Process a new set of properties merges changed properties and returns "true" if any occurred - if the optional output set is not NULL then the names of the changed properties are returned */ - bool processProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp, - std::set< OUString >* o_pChangeProp = nullptr ); + bool processProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp ); /** Append to a sequence of property values the ui property sequence passed at creation diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index b4fa3e79c326..81e4d508adf9 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -107,8 +107,7 @@ public: long DoScroll( long nNewPos ); long DoScrollAction( ScrollType eScrollType ); - void EnableDrag( bool bEnable = true ) - { mbFullDrag = bEnable; } + void EnableDrag() { mbFullDrag = true; } void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 868365efbae0..5cc9190118f8 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -28,7 +28,7 @@ namespace vcl { class Window; } class VCL_DLLPUBLIC Sound { public: - static void Beep( vcl::Window* pWindow = nullptr ); + static void Beep(); }; #endif // INCLUDED_VCL_SOUND_HXX diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 7bbe0837f42e..5bb540b86c9d 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -151,7 +151,7 @@ public: void InsertItem( sal_uInt16 nId, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nIntoSetId = 0, SplitWindowItemFlags nBits = SplitWindowItemFlags::NONE ); - void RemoveItem( sal_uInt16 nId, bool bHide = true ); + void RemoveItem( sal_uInt16 nId ); void Clear(); void SplitItem( sal_uInt16 nId, long nNewSize, @@ -175,7 +175,7 @@ public: sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; - sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const; bool IsItemValid( sal_uInt16 nId ) const; @@ -189,8 +189,8 @@ public: void ShowAutoHideButton( bool bShow = true ); bool IsAutoHideButtonVisible() const { return mbAutoHide; } - void ShowFadeInHideButton( bool bShow = true ); - void ShowFadeOutButton( bool bShow = true ); + void ShowFadeInHideButton(); + void ShowFadeOutButton(); long GetFadeInSize() const; bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx index d8b9cff0baec..5f3c21647dbd 100644 --- a/include/vcl/strhelper.hxx +++ b/include/vcl/strhelper.hxx @@ -36,7 +36,7 @@ namespace psp // returns number of tokens (zero if empty or whitespace only) VCL_DLLPUBLIC OUString WhitespaceToSpace( const OUString&, bool bProtect = true ); - VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, bool bProtect = true); + VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&); // returns a string with multiple adjacent occurrences of whitespace // converted to a single space. if bProtect is sal_True (nonzero), then // doublequote, singlequote and singleleftquote protect their respective diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index c4e06cbf5d8d..608a1b97dc4a 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1143,11 +1143,9 @@ public: /** Turns on "auto-help" (hover mouse above UI element and a tooltip with an explanation pops up. - @param bEnabled Enables/disables auto-help. - @see EnableAutoHelpId */ - static void EnableAutoHelpId( bool bEnabled = true ); + static void EnableAutoHelpId(); /** Determines if auto-help is enabled or disabled. diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index a0f80ab7a85a..a0dcdf9aaff0 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -51,9 +51,7 @@ public: void EnableEraseBackground( bool bEnable = true ); void SetForwardKey( bool bEnable ); // return the platform specific handle/id of this window; - // in case the flag bUseJava is set, a java compatible overlay window - // is created on which other java windows can be created (plugin interface) - sal_IntPtr GetParentWindowHandle( bool bUseJava = false ); + sal_IntPtr GetParentWindowHandle(); }; #endif // INCLUDED_VCL_SYSCHILD_HXX diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index b69c8ad2cc3e..314477ed6149 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -73,7 +73,7 @@ private: SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false); - SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bLayout = false); + SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx index 738f2b81f3a9..fd043651a4f3 100644 --- a/include/vcl/taskpanelist.hxx +++ b/include/vcl/taskpanelist.hxx @@ -29,7 +29,7 @@ class VCL_DLLPUBLIC TaskPaneList { ::std::vector< VclPtr<vcl::Window> > mTaskPanes; vcl::Window *FindNextFloat( vcl::Window *pWindow, bool bForward = true ); - vcl::Window *FindNextSplitter( vcl::Window *pWindow, bool bForward = true ); + vcl::Window *FindNextSplitter( vcl::Window *pWindow ); public: bool IsInList( vcl::Window *pWindow ); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index c268b7e6ce49..ec77f0632871 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -148,9 +148,9 @@ protected: TextPaM ImpDeleteText( const TextSelection& rSel ); TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, bool bOverwrite = false ); TextPaM ImpInsertText( const TextSelection& rSel, const OUString& rText ); - TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, bool bKeepEndingAttribs = true ); + TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection ); TextPaM ImpInsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs = true ); - void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars, SfxUndoAction* pCurUndo = nullptr ); + void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars ); TextPaM ImpConnectParagraphs( sal_uInt32 nLeft, sal_uInt32 nRight ); void ImpRemoveParagraph( sal_uInt32 nPara ); void ImpInitWritingDirections( sal_uInt32 nPara ); @@ -201,14 +201,14 @@ protected: long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine, sal_uInt16 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 ); - sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart = nullptr, sal_Int32* pEnd = nullptr ); - static void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false ); + sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart = nullptr ); + static void ImpInitLayoutMode( OutputDevice* pOutDev ); TxtAlign ImpGetAlign() const; long CalcTextHeight(); long CalcParaHeight( sal_uInt32 nParagraph ) const; long CalcTextWidth( sal_uInt32 nPara ); - long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen, const vcl::Font* pFont = nullptr ); + long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen); Range GetInvalidYOffsets( sal_uInt32 nPortion ); // for Undo/Redo @@ -230,8 +230,8 @@ public: OUString GetTextLines( LineEnd aSeparator = LINEEND_LF ) const; void ReplaceText(const TextSelection& rSel, const OUString& rText); - sal_Int32 GetTextLen( LineEnd aSeparator = LINEEND_LF ) const; - sal_Int32 GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const; + sal_Int32 GetTextLen() const; + sal_Int32 GetTextLen( const TextSelection& rSel ) const; void SetFont( const vcl::Font& rFont ); const vcl::Font& GetFont() const { return maFont; } @@ -299,7 +299,7 @@ public: void RemoveAttribs( sal_uInt32 nPara, sal_uInt16 nWhich, bool bIdleFormatAndUpdate ); void RemoveAttrib( sal_uInt32 nPara, const TextCharAttrib& rAttrib ); - void RemoveAttribs( sal_uInt32 nPara, bool bIdleFormatAndUpdate = true ); + void RemoveAttribs( sal_uInt32 nPara ); void SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd, bool bIdleFormatAndUpdate = true ); TxtAlign GetTextAlign() const { return meAlign; } diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e5bc8c0e93e1..e4507d439868 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -122,7 +122,7 @@ public: OUString GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertText( const OUString& rNew, bool bSelect = false ); + void InsertText( const OUString& rNew ); bool KeyInput( const KeyEvent& rKeyEvent ); void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 11958cd1f7e0..18019e557326 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -284,8 +284,7 @@ public: virtual void Resizing( Size& rSize ) override; virtual Size GetOptimalSize() const override; - void InsertItem( const ResId& rResId, - sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertItem( const ResId& rResId ); /// Insert a command (like '.uno:Save'). virtual void InsertItem( const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, @@ -305,11 +304,11 @@ public: void InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, ToolBoxItemBits nBits = ToolBoxItemBits::NONE, sal_uInt16 nPos = TOOLBOX_APPEND ); - void InsertSpace( sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertSpace(); void InsertSeparator( sal_uInt16 nPos = TOOLBOX_APPEND, sal_uInt16 nPixSize = 0 ); void InsertBreak( sal_uInt16 nPos = TOOLBOX_APPEND ); void RemoveItem( sal_uInt16 nPos ); - void CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, sal_uInt16 nNewPos = TOOLBOX_APPEND ); + void CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId ); void Clear(); const ImageList& GetImageList() const { return maImageList; } @@ -376,7 +375,7 @@ public: void StartSelection(); void EndSelection(); - void SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease = true ); + void SetItemDown( sal_uInt16 nItemId, bool bDown ); void SetItemState( sal_uInt16 nItemId, TriState eState ); TriState GetItemState( sal_uInt16 nItemId ) const; @@ -387,7 +386,7 @@ public: void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); bool IsItemEnabled( sal_uInt16 nItemId ) const; - void TriggerItem( sal_uInt16 nItemId, bool bShift = false, bool bCtrl = false ); + void TriggerItem( sal_uInt16 nItemId, bool bShift = false ); /// Shows or hides items. void ShowItem(sal_uInt16 nItemId, bool bVisible = true); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index b9b5bba0e474..084ed9b97a1e 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -128,8 +128,8 @@ public: const Point& rNewOffset, sal_uInt8* pBuffer); - bool SetOutputSize( const Size& rNewSize, bool bErase = true ) - { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); } + bool SetOutputSize( const Size& rNewSize ) + { return SetOutputSizePixel( LogicToPixel( rNewSize ) ); } // reference device modes for different compatibility levels enum RefDevMode { REFDEV_NONE = 0, diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c9a6d0b76164..6abc34b4bf5b 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -576,7 +576,7 @@ public: SAL_DLLPRIVATE void ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ); SAL_DLLPRIVATE void ImplNotifyIconifiedState( bool bIconified ); - SAL_DLLPRIVATE void ImplUpdateAll( bool bOverlapWindows = true ); + SAL_DLLPRIVATE void ImplUpdateAll(); SAL_DLLPRIVATE void ImplControlFocus( GetFocusFlags nFlags = GetFocusFlags::NONE ); @@ -871,7 +871,7 @@ public: /// Enable/disable double-buffering of the frame window and all its children. void RequestDoubleBuffering(bool bRequest); - void EnableAllResize( bool bEnable = true ); + void EnableAllResize(); void SetBorderStyle( WindowBorderStyle nBorderStyle ); WindowBorderStyle GetBorderStyle() const; @@ -1084,7 +1084,7 @@ public: virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ); - void Validate( ValidateFlags nFlags = ValidateFlags::NONE ); + void Validate(); bool HasPaintEvent() const; void Update(); void Flush(); diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx index f7864edcfa88..c938e9c5fe41 100644 --- a/include/vcl/wmf.hxx +++ b/include/vcl/wmf.hxx @@ -57,7 +57,7 @@ struct WMF_EXTERNALHEADER bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = nullptr, WMF_EXTERNALHEADER *pExtHeader = nullptr ); -VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem = nullptr ); +VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF ); VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = nullptr, bool bPlaceable = true ); diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 7c5e9939c97a..5d1c28e20d68 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -24,14 +24,13 @@ #include <salframe.hxx> #include <svdata.hxx> -void Sound::Beep( vcl::Window* pWindow ) +void Sound::Beep() { // #i91990# if ( Application::IsHeadlessModeEnabled() ) return; - if ( !pWindow ) - pWindow = ImplGetDefaultWindow(); + vcl::Window* pWindow = ImplGetDefaultWindow(); pWindow->ImplGetFrame()->Beep(); } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index b70ea35f024d..32d47d4d663c 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1382,9 +1382,9 @@ Help* Application::GetHelp() return ImplGetSVData()->maAppData.mpHelp; } -void Application::EnableAutoHelpId( bool bEnabled ) +void Application::EnableAutoHelpId() { - ImplGetSVData()->maHelpData.mbAutoHelpId = bEnabled; + ImplGetSVData()->maHelpData.mbAutoHelpId = true; } bool Application::IsAutoHelpIdEnabled() diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 917b637a1bba..5939eba7e942 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1059,10 +1059,9 @@ void TabControl::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRe ImplPaint(rRenderContext, rRect); } -void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bLayout) +void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - if (!bLayout) - HideFocus(); + HideFocus(); // reformat if needed Rectangle aRect = ImplGetTabRect(TAB_PAGERECT); @@ -1100,7 +1099,7 @@ void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& aRect.Right() += 10; } - if (!bLayout && rRenderContext.IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL)) { const ImplControlValue aControlValue; @@ -1147,12 +1146,10 @@ void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& if (pCurItem && !pCurItem->maRect.IsEmpty()) { aCurRect = pCurItem->maRect; - if (!bLayout) - rRenderContext.DrawLine(aRect.TopLeft(), Point(aCurRect.Left() - 2, aRect.Top())); + rRenderContext.DrawLine(aRect.TopLeft(), Point(aCurRect.Left() - 2, aRect.Top())); if (aCurRect.Right() + 1 < aRect.Right()) { - if (!bLayout) - rRenderContext.DrawLine(Point(aCurRect.Right(), aRect.Top()), aRect.TopRight()); + rRenderContext.DrawLine(Point(aCurRect.Right(), aRect.Top()), aRect.TopRight()); } else { @@ -1160,35 +1157,31 @@ void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& } } else - if (!bLayout) - rRenderContext.DrawLine(aRect.TopLeft(), aRect.TopRight()); + rRenderContext.DrawLine(aRect.TopLeft(), aRect.TopRight()); - if (!bLayout) - { - rRenderContext.DrawLine(aRect.TopLeft(), aRect.BottomLeft()); + rRenderContext.DrawLine(aRect.TopLeft(), aRect.BottomLeft()); - if (!(rStyleSettings.GetOptions() & StyleSettingsOptions::Mono)) - { - // if we have not tab page the bottom line of the tab page - // directly touches the tab items, so choose a color that fits seamlessly - if (bNoTabPage) - rRenderContext.SetLineColor(rStyleSettings.GetDialogColor()); - else - rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); - rRenderContext.DrawLine(Point(1, aRect.Bottom() - 1), Point(aRect.Right() - 1, aRect.Bottom() - 1)); - rRenderContext.DrawLine(Point(aRect.Right() - 1, aRect.Top() + nTopOff), Point(aRect.Right() - 1, aRect.Bottom() - 1)); - if (bNoTabPage) - rRenderContext.SetLineColor(rStyleSettings.GetDialogColor()); - else - rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor()); - rRenderContext.DrawLine(Point(0, aRect.Bottom()), Point(aRect.Right(), aRect.Bottom())); - rRenderContext.DrawLine(Point(aRect.Right(), aRect.Top() + nTopOff), Point(aRect.Right(), aRect.Bottom())); - } + if (!(rStyleSettings.GetOptions() & StyleSettingsOptions::Mono)) + { + // if we have not tab page the bottom line of the tab page + // directly touches the tab items, so choose a color that fits seamlessly + if (bNoTabPage) + rRenderContext.SetLineColor(rStyleSettings.GetDialogColor()); else - { - rRenderContext.DrawLine(aRect.TopRight(), aRect.BottomRight()); - rRenderContext.DrawLine(aRect.BottomLeft(), aRect.BottomRight()); - } + rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); + rRenderContext.DrawLine(Point(1, aRect.Bottom() - 1), Point(aRect.Right() - 1, aRect.Bottom() - 1)); + rRenderContext.DrawLine(Point(aRect.Right() - 1, aRect.Top() + nTopOff), Point(aRect.Right() - 1, aRect.Bottom() - 1)); + if (bNoTabPage) + rRenderContext.SetLineColor(rStyleSettings.GetDialogColor()); + else + rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor()); + rRenderContext.DrawLine(Point(0, aRect.Bottom()), Point(aRect.Right(), aRect.Bottom())); + rRenderContext.DrawLine(Point(aRect.Right(), aRect.Top() + nTopOff), Point(aRect.Right(), aRect.Bottom())); + } + else + { + rRenderContext.DrawLine(aRect.TopRight(), aRect.BottomRight()); + rRenderContext.DrawLine(aRect.BottomLeft(), aRect.BottomRight()); } } @@ -1225,9 +1218,9 @@ void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& aClipRgn.Intersect(pItem->maRect); if (!rRect.IsEmpty()) aClipRgn.Intersect(rRect); - if (bLayout || !aClipRgn.IsEmpty()) + if (!aClipRgn.IsEmpty()) { - ImplDrawItem(rRenderContext, pItem, aCurRect, bLayout, + ImplDrawItem(rRenderContext, pItem, aCurRect, false/*bLayout*/, pItem == pFirstTab, pItem == pLastTab); } } @@ -1244,19 +1237,18 @@ void TabControl::ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& aClipRgn.Intersect(pCurItem->maRect); if (!rRect.IsEmpty()) aClipRgn.Intersect(rRect); - if (bLayout || !aClipRgn.IsEmpty()) + if (!aClipRgn.IsEmpty()) { - ImplDrawItem(rRenderContext, pCurItem, aCurRect, bLayout, + ImplDrawItem(rRenderContext, pCurItem, aCurRect, false/*bLayout*/, pCurItem == pFirstTab, pCurItem == pLastTab, true); } } } - if (!bLayout && HasFocus()) + if (HasFocus()) ImplShowFocus(); - if (!bLayout) - mbSmallInvalidate = true; + mbSmallInvalidate = true; } void TabControl::setAllocation(const Size &rAllocation) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 4598c13333d2..a272be4025ab 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -284,17 +284,17 @@ OUString TextEngine::GetText( sal_uInt32 nPara ) const return mpDoc->GetText( nPara ); } -sal_Int32 TextEngine::GetTextLen( LineEnd aSeparator ) const +sal_Int32 TextEngine::GetTextLen() const { - return mpDoc->GetTextLen( static_getLineEndText( aSeparator ) ); + return mpDoc->GetTextLen( static_getLineEndText( LINEEND_LF ) ); } -sal_Int32 TextEngine::GetTextLen( const TextSelection& rSel, LineEnd aSeparator ) const +sal_Int32 TextEngine::GetTextLen( const TextSelection& rSel ) const { TextSelection aSel( rSel ); aSel.Justify(); ValidateSelection( aSel ); - return mpDoc->GetTextLen( static_getLineEndText( aSeparator ), &aSel ); + return mpDoc->GetTextLen( static_getLineEndText( LINEEND_LF ), &aSel ); } sal_Int32 TextEngine::GetTextLen( const sal_uInt32 nPara ) const @@ -479,7 +479,7 @@ void TextEngine::CursorMoved( sal_uInt32 nNode ) pNode->GetCharAttribs().DeleteEmptyAttribs(); } -void TextEngine::ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars, SfxUndoAction* ) +void TextEngine::ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars ) { DBG_ASSERT( nChars, "ImpRemoveChars: 0 Chars?!" ); if ( IsUndoEnabled() && !IsInUndo() ) @@ -809,7 +809,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& return aPaM; } -TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel, bool bKeepEndingAttribs ) +TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel ) { TextPaM aPaM; if ( rCurSel.HasRange() ) @@ -817,7 +817,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel, bool bKeep else aPaM = rCurSel.GetEnd(); - return ImpInsertParaBreak( aPaM, bKeepEndingAttribs ); + return ImpInsertParaBreak( aPaM ); } TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs ) @@ -1205,7 +1205,7 @@ long TextEngine::CalcTextHeight() return nY; } -long TextEngine::CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nLen, const vcl::Font* pFont ) +long TextEngine::CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nLen ) { #ifdef DBG_UTIL // within the text there must not be a Portion change (attribute/tab)! @@ -1220,17 +1220,9 @@ long TextEngine::CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_I } else { - if ( pFont ) - { - if ( !mpRefDev->GetFont().IsSameInstance( *pFont ) ) - mpRefDev->SetFont( *pFont ); - } - else - { - vcl::Font aFont; - SeekCursor( nPara, nPortionStart+1, aFont, nullptr ); - mpRefDev->SetFont( aFont ); - } + vcl::Font aFont; + SeekCursor( nPara, nPortionStart+1, aFont, nullptr ); + mpRefDev->SetFont( aFont ); TextNode* pNode = mpDoc->GetNodes()[ nPara ]; nWidth = mpRefDev->GetTextWidth( pNode->GetText(), nPortionStart, nLen ); @@ -2572,7 +2564,7 @@ bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML return rOutput.GetError() == 0; } -void TextEngine::RemoveAttribs( sal_uInt32 nPara, bool bIdleFormatAndUpdate ) +void TextEngine::RemoveAttribs( sal_uInt32 nPara ) { if ( nPara < mpDoc->GetNodes().size() ) { @@ -2586,10 +2578,7 @@ void TextEngine::RemoveAttribs( sal_uInt32 nPara, bool bIdleFormatAndUpdate ) mbFormatted = false; - if ( bIdleFormatAndUpdate ) - IdleFormatAndUpdate( nullptr, 0xFFFF ); - else - FormatAndUpdate(); + IdleFormatAndUpdate( nullptr, 0xFFFF ); } } } @@ -2916,7 +2905,7 @@ void TextEngine::ImpInitWritingDirections( sal_uInt32 nPara ) } -sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart, sal_Int32* pEnd ) +sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart ) { sal_uInt8 nRightToLeft = 0; @@ -2935,8 +2924,6 @@ sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_I nRightToLeft = rWritingDirectionInfo.nType; if ( pStart ) *pStart = rWritingDirectionInfo.nStartPos; - if ( pEnd ) - *pEnd = rWritingDirectionInfo.nEndPos; break; } } @@ -3014,13 +3001,11 @@ long TextEngine::ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine, sal_uI return nX; } -void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion ) +void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev ) { ComplexTextLayoutMode nLayoutMode = pOutDev->GetLayoutMode(); nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); - if ( bDrawingR2LPortion ) - nLayoutMode |= TEXT_LAYOUT_BIDI_RTL; pOutDev->SetLayoutMode( nLayoutMode ); } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 93d7957dd692..f34d60c9f553 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -1329,22 +1329,11 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) return mpImpl->maSelection; } -void TextView::InsertText( const OUString& rStr, bool bSelect ) +void TextView::InsertText( const OUString& rStr ) { mpImpl->mpTextEngine->UndoActionStart(); - TextSelection aNewSel( mpImpl->maSelection ); - TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, rStr ); - - if ( bSelect ) - { - aNewSel.Justify(); - aNewSel.GetEnd() = aPaM; - } - else - { - aNewSel = aPaM; - } + TextSelection aNewSel = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, rStr ); ImpSetSelection( aNewSel ); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 0c8026d0ff6a..5720ef90028b 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1254,9 +1254,9 @@ OUString GraphicFilter::GetExportFormatShortName( sal_uInt16 nFormat ) return pConfig->GetExportFormatShortName( nFormat ); } -OUString GraphicFilter::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ) +OUString GraphicFilter::GetExportWildcard( sal_uInt16 nFormat ) { - return pConfig->GetExportWildcard( nFormat, nEntry ); + return pConfig->GetExportWildcard( nFormat, 0 ); } bool GraphicFilter::IsExportPixelFormat( sal_uInt16 nFormat ) diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 8865d3c84f53..dabf950f37e7 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -53,7 +53,7 @@ bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, return !rStreamWMF.GetError(); } -bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem ) +bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF ) { sal_uInt32 nMetaType(0); sal_uInt32 nOrgPos = rStream.Tell(); @@ -77,7 +77,7 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* } else { - WMFReader( rStream, rMTF, pFilterConfigItem ).ReadWMF(); + WMFReader( rStream, rMTF, nullptr ).ReadWMF(); } return rStream.good(); diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 120578788dd7..96072615719c 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -692,12 +692,12 @@ void PDFExtOutDevData::CreateNote( const Rectangle& rRect, const PDFNote& rNote, mpGlobalSyncData->mParaPDFNotes.push_back( rNote ); mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr ); } -void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr ) +void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetPageTransition ); mpGlobalSyncData->mParaPageTransitions.push_back( eType ); mpGlobalSyncData->mParauInts.push_back( nMilliSec ); - mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr ); + mpGlobalSyncData->mParaInts.push_back( mnPage ); } /* local (page), actions have to be played synchronously to the actions of @@ -764,7 +764,7 @@ void PDFExtOutDevData::SetAlternateText( const OUString& rText ) mpPageSyncData->mParaOUStrings.push_back( rText ); } -void PDFExtOutDevData::CreateControl( const PDFWriter::AnyWidget& rControlType, sal_Int32 /*nPageNr*/ ) +void PDFExtOutDevData::CreateControl( const PDFWriter::AnyWidget& rControlType ) { mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::CreateControl ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index df8a1a21336d..1a84a6358607 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -72,10 +72,9 @@ void PDFWriter::DrawTextLine( long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, - FontLineStyle eOverline, - bool bUnderlineAbove ) + FontLineStyle eOverline ) { - xImplementation->drawTextLine( rPos, nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove ); + xImplementation->drawTextLine( rPos, nWidth, eStrikeout, eUnderline, eOverline, false/*bUnderlineAbove*/ ); } void PDFWriter::DrawTextArray( @@ -437,9 +436,9 @@ void PDFWriter::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 n xImplementation->setPageTransition( eType, nMilliSec, nPageNr ); } -sal_Int32 PDFWriter::CreateControl( const PDFWriter::AnyWidget& rControl, sal_Int32 nPageNr ) +sal_Int32 PDFWriter::CreateControl( const PDFWriter::AnyWidget& rControl ) { - return xImplementation->createControl( rControl, nPageNr ); + return xImplementation->createControl( rControl ); } PDFOutputStream::~PDFOutputStream() diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 279ac5d885cc..e619c5dfe34f 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1788,15 +1788,10 @@ OUString PrinterOptionsHelper::getStringValue( const OUString& i_rPropertyName, return (aVal >>= aRet) ? aRet : i_rDefault; } -bool PrinterOptionsHelper::processProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp, - std::set< OUString >* o_pChangeProp ) +bool PrinterOptionsHelper::processProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp ) { bool bChanged = false; - // clear the changed set - if( o_pChangeProp ) - o_pChangeProp->clear(); - sal_Int32 nElements = i_rNewProp.getLength(); const css::beans::PropertyValue* pVals = i_rNewProp.getConstArray(); for( sal_Int32 i = 0; i < nElements; i++ ) @@ -1814,8 +1809,6 @@ bool PrinterOptionsHelper::processProperties( const css::uno::Sequence< css::bea if( bElementChanged ) { - if( o_pChangeProp ) - o_pChangeProp->insert( pVals[ i ].Name ); m_aPropertyMap[ pVals[i].Name ] = pVals[i].Value; bChanged = true; } diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 67b2f611398e..f8761336bb8f 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -303,7 +303,7 @@ OUString WhitespaceToSpace( const OUString& rLine, bool bProtect ) return OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); } -OString WhitespaceToSpace(const OString& rLine, bool bProtect) +OString WhitespaceToSpace(const OString& rLine) { sal_Int32 nLen = rLine.getLength(); if (!nLen) @@ -334,11 +334,11 @@ OString WhitespaceToSpace(const OString& rLine, bool bProtect) if( *pRun ) pRun++; } - else if( bProtect && *pRun == '`' ) + else if( *pRun == '`' ) CopyUntil( pLeap, pRun, '`', true ); - else if( bProtect && *pRun == '\'' ) + else if( *pRun == '\'' ) CopyUntil( pLeap, pRun, '\'', true ); - else if( bProtect && *pRun == '"' ) + else if( *pRun == '"' ) CopyUntil( pLeap, pRun, '"', true ); else { diff --git a/vcl/source/image/ImageRepository.cxx b/vcl/source/image/ImageRepository.cxx index dadc622cdcce..855ae80c6306 100644 --- a/vcl/source/image/ImageRepository.cxx +++ b/vcl/source/image/ImageRepository.cxx @@ -25,11 +25,11 @@ namespace vcl { - bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) + bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent ) { OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - return ImplImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent, loadMissing ); + return ImplImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent ); } bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 3f134f4931c0..6ad7eb603715 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1093,8 +1093,7 @@ long OutputDevice::GetTextArray( const OUString& rStr, long* pDXAry, bool OutputDevice::GetCaretPositions( const OUString& rStr, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, - long* pDXAry, long nLayoutWidth, - bool bCellBreaking ) const + long* pDXAry, long nLayoutWidth ) const { if( nIndex >= rStr.getLength() ) @@ -1147,12 +1146,6 @@ bool OutputDevice::GetCaretPositions( const OUString& rStr, long* pCaretXArray, pCaretXArray[i] /= nWidthFactor; } - // if requested move caret position to cell limits - if( bCellBreaking ) - { - ; // FIXME - } - return true; } @@ -2290,8 +2283,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr, } long OutputDevice::GetCtrlTextWidth( const OUString& rStr, - sal_Int32 nIndex, sal_Int32 nLen, - DrawTextFlags nStyle ) const + sal_Int32 nIndex, sal_Int32 nLen ) const { if(nLen == 0x0FFFF) { @@ -2304,21 +2296,16 @@ long OutputDevice::GetCtrlTextWidth( const OUString& rStr, nLen = rStr.getLength() - nIndex; } - if ( nStyle & DrawTextFlags::Mnemonic ) + sal_Int32 nMnemonicPos; + OUString aStr = GetNonMnemonicString( rStr, nMnemonicPos ); + if ( nMnemonicPos != -1 ) { - sal_Int32 nMnemonicPos; - OUString aStr = GetNonMnemonicString( rStr, nMnemonicPos ); - if ( nMnemonicPos != -1 ) - { - if ( nMnemonicPos < nIndex ) - nIndex--; - else if ( (nMnemonicPos >= nIndex) && ((sal_uLong)nMnemonicPos < (sal_uLong)(nIndex+nLen)) ) - nLen--; - } - return GetTextWidth( aStr, nIndex, nLen ); + if ( nMnemonicPos < nIndex ) + nIndex--; + else if ( (nMnemonicPos >= nIndex) && ((sal_uLong)nMnemonicPos < (sal_uLong)(nIndex+nLen)) ) + nLen--; } - else - return GetTextWidth( rStr, nIndex, nLen ); + return GetTextWidth( aStr, nIndex, nLen ); } OUString OutputDevice::GetNonMnemonicString( const OUString& rStr, sal_Int32& rMnemonicPos ) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index baa40292afef..d218675f23aa 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -421,7 +421,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, SetItemImage( nItemId, rImage ); } -void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) +void Menu::InsertItem( const ResId& rResId ) { ResMgr* pMgr = rResId.GetResMgr(); if( ! pMgr ) @@ -456,16 +456,16 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) Bitmap aBmp( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *pMgr ) ); Image const aImg(aBmp); if ( !aText.isEmpty() ) - InsertItem( nItemId, aText, aImg, nStatus, OString(), nPos ); + InsertItem( nItemId, aText, aImg, nStatus, OString() ); else - InsertItem( nItemId, aImg, nStatus, OString(), nPos ); + InsertItem( nItemId, aImg, nStatus, OString() ); } IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) ); } else if ( !bSep ) - InsertItem(nItemId, aText, nStatus, OString(), nPos); + InsertItem(nItemId, aText, nStatus, OString()); if ( bSep ) - InsertSeparator(OString(), nPos); + InsertSeparator(OString()); OUString aHelpText; if ( nObjMask & RSC_MENUITEM_HELPTEXT ) @@ -528,7 +528,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) } void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, - MenuItemBits nBits, const OString &rIdent, sal_uInt16 nPos) + MenuItemBits nBits, const OString &rIdent) { OUString aLabel(CommandInfoProvider::Instance().GetPopupLabelForCommand(rCommand, rFrame)); OUString aTooltip(CommandInfoProvider::Instance().GetTooltipForCommand(rCommand, rFrame)); @@ -536,7 +536,7 @@ void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::f sal_uInt16 nItemId = GetItemCount() + 1; - InsertItem(nItemId, aLabel, aImage, nBits, rIdent, nPos); + InsertItem(nItemId, aLabel, aImage, nBits, rIdent); SetItemCommand(nItemId, rCommand); SetHelpText(nItemId, aTooltip); } @@ -649,9 +649,9 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n } } -void Menu::CopyItem( const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos ) +void Menu::CopyItem( const Menu& rMenu, sal_uInt16 nPos ) { - ImplCopyItem( this, rMenu, nPos, nNewPos ); + ImplCopyItem( this, rMenu, nPos, MENU_APPEND ); } void Menu::Clear() @@ -2297,7 +2297,7 @@ void Menu::RemoveDisabledEntries( bool bCheckPopups, bool bRemoveEmptyPopups ) mpLayoutData = nullptr; } -bool Menu::HasValidEntries( bool bCheckPopups ) +bool Menu::HasValidEntries() { bool bValidEntries = false; sal_uInt16 nCount = GetItemCount(); @@ -2306,7 +2306,7 @@ bool Menu::HasValidEntries( bool bCheckPopups ) MenuItemData* pItem = pItemList->GetDataFromPos( n ); if ( pItem->bEnabled && ( pItem->eType != MenuItemType::SEPARATOR ) ) { - if ( bCheckPopups && pItem->pSubMenu ) + if ( pItem->pSubMenu ) bValidEntries = pItem->pSubMenu->HasValidEntries(); else bValidEntries = true; @@ -2849,10 +2849,10 @@ PopupMenu* PopupMenu::GetActivePopupMenu() return pSVData->maAppData.mpActivePopupMenu; } -void PopupMenu::EndExecute( sal_uInt16 nSelectId ) +void PopupMenu::EndExecute() { if ( ImplGetWindow() ) - ImplGetFloatingWindow()->EndExecute( nSelectId ); + ImplGetFloatingWindow()->EndExecute( 0 ); } void PopupMenu::SelectItem(sal_uInt16 nId) diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 1b4f76f10a91..0c49837cdf4f 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -984,7 +984,7 @@ void Window::ImplValidate( const vcl::Region* pRegion, ValidateFlags nFlags ) } } -void Window::ImplUpdateAll( bool bOverlapWindows ) +void Window::ImplUpdateAll() { if ( !mpWindowImpl->mbReallyVisible ) return; @@ -1002,13 +1002,7 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) // an update changes the OverlapWindow, such that for later paints // not too much has to be drawn, if ALLCHILDREN etc. is set vcl::Window* pWindow = ImplGetFirstOverlapWindow(); - if ( bOverlapWindows ) - pWindow->ImplCallOverlapPaint(); - else - { - if (pWindow->mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTCHILDREN)) - pWindow->ImplCallPaint(nullptr, pWindow->mpWindowImpl->mnPaintFlags); - } + pWindow->ImplCallOverlapPaint(); if ( bFlush ) Flush(); @@ -1226,12 +1220,12 @@ void Window::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags ) } } -void Window::Validate( ValidateFlags nFlags ) +void Window::Validate() { if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) ) return; - ImplValidate( nullptr, nFlags ); + ImplValidate( nullptr, ValidateFlags::NONE ); } bool Window::HasPaintEvent() const diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 5b644826b5ef..2d88d511453f 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2722,7 +2722,7 @@ void SplitWindow::InsertItem( sal_uInt16 nId, long nSize, InsertItem( nId, nullptr, nSize, nPos, nIntoSetId, nBits ); } -void SplitWindow::RemoveItem( sal_uInt16 nId, bool bHide ) +void SplitWindow::RemoveItem( sal_uInt16 nId ) { #ifdef DBG_UTIL sal_uInt16 nDbgDummy; @@ -2756,11 +2756,8 @@ void SplitWindow::RemoveItem( sal_uInt16 nId, bool bHide ) if ( pWindow ) { // restore window - if ( bHide || (pOrgParent != this) ) - { - pWindow->Hide(); - pWindow->SetParent( pOrgParent ); - } + pWindow->Hide(); + pWindow->SetParent( pOrgParent ); } // Clear and delete @@ -3159,9 +3156,9 @@ sal_uInt16 SplitWindow::GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId ) const return nPos; } -sal_uInt16 SplitWindow::GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId ) const +sal_uInt16 SplitWindow::GetItemId( sal_uInt16 nPos ) const { - ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId ); + ImplSplitSet* pSet = ImplFindSet( mpBaseSet, 0/*nSetId*/ ); if ( pSet && (nPos < pSet->mpItems.size()) ) return pSet->mpItems[nPos]->mnId; else @@ -3233,15 +3230,15 @@ void SplitWindow::ShowAutoHideButton( bool bShow ) ImplUpdate(); } -void SplitWindow::ShowFadeInHideButton( bool bShow ) +void SplitWindow::ShowFadeInHideButton() { - mbFadeIn = bShow; + mbFadeIn = true; ImplUpdate(); } -void SplitWindow::ShowFadeOutButton( bool bShow ) +void SplitWindow::ShowFadeOutButton() { - mbFadeOut = bShow; + mbFadeOut = true; ImplUpdate(); } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 4bbe7fafe5f5..3bf1271acd44 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -199,11 +199,10 @@ void SystemChildWindow::SetForwardKey( bool bEnable ) mpWindowImpl->mpSysObj->SetForwardKey( bEnable ); } -sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) +sal_IntPtr SystemChildWindow::GetParentWindowHandle() { sal_IntPtr nRet = 0; - (void)bUseJava; #if defined(_WIN32) nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined MACOSX @@ -214,91 +213,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) #elif defined IOS // Nothing #elif defined UNX - if( !bUseJava ) - { - nRet = (sal_IntPtr) GetSystemData()->aWindow; - } -#if HAVE_FEATURE_JAVA - else - { - uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); - - if( GetSystemData()->aWindow > 0 ) - { - try - { - ::rtl::Reference< ::jvmaccess::VirtualMachine > xVM; - uno::Reference< java::XJavaVM > xJavaVM = java::JavaVirtualMachine::create(xContext); - uno::Sequence< sal_Int8 > aProcessID( 17 ); - - rtl_getGlobalProcessId( reinterpret_cast<sal_uInt8*>(aProcessID.getArray()) ); - aProcessID[ 16 ] = 0; - OSL_ENSURE(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *), "Pointer cannot be represented as sal_Int64"); - sal_Int64 nPointer = reinterpret_cast< sal_Int64 >( static_cast< jvmaccess::VirtualMachine * >(nullptr)); - xJavaVM->getJavaVM(aProcessID) >>= nPointer; - xVM = reinterpret_cast< jvmaccess::VirtualMachine * >(nPointer); - - if( xVM.is() ) - { - try - { - ::jvmaccess::VirtualMachine::AttachGuard aVMAttachGuard( xVM ); - JNIEnv* pEnv = aVMAttachGuard.getEnvironment(); - - jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit"); - ImplTestJavaException(pEnv); - - jmethodID jmToolkit_getDefaultToolkit = pEnv->GetStaticMethodID( jcToolkit, "getDefaultToolkit", "()Ljava/awt/Toolkit;" ); - ImplTestJavaException(pEnv); - - pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit); - ImplTestJavaException(pEnv); - - jclass jcMotifAppletViewer = pEnv->FindClass("sun/plugin/navig/motif/MotifAppletViewer"); - if( pEnv->ExceptionOccurred() ) - { - pEnv->ExceptionClear(); - - jcMotifAppletViewer = pEnv->FindClass( "sun/plugin/viewer/MNetscapePluginContext"); - ImplTestJavaException(pEnv); - } - - jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader"); - ImplTestJavaException(pEnv); - - jmethodID jmClassLoader_loadLibrary = pEnv->GetStaticMethodID( jcClassLoader, "loadLibrary", "(Ljava/lang/Class;Ljava/lang/String;Z)V"); - ImplTestJavaException(pEnv); - - jstring jsplugin = pEnv->NewStringUTF("javaplugin_jni"); - ImplTestJavaException(pEnv); - - pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, jcMotifAppletViewer, jsplugin, JNI_FALSE); - ImplTestJavaException(pEnv); - - jmethodID jmMotifAppletViewer_getWidget = pEnv->GetStaticMethodID( jcMotifAppletViewer, "getWidget", "(IIIII)I" ); - ImplTestJavaException(pEnv); - - const Size aSize( GetOutputSizePixel() ); - jint ji_widget = pEnv->CallStaticIntMethod( jcMotifAppletViewer, jmMotifAppletViewer_getWidget, - GetSystemData()->aWindow, 0, 0, aSize.Width(), aSize.Height() ); - ImplTestJavaException(pEnv); - - nRet = static_cast< sal_IntPtr >( ji_widget ); - } - catch( uno::RuntimeException& ) - { - } - - if( !nRet ) - nRet = static_cast< sal_IntPtr >( GetSystemData()->aWindow ); - } - } - catch( ... ) - { - } - } - } -#endif // HAVE_FEATURE_JAVA + nRet = (sal_IntPtr) GetSystemData()->aWindow; #endif return nRet; diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index e12f8d4ba418..238f8fa739d0 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -227,12 +227,9 @@ bool TaskPaneList::HandleKeyEvent(const KeyEvent& rKeyEvent) } // returns next splitter -vcl::Window* TaskPaneList::FindNextSplitter( vcl::Window *pWindow, bool bForward ) +vcl::Window* TaskPaneList::FindNextSplitter( vcl::Window *pWindow ) { - if( bForward ) - ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); - else - ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSortBackward() ); + ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); auto p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 048ef506be10..df0919243ad3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4981,14 +4981,12 @@ void ToolBox::LoseFocus() } // performs the action associated with an item, ie simulates clicking the item -void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) +void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift ) { mnHighItemId = nItemId; sal_uInt16 nModifier = 0; if( bShift ) nModifier |= KEY_SHIFT; - if( bCtrl ) - nModifier |= KEY_MOD1; vcl::KeyCode aKeyCode( 0, nModifier ); ImplActivateItem( aKeyCode ); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index d2364c18644d..7f904ffd0faa 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -446,7 +446,7 @@ void ToolBox::Select() pWrapper->GetFloatingWindow()->EndPopupMode(); } -void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) +void ToolBox::InsertItem( const ResId& rResId ) { sal_uLong nObjMask; bool bImage = false; // has image @@ -524,14 +524,14 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) } // create item and add to list - mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); + mpData->m_aItems.push_back( aItem ); mpData->ImplClearLayoutData(); // recalculate ToolBox and redraw ImplInvalidate( bNewCalc ); // Notify - sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); + sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(mpData->m_aItems.size() - 1); CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } @@ -637,19 +637,19 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -void ToolBox::InsertSpace( sal_uInt16 nPos ) +void ToolBox::InsertSpace() { // create item and add to list ImplToolItem aItem; aItem.meType = ToolBoxItemType::SPACE; aItem.mbEnabled = false; - mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); + mpData->m_aItems.push_back( aItem ); mpData->ImplClearLayoutData(); ImplInvalidate(); // Notify - sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); + sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(mpData->m_aItems.size() - 1); CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } @@ -719,8 +719,7 @@ void ToolBox::RemoveItem( sal_uInt16 nPos ) } } -void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, - sal_uInt16 nNewPos ) +void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId ) { DBG_ASSERT( GetItemPos( nItemId ) == TOOLBOX_ITEM_NOTFOUND, "ToolBox::CopyItem(): ItemId already exists" ); @@ -736,13 +735,13 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, aNewItem.mpWindow = nullptr; aNewItem.mbShowWindow = false; - mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aNewItem ); + mpData->m_aItems.push_back( aNewItem ); mpData->ImplClearLayoutData(); // redraw ToolBox ImplInvalidate(); // Notify - sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(( nNewPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nNewPos); + sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(mpData->m_aItems.size() - 1); CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos2 ) ); } } @@ -1355,7 +1354,7 @@ void ToolBox::EndSelection() mnMouseModifier = 0; } -void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) +void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1380,23 +1379,20 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) } } - if ( bRelease ) + if ( mbDrag || mbSelection ) { - if ( mbDrag || mbSelection ) - { - mbDrag = false; - mbSelection = false; - EndTracking(); - if (IsMouseCaptured()) - ReleaseMouse(); - Deactivate(); - } - - mnCurItemId = 0; - mnDownItemId = 0; - mnMouseClicks = 0; - mnMouseModifier = 0; + mbDrag = false; + mbSelection = false; + EndTracking(); + if (IsMouseCaptured()) + ReleaseMouse(); + Deactivate(); } + + mnCurItemId = 0; + mnDownItemId = 0; + mnMouseClicks = 0; + mnMouseModifier = 0; } } diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 88344cf74e63..9f988fd4cb3e 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1090,9 +1090,9 @@ bool Window::IsToolbarFloatingWindow() const return mpWindowImpl && mpWindowImpl->mbToolbarFloatingWindow; } -void Window::EnableAllResize( bool bEnable ) +void Window::EnableAllResize() { - mpWindowImpl->mbAllResize = bEnable; + mpWindowImpl->mbAllResize = true; } void Window::EnableChildTransparentMode( bool bEnable ) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index a8eca2a3c57c..408d52cb5ad6 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -1480,20 +1480,18 @@ void PPDParser::getDefaultResolution( int& rXRes, int& rYRes ) const rYRes = 300; } -OUString PPDParser::translateKey( const OUString& i_rKey, - const css::lang::Locale& i_rLocale ) const +OUString PPDParser::translateKey( const OUString& i_rKey ) const { - OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); + OUString aResult( m_pTranslator->translateKey( i_rKey, css::lang::Locale() ) ); if( aResult.isEmpty() ) aResult = i_rKey; return aResult; } OUString PPDParser::translateOption( const OUString& i_rKey, - const OUString& i_rOption, - const css::lang::Locale& i_rLocale ) const + const OUString& i_rOption ) const { - OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); + OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, css::lang::Locale() ) ); if( aResult.isEmpty() ) aResult = i_rOption; return aResult; |