Kaydet (Commit) 2da43592 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:constantparam

Change-Id: Ia11bf93768d5f722b7fe62df15f24809cb7e7f04
Reviewed-on: https://gerrit.libreoffice.org/60280
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 7823684c
......@@ -40,19 +40,19 @@ sc/inc/rangeutl.hxx:162
sc/inc/xmlwrap.hxx:89
_Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
enum ImportFlags nMode setBits=0x1
sc/source/ui/view/cellsh1.cxx:111
sc/source/ui/view/cellsh1.cxx:112
enum InsertDeleteFlags FlagsFromString(const class rtl::OUString &,enum InsertDeleteFlags)
enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
sc/source/ui/view/cellsh1.cxx:134
sc/source/ui/view/cellsh1.cxx:135
class rtl::OUString FlagsToString(enum InsertDeleteFlags,enum InsertDeleteFlags)
enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
sw/source/core/view/viewsh.cxx:716
sw/source/core/view/viewsh.cxx:718
void lcl_InvalidateAllContent(class SwViewShell &,enum SwInvalidateFlags)
enum SwInvalidateFlags nInv setBits=0x2
sw/source/filter/html/swhtml.hxx:670
sw/source/filter/html/swhtml.hxx:671
void SwHTMLParser::SetFrameFormatAttrs(class SfxItemSet &,enum HtmlFrameFormatFlags,class SfxItemSet &)
enum HtmlFrameFormatFlags nFlags setBits=0x1
sw/source/filter/ww8/wrtw8esh.cxx:1538
sw/source/filter/ww8/wrtw8esh.cxx:1534
enum ShapeFlag AddMirrorFlags(enum ShapeFlag,const class SwMirrorGrf &)
enum ShapeFlag nFlags setBits=0xa00 clearBits=0x5ef
xmloff/inc/MetaExportComponent.hxx:32
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -375,11 +375,9 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
}
OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor,
const Reference< XConnection>& _xConnection,
ISQLStatementHelper* _pHelper,
const OUString& _sCreatePattern)
const Reference< XConnection>& _xConnection)
{
OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern);
OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,nullptr,OUString());
const OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection);
if ( !sKeyStmt.isEmpty() )
aSql += sKeyStmt;
......
......@@ -667,18 +667,13 @@ namespace dbtools
The descriptor of the new table.
@param _xConnection
The connection.
@param _pHelper
Allow to add special SQL constructs.
@param _sCreatePattern
@return
The CREATE TABLE statement.
*/
OOO_DLLPUBLIC_DBTOOLS
OUString createSqlCreateTableStatement( const css::uno::Reference< css::beans::XPropertySet >& descriptor
,const css::uno::Reference< css::sdbc::XConnection>& _xConnection
,ISQLStatementHelper* _pHelper = nullptr
,const OUString& _sCreatePattern = OUString());
,const css::uno::Reference< css::sdbc::XConnection>& _xConnection);
/** creates a SDBC column with the help of getColumns.
@param _xTable
......
......@@ -125,7 +125,7 @@ public:
/** Show only the tab bar, not the deck.
*/
void RequestCloseDeck(bool bFocusMenuTab = false);
void RequestCloseDeck();
/** Open the deck area and restore the parent window to its old width.
*/
......
......@@ -507,9 +507,9 @@ public:
void SetOptimalSize();
/// Insert @rImage item with @rStr as either a legend or tooltip depending on @bShowLegend.
/// Insert @rImage item with @rStr as a tooltip
void InsertItem(sal_uInt16 nItemId, const Image& rImage,
const OUString& rStr, size_t nPos = VALUESET_APPEND, bool bShowLegend = false);
const OUString& rStr, size_t nPos = VALUESET_APPEND);
/// Insert an @rColor item with @rStr tooltip.
void InsertItem(sal_uInt16 nItemId, const Color& rColor,
const OUString& rStr);
......
......@@ -103,7 +103,6 @@ private:
NamedColor m_aSelectedColor;
sal_uInt16 m_nSlotId;
bool m_bShowNoneButton;
bool m_bInterimBuilder;
std::shared_ptr<PaletteManager> m_xPaletteManager;
BorderColorStatus m_aBorderColorStatus;
......@@ -112,7 +111,7 @@ private:
void LockWidthRequest();
ColorWindow* getColorWindow() const;
public:
ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pWindow, bool bInterimBuilder = false);
ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pWindow);
~ColorListBox();
void SetSelectHdl(const Link<ColorListBox&, void>& rLink)
......
......@@ -615,7 +615,7 @@ SdDrawDocument* SdDrawDocument::AllocSdDrawDocument() const
SfxObjectCreateMode::EMBEDDED, true, meDocType ) );
else
mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell(
SfxObjectCreateMode::EMBEDDED, true, meDocType ) );
SfxObjectCreateMode::EMBEDDED ) );
pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj = mpCreatingTransferable->GetDocShell().get() );
pNewDocSh->DoInitNew();
......
......@@ -220,7 +220,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium* pMedium)
// If that wasn't the case, we could load the model directly.
if ( bCreateGraphicShell )
// Draw
mxBookmarkDocShRef = new ::sd::GraphicDocShell(SfxObjectCreateMode::STANDARD, true, DocumentType::Draw);
mxBookmarkDocShRef = new ::sd::GraphicDocShell(SfxObjectCreateMode::STANDARD);
else
// Impress
mxBookmarkDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD, true, DocumentType::Impress);
......
......@@ -48,18 +48,14 @@ void GraphicDocShell::InitInterface_Impl()
SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SfxObjectShellFlags::STD_NORMAL, "sdraw" )
GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode,
bool bDataObject,
DocumentType eDocType) :
DrawDocShell(eMode, bDataObject, eDocType)
GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode) :
DrawDocShell(eMode, /*bDataObject*/true, DocumentType::Draw)
{
SetStyleFamily( SfxStyleFamily::Para );
}
GraphicDocShell::GraphicDocShell(SfxModelFlags nModelCreationFlags,
bool bDataObject,
DocumentType eDocType) :
DrawDocShell(nModelCreationFlags, bDataObject, eDocType)
GraphicDocShell::GraphicDocShell(SfxModelFlags nModelCreationFlags) :
DrawDocShell(nModelCreationFlags, /*bDataObject*/false, DocumentType::Draw)
{
SetStyleFamily( SfxStyleFamily::Para );
}
......
......@@ -44,15 +44,9 @@ private:
public:
SFX_DECL_OBJECTFACTORY();
GraphicDocShell (
SfxObjectCreateMode eMode,
bool bSdDataObj,
DocumentType);
GraphicDocShell(SfxObjectCreateMode eMode);
GraphicDocShell (
SfxModelFlags nModelCreationFlags,
bool bSdDataObj,
DocumentType);
GraphicDocShell(SfxModelFlags nModelCreationFlags);
virtual ~GraphicDocShell() override;
};
......
......@@ -53,9 +53,7 @@ uno::Reference< uno::XInterface > SdDrawingDocument_createInstance(
SdDLL::Init();
SfxObjectShell* pShell =
new ::sd::GraphicDocShell(
_nCreationFlags, false, DocumentType::Draw );
SfxObjectShell* pShell = new ::sd::GraphicDocShell( _nCreationFlags );
return uno::Reference< uno::XInterface >( pShell->GetModel() );
}
......
......@@ -1106,14 +1106,14 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool)
return true;
}
void SidebarController::RequestCloseDeck(bool bFocusMenuTab)
void SidebarController::RequestCloseDeck()
{
mbIsDeckRequestedOpen = false;
UpdateDeckOpenState();
if (mpCurrentDeck.get())
{
sal_Int32 nIndex(bFocusMenuTab ? 0 : mpTabBar->GetDeckIndexForId(mpCurrentDeck->GetId()));
sal_Int32 nIndex(mpTabBar->GetDeckIndexForId(mpCurrentDeck->GetId()));
maFocusManager.GrabFocusButton(nIndex);
}
else
......
......@@ -3730,12 +3730,11 @@ Size SvtValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesire
}
void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
const OUString& rText, size_t nPos,
bool bShowLegend )
const OUString& rText, size_t nPos )
{
SvtValueSetItem* pItem = new SvtValueSetItem( *this );
pItem->mnId = nItemId;
pItem->meType = bShowLegend ? VALUESETITEM_IMAGE_AND_TEXT : VALUESETITEM_IMAGE;
pItem->meType = VALUESETITEM_IMAGE;
pItem->maImage = rImage;
pItem->maText = rText;
ImplInsertItem( pItem, nPos );
......
......@@ -3764,14 +3764,13 @@ void SvxColorListBox::SelectEntry(const Color& rColor)
ShowPreview(m_aSelectedColor);
}
ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pTopLevel, bool bInterimBuilder)
ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pTopLevel)
: m_xButton(std::move(pControl))
, m_pTopLevel(pTopLevel)
, m_aColorWrapper(this)
, m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor())
, m_nSlotId(0)
, m_bShowNoneButton(false)
, m_bInterimBuilder(bInterimBuilder)
{
m_aSelectedColor = GetAutoColor(m_nSlotId);
LockWidthRequest();
......@@ -3804,7 +3803,7 @@ void ColorListBox::createColorWindow()
xFrame,
m_pTopLevel,
m_xButton.get(),
m_bInterimBuilder,
/*bInterimBuilder*/false,
m_aColorWrapper));
SetNoSelection();
......
......@@ -2382,7 +2382,7 @@ void DocxAttributeOutput::WritePostponedGraphic()
{
for (const auto & rPostponedDiagram : *m_pPostponedGraphic)
FlyFrameGraphic(rPostponedDiagram.grfNode, rPostponedDiagram.size,
rPostponedDiagram.mOLEFrameFormat, rPostponedDiagram.mOLENode,
nullptr, nullptr,
rPostponedDiagram.pSdrObj);
m_pPostponedGraphic.reset(nullptr);
}
......@@ -5378,7 +5378,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P
else // we are writing out attributes, but w:drawing should not be inside w:rPr,
{ // so write it out later
m_bPostponedProcessingFly = true ;
m_pPostponedGraphic->push_back(PostponedGraphic(pGrfNode, rFrame.GetLayoutSize(), nullptr, nullptr, pSdrObj));
m_pPostponedGraphic->push_back(PostponedGraphic(pGrfNode, rFrame.GetLayoutSize(), pSdrObj));
}
}
}
......
......@@ -841,13 +841,11 @@ private:
struct PostponedGraphic
{
PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* sObj )
: grfNode( n ), size( s ), mOLEFrameFormat( pOLEFrameFormat ), mOLENode( pOLENode ), pSdrObj(sObj) {};
PostponedGraphic( const SwGrfNode* n, Size s, const SdrObject* sObj )
: grfNode( n ), size( s ), pSdrObj(sObj) {};
const SwGrfNode* grfNode;
Size size;
const SwFlyFrameFormat* mOLEFrameFormat;
SwOLENode* mOLENode;
const SdrObject* pSdrObj;
};
std::unique_ptr< std::vector<PostponedGraphic> > m_pPostponedGraphic;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment