include/svx/dlgctrl.hxx | 4 ---- include/svx/graphctl.hxx | 2 -- include/svx/xoutbmp.hxx | 1 - include/vcl/edit.hxx | 1 - sc/source/core/data/documen2.cxx | 2 +- sc/source/ui/docshell/docfunc.cxx | 15 ++++----------- sc/source/ui/docshell/docsh5.cxx | 2 +- sc/source/ui/inc/docsh.hxx | 2 +- sc/source/ui/vba/vbarange.cxx | 6 +++--- sd/source/ui/table/TableDesignPane.cxx | 21 +++++---------------- sd/source/ui/table/TableDesignPane.hxx | 10 +++------- sdext/source/minimizer/optimizerdialogcontrols.cxx | 16 ++++++++-------- sdext/source/presenter/PresenterTheme.cxx | 3 +-- sdext/source/presenter/PresenterTheme.hxx | 1 - sdext/source/presenter/PresenterToolBar.cxx | 1 - sfx2/source/appl/newhelp.hxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 6 ++---- sfx2/source/doc/DocumentMetadataAccess.cxx | 8 +++----- solenv/clang-format/blacklist | 1 - svx/source/dialog/_contdlg.cxx | 2 +- svx/source/dialog/dlgctrl.cxx | 15 --------------- svx/source/svdraw/svdconv.hxx | 21 --------------------- svx/source/svdraw/svdoashp.cxx | 1 - svx/source/svdraw/svdobj.cxx | 2 -- svx/source/svdraw/svdocapt.cxx | 1 - svx/source/svdraw/svdomeas.cxx | 1 - svx/source/svdraw/svdopath.cxx | 1 - svx/source/svdraw/svdotext.cxx | 1 - svx/source/xoutdev/_xoutbmp.cxx | 2 +- xmloff/source/text/txtftne.cxx | 17 ++++++++--------- 30 files changed, 43 insertions(+), 125 deletions(-)
New commits: commit 8611689f0df73daeebb261b0c06c8a1727c17fe3 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue May 15 16:43:56 2018 +0200 loplugin:unusedmethods Change-Id: I10c291788061ec8467126a0dc719e20fb3cf47ec Reviewed-on: https://gerrit.libreoffice.org/54386 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 1f2a17f9feb7..4752c8033066 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -117,7 +117,6 @@ protected: public: SvxRectCtl( vcl::Window* pParent, RectPoint eRpt = RectPoint::MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80 ); - void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircl); virtual ~SvxRectCtl() override; virtual void dispose() override; @@ -145,7 +144,6 @@ public: RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; bool IsCompletelyDisabled() const { return mbCompleteDisable; } - void DoCompletelyDisable(bool bNew); }; class SAL_WARN_UNUSED SVX_DLLPUBLIC RectCtl @@ -174,8 +172,6 @@ protected: bool mbCompleteDisable : 1; - void MarkToResetSettings(); - RectPoint GetRPFromPoint( Point, bool bRTL = false ) const; const Point& GetPointFromRP( RectPoint ) const; Point SetActualRPWithoutInvalidate( RectPoint eNewRP ); // returns the last point diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 13d323c48a93..492e3dd62987 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -142,8 +142,6 @@ public: virtual ~SvxGraphCtrl(); void SetGraphic( const Graphic& rGraphic ); - const Graphic& GetGraphic() const { return aGraphic; } - const Size& GetGraphicSize() const { return aGraphSize; } const Size& GetSize() const { return maSize; } diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 16ac23120429..61649aeef6f1 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -278,7 +278,6 @@ public: void SetForceControlBackground(bool b) { mbForceControlBackground = b; } - void SetPassword(bool b) { mbPassword = b; } bool IsPassword() const { return mbPassword; } }; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 8c631dceeb3b..1111149ce0ae 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -78,9 +78,6 @@ public: void ApplyOptions(); void ApplyStyle(); - bool isStyleChanged() const { return mbStyleSelected; } - bool isOptionsChanged() const { return mbOptionsChanged; } - private: void addListener(); void removeListener(); diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 4fc47329e80b..cc3dfe0e8843 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -14679,7 +14679,6 @@ svx/source/svdraw/sdrpaintwindow.cxx svx/source/svdraw/sdrundomanager.cxx svx/source/svdraw/selectioncontroller.cxx svx/source/svdraw/svdattr.cxx -svx/source/svdraw/svdconv.hxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svddrag.cxx svx/source/svdraw/svddrgm1.hxx diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index d091a121023d..c6612b7e0b61 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -83,14 +83,6 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RectPoint eRpt, Resize_Impl(); } -void SvxRectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle) -{ - nBorderWidth = nBorder; - nRadius = nCircle; - eDefRP = eRpt; - Resize_Impl(); -} - Size SvxRectCtl::GetOptimalSize() const { return LogicToPixel(Size(78, 39), MapMode(MapUnit::MapAppFont)); @@ -652,13 +644,6 @@ RectPoint SvxRectCtl::GetApproxRPFromPixPt( const css::awt::Point& r ) const return GetRPFromPoint( GetApproxLogPtFromPixPt( Point( r.X, r.Y ) ) ); } -// CompletelyDisabled() added to have a disabled state for SvxRectCtl -void SvxRectCtl::DoCompletelyDisable(bool bNew) -{ - mbCompleteDisable = bNew; - Invalidate(); -} - BitmapEx& RectCtl::GetRectBitmap() { if( !pBitmap ) diff --git a/svx/source/svdraw/svdconv.hxx b/svx/source/svdraw/svdconv.hxx deleted file mode 100644 index e2b415d20f11..000000000000 --- a/svx/source/svdraw/svdconv.hxx +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX -#define INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX - -#include <sal/types.h> - -inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } - -inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); } - -#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index e4fb279d5970..a6a4a756fd90 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -82,7 +82,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/utils/unotools.hxx> -#include "svdconv.hxx" #include <svdobjplusdata.hxx> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2e2b74aef7f9..2ee6999ac93a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include "svdconv.hxx" - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 69a65fb1e68b..e02b596f2195 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -31,7 +31,6 @@ #include <tools/bigint.hxx> #include <tools/helpers.hxx> -#include "svdconv.hxx" #include <svx/dialmgr.hxx> #include <svx/strings.hrc> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 918b6fd4ebce..53aa58ba4f06 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "svdconv.hxx" #include <svx/dialmgr.hxx> #include <svx/strings.hrc> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 1e8257906e70..c1ff60b573cd 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -42,7 +42,6 @@ #include <svx/xlntrit.hxx> #include <sdr/contact/viewcontactofsdrpathobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include "svdconv.hxx" #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 18673a5f0914..8576b406370e 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -60,7 +60,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <vcl/virdev.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include "svdconv.hxx" using namespace com::sun::star; commit 196f46db1b5dfddda6972a6b738d8b77b6c3601e Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue May 15 15:21:22 2018 +0200 loplugin:constantparam Change-Id: I0110e0c662004456e4bc8f8082e2e2fea59e0148 Reviewed-on: https://gerrit.libreoffice.org/54385 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 0f7ae80d95b2..f75d2e1bf52f 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -71,7 +71,6 @@ public: static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); static tools::Polygon GetContour( const Bitmap& rBmp, const XOutFlags nContourFlags, - const sal_uInt8 cEdgeDetectThreshold, const tools::Rectangle* pWorkRect ); }; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index acb96bc1fc70..7bbf5ccf7c94 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1101,7 +1101,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, xLib->getByName( sSrcCodeName ) >>= sRTLSource; sSource = sRTLSource; } - VBA_InsertModule( *this, nDestPos, OUString(), sSource ); + VBA_InsertModule( *this, nDestPos, sSource ); } } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 79078ba93831..2e122db92332 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3039,7 +3039,7 @@ static script::ModuleInfo lcl_InitModuleInfo( const SfxObjectShell& rDocSh, cons return sModuleInfo; } -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sSource ) +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sSource ) { SfxObjectShell& rDocSh = *rDoc.GetDocumentShell(); uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer(); @@ -3059,15 +3059,8 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName if( xLib.is() ) { // if the Module with codename exists then find a new name - sal_Int32 nNum = 0; - OUString genModuleName; - if ( !sModuleName.isEmpty() ) - genModuleName = sModuleName; - else - { - genModuleName = "Sheet1"; - nNum = 1; - } + sal_Int32 nNum = 1; + OUString genModuleName = "Sheet1"; while( xLib->hasByName( genModuleName ) ) genModuleName = "Sheet" + OUString::number( ++nNum ); @@ -3152,7 +3145,7 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo // Only insert vba modules if vba mode ( and not currently importing XML ) if( bInsertDocModule ) { - VBA_InsertModule( rDoc, nTab, OUString(), OUString() ); + VBA_InsertModule( rDoc, nTab, OUString() ); } rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 19eab038a074..d42e44d7be22 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -974,7 +974,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec catch ( const css::uno::Exception& ) { } - VBA_InsertModule( aDocument, nTabToUse, OUString(), sSource ); + VBA_InsertModule( aDocument, nTabToUse, sSource ); } } Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 8e1b02aeb41f..2a87e865413b 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -484,7 +484,7 @@ namespace HelperNotifyChanges } }; -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sModuleSource ); +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleSource ); #endif diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 77ae1192c2f3..869f40a7c756 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1287,7 +1287,7 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference } /// @throws uno::RuntimeException -uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) +uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges ) { if( !rxCellRanges.is() ) throw uno::RuntimeException("Missing cell ranges object" ); @@ -1299,7 +1299,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno:: for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) { uno::Reference< table::XCellRange > xRange( rxCellRanges->getByIndex( nIndex ), uno::UNO_QUERY_THROW ); - table::CellRangeAddress aRangeAddr = lclGetRangeAddress( lclExpandToMerged( xRange, bRecursive ) ); + table::CellRangeAddress aRangeAddr = lclGetRangeAddress( lclExpandToMerged( xRange, /*bRecursive*/true ) ); ScRange aScRange; ScUnoConversion::FillScRange( aScRange, aRangeAddr ); aScRanges.push_back( aScRange ); @@ -2242,7 +2242,7 @@ ScVbaRange::Select() uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); if ( mxRanges.is() ) - xSelection->select( uno::Any( lclExpandToMerged( mxRanges, true ) ) ); + xSelection->select( uno::Any( lclExpandToMerged( mxRanges ) ) ); else xSelection->select( uno::Any( lclExpandToMerged( mxRange, true ) ) ); // set focus on document e.g. diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 5e1114ea5e51..1a61bf6f100e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -84,25 +84,16 @@ static const OUStringLiteral gPropNames[CB_COUNT] = "UseBandingColumnStyle" }; -TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ) +TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase ) : mrBase(rBase) - , mbModal(bModal) , mbStyleSelected(false) , mbOptionsChanged(false) { pParent->get(m_pValueSet, "previews"); m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER); m_pValueSet->SetExtraSpacing(8); - m_pValueSet->setModal(mbModal); - if( !mbModal ) - { - m_pValueSet->SetColor(); - } - else - { - m_pValueSet->SetColor( COL_WHITE ); - m_pValueSet->SetBackground( COL_WHITE ); - } + m_pValueSet->setModal(false); + m_pValueSet->SetColor(); m_pValueSet->SetSelectHdl (LINK(this, TableDesignWidget, implValueSetHdl)); for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i) @@ -156,8 +147,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase const & rBase ) IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void) { mbStyleSelected = true; - if( !mbModal ) - ApplyStyle(); + ApplyStyle(); } void TableDesignWidget::ApplyStyle() @@ -214,8 +204,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void) { mbOptionsChanged = true; - if( !mbModal ) - ApplyOptions(); + ApplyOptions(); FillDesignPreviewControl(); } diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 347e4ed980c2..8c631dceeb3b 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -69,7 +69,7 @@ public: class TableDesignWidget final { public: - TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ); + TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase ); ~TableDesignWidget(); // callbacks @@ -102,7 +102,6 @@ private: css::uno::Reference< css::drawing::XDrawView > mxView; css::uno::Reference< css::container::XIndexAccess > mxTableFamily; - bool mbModal; bool mbStyleSelected; bool mbOptionsChanged; }; @@ -115,13 +114,13 @@ public: TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanel.ui", css::uno::Reference<css::frame::XFrame>()) - , aImpl(this, rBase, false) + , aImpl(this, rBase) { } TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase, bool ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanelhorizontal.ui", css::uno::Reference<css::frame::XFrame>()) - , aImpl(this, rBase, false) + , aImpl(this, rBase) { } }; diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 89434c4766a0..fdb56af5464e 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -285,7 +285,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& rItemListener, - const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, bool bMultiLine, sal_Int16 nTabIndex ) + const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex ) { sal_Int32 nHeight = 8; OUString pNames[] = { @@ -301,7 +301,7 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r Any pValues[] = { Any( nHeight ), Any( rLabel ), - Any( bMultiLine ), + Any( false ), // bMultiLine Any( nXPos ), Any( nYPos ), Any( sal_Int16(0) ), @@ -518,8 +518,8 @@ void OptimizerDialog::InitPage2() std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1", getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, false, mnTabIndex++ ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, false, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, false, false, mnTabIndex++ ) ); aControlList.push_back( InsertFormattedField( *this, "FormattedField0Pg1", mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X + 106, PAGE_POS_Y + 38, 0, 100, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1", getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, false, false, mnTabIndex++ ) ); @@ -564,8 +564,8 @@ void OptimizerDialog::InitPage3() std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2", getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg2", mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, false, mnTabIndex++ ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, false, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, true, false, mnTabIndex++ ) ); maControlPages.push_back( aControlList ); DeactivatePage( 3 ); @@ -868,8 +868,8 @@ void OptimizerDialog::InitPage4() aControlList.push_back( InsertFixedText( *this, "FixedText8Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, false, false, mnTabIndex++ ) ); setControlProperty( "FixedText8Pg4", "Align", Any( static_cast< short >( 2 ) ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString( STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, false, mnTabIndex++ ) ); - aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, false, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString( STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, mnTabIndex++ ) ); + aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, "FixedText1Pg4", OUString(), PAGE_POS_X + 6, DIALOG_HEIGHT - 87, PAGE_WIDTH - 12, 8, true, false, mnTabIndex++ ) ); aControlList.emplace_back("Progress" ); aControlList.push_back( InsertSeparator( *this, "Separator1Pg4", 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 58, PAGE_WIDTH - 12, 1 ) ); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index cf62207860ae..a1a06d617d12 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -318,10 +318,9 @@ OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const PresenterTheme::SharedFontDescriptor PresenterTheme::ReadFont ( const Reference<container::XHierarchicalNameAccess>& rxNode, - const OUString& rsFontPath, const PresenterTheme::SharedFontDescriptor& rpDefault) { - return ReadContext::ReadFont(rxNode, rsFontPath, rpDefault); + return ReadContext::ReadFont(rxNode, OUString(), rpDefault); } bool PresenterTheme::ConvertToColor ( diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 82b3d78e9887..95548c212b5b 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -112,7 +112,6 @@ public: static SharedFontDescriptor ReadFont ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const OUString& rsFontPath, const SharedFontDescriptor& rDefaultFount); static bool ConvertToColor ( diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index c9070fd6f3db..553ce220ca0d 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -1390,7 +1390,6 @@ void ElementMode::ReadElementMode ( PresenterConfigurationAccess::GetProperty(xProperties, "Font"), UNO_QUERY); PresenterTheme::SharedFontDescriptor pFont (PresenterTheme::ReadFont( xFontNode, - "", rpDefaultMode.get()!=nullptr ? rpDefaultMode->maText.GetFont() : PresenterTheme::SharedFontDescriptor())); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 4c6d4818910a..48213720b426 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -577,7 +577,7 @@ public: }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang = OUString()); +void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark); #endif // INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 0ebb845b1dcc..9133afe6b8d9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -272,11 +272,9 @@ static OUString HelpLocaleString() -void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang ) +void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark ) { - OUString aLocaleStr( rLang ); - if ( aLocaleStr.isEmpty() ) - aLocaleStr = HelpLocaleString(); + OUString aLocaleStr = HelpLocaleString(); // query part exists? if ( bQuestionMark ) diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index bf765366e27f..ff6ad06ea6a7 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -478,7 +478,6 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, e.g. ODB files seem to only have content.xml */ static void collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, - const OUString& i_Path, std::set< OUString > & o_rFiles) { static OUString content(s_content); @@ -487,12 +486,12 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, if (i_xStorage->hasByName(content) && i_xStorage->isStreamElement(content)) { - o_rFiles.insert(i_Path + content); + o_rFiles.insert(content); } if (i_xStorage->hasByName(styles) && i_xStorage->isStreamElement(styles)) { - o_rFiles.insert(i_Path + styles); + o_rFiles.insert(styles); } } catch (const uno::Exception &) { SAL_WARN("sfx", "collectFilesFromStorage: exception?"); @@ -1055,8 +1054,7 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromStorage( initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler); std::set< OUString > StgFiles; - collectFilesFromStorage(i_xStorage, - "", StgFiles); + collectFilesFromStorage(i_xStorage, StgFiles); std::vector< OUString > MfstMetadataFiles; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 615b0b239570..08ae8de6a660 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -179,7 +179,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, aBmp.SetPrefSize( rGraphic.GetPrefSize() ); aBmp.SetPrefMapMode( rGraphic.GetPrefMapMode() ); - return tools::PolyPolygon( XOutBitmap::GetContour( aBmp, nContourFlags, 128, pRect ) ); + return tools::PolyPolygon( XOutBitmap::GetContour( aBmp, nContourFlags, pRect ) ); } // Loop through to super class, no virtual Methods to not become incompatible diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index d2fd8dfcbe4f..d2437cbfc25c 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -528,9 +528,9 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) } tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlags, - const sal_uInt8 cEdgeDetectThreshold, const tools::Rectangle* pWorkRectPixel ) { + const sal_uInt8 cEdgeDetectThreshold = 128; Bitmap aWorkBmp; tools::Polygon aRetPoly; tools::Rectangle aWorkRect( Point(), rBmp.GetSizePixel() ); diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index b606180c7e1b..13c2ad693686 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -230,15 +230,14 @@ static void lcl_exportString( const OUString& sProperty, sal_uInt16 nPrefix, enum XMLTokenEnum eElement, - bool bEncodeName, - bool bOmitIfEmpty) + bool bEncodeName) { SAL_WARN_IF( eElement == XML_TOKEN_INVALID, "xmloff", "need element token"); Any aAny = rPropSet->getPropertyValue(sProperty); OUString sTmp; aAny >>= sTmp; - if (!bOmitIfEmpty || !sTmp.isEmpty()) + if (!sTmp.isEmpty()) { if( bEncodeName ) sTmp = rExport.EncodeStyleName( sTmp ); @@ -257,33 +256,33 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( lcl_exportString( GetExport(), rFootnoteConfig, sParaStyleName, XML_NAMESPACE_TEXT, XML_DEFAULT_STYLE_NAME, - true, true); + true); // citation style lcl_exportString( GetExport(), rFootnoteConfig, sCharStyleName, XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, - true, true); + true); // citation body style lcl_exportString( GetExport(), rFootnoteConfig, sAnchorCharStyleName, XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, - true, true); + true); // page style lcl_exportString( GetExport(), rFootnoteConfig, sPageStyleName, XML_NAMESPACE_TEXT, XML_MASTER_PAGE_NAME, - true, true ); + true ); // prefix lcl_exportString( GetExport(), rFootnoteConfig, sPrefix, - XML_NAMESPACE_STYLE, XML_NUM_PREFIX, false, true); + XML_NAMESPACE_STYLE, XML_NUM_PREFIX, false); // suffix lcl_exportString( GetExport(), rFootnoteConfig, sSuffix, - XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false, true); + XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false); Any aAny; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits