mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam

Browse Source 
Change-Id: I389f98d06058ba65a8c2d4df2bf7d4e5102659ad
Reviewed-on: https://gerrit.libreoffice.org/65017
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-12-12 13:39:45 +02:00
parent 312eeeee42
commit d2bc01ff10
28 changed files with 941 additions and 918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/basobj2.cxx
View File

@ -247,7 +247,7 @@ OUString ChooseMacro(weld::Window* pParent,
OUString aScriptURL;
SbMethod* pMethod = nullptr;
MacroChooser aChooser(pParent, xDocFrame, true);
MacroChooser aChooser(pParent, xDocFrame);
if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() )
aChooser.SetMode(MacroChooser::ChooseOnly);

3
basctl/source/basicide/macrodlg.cxx
View File

@ -45,7 +45,7 @@ using std::map;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame >& xDocFrame, bool bCreateEntries)
MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame >& xDocFrame)
: SfxDialogController(pParnt, "modules/BasicIDE/ui/basicmacrodialog.ui", "BasicMacroDialog")
, m_xDocumentFrame(xDocFrame)
// the Sfx doesn't ask the BasicManager whether modified or not
@ -102,7 +102,6 @@ MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BASICIDE_STOREALLMODULESOURCES );
if (bCreateEntries)
m_xBasicBox->ScanAllEntries();
}

2
basctl/source/basicide/macrodlg.hxx
View File

@ -89,7 +89,7 @@ private:
std::unique_ptr<weld::Button> m_xNewLibButton;
std::unique_ptr<weld::Button> m_xNewModButton;
public:
MacroChooser(weld::Window *pParent, const ::css::uno::Reference< ::css::frame::XFrame >& xDocFrame, bool bCreateEntries);
MacroChooser(weld::Window *pParent, const ::css::uno::Reference< ::css::frame::XFrame >& xDocFrame);
virtual ~MacroChooser() override;
SbMethod* GetMacro();

8
basctl/source/basicide/moduldlg.cxx
View File

@ -803,7 +803,7 @@ void ObjectPage::NewModule()
if ( GetSelection( aDocument, aLibName ) )
{
createModImpl(GetFrameWeld(), aDocument,
*m_pBasicBox, aLibName, OUString(), true);
*m_pBasicBox, aLibName, true);
}
}
@ -960,7 +960,7 @@ void LibDialog::SetStorageName( const OUString& rName )
// Helper function
SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
TreeListBox& rBasicBox, const OUString& rLibName, const OUString& _aModName, bool bMain )
TreeListBox& rBasicBox, const OUString& rLibName, bool bMain )
{
OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" );
if ( !rDocument.isAlive() )
@ -972,9 +972,7 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
if ( aLibName.isEmpty() )
aLibName = "Standard" ;
rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
OUString aModName = _aModName;
if ( aModName.isEmpty() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
OUString aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
NewObjectDialog aNewDlg(pWin, ObjectMode::Module, true);
aNewDlg.SetObjectName(aModName);

2
basctl/source/basicide/moduldlg.hxx
View File

@ -252,7 +252,7 @@ public:
SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
SbTreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain);
SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
TreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain);
TreeListBox& rBasicBox, const OUString& rLibName, bool bMain);
void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
CheckBox* pLibBox, TreeListBox* pBasicBox);
void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,

14
compilerplugins/clang/constantparam.bitmask.results
View File

@ -6,7 +6,7 @@ codemaker/source/javamaker/classfile.hxx:168
enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1
cui/source/options/webconninfo.hxx:35
void svx::PasswordTable::InsertHeaderItem(unsigned short,const class rtl::OUString &,enum HeaderBarItemBits)
enum HeaderBarItemBits nBits setBits=0x211 clearBits=0x1ee
enum HeaderBarItemBits nBits setBits=0x201 clearBits=0x1fe
dbaccess/source/filter/xml/xmlExport.hxx:171
void dbaxml::ODBExport::ODBExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
enum SvXMLExportFlags nExportFlag setBits=0x400 clearBits=0x200
@ -16,16 +16,16 @@ include/basegfx/polygon/b2dpolygontools.hxx:144
include/framework/framelistanalyzer.hxx:181
void framework::FrameListAnalyzer::FrameListAnalyzer(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFramesSupplier> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,enum FrameAnalyzerFlags)
enum FrameAnalyzerFlags eDetectMode setBits=0x4
include/sfx2/objsh.hxx:472
include/sfx2/objsh.hxx:457
void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
enum SfxLoadedFlags nWhich setBits=0x1
include/svtools/brwbox.hxx:438
include/svtools/brwbox.hxx:433
void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString &,long,enum HeaderBarItemBits,unsigned short)
enum HeaderBarItemBits nBits setBits=0x410 clearBits=0x3ac
enum HeaderBarItemBits nBits setBits=0x400 clearBits=0x3ec
include/svtools/wizardmachine.hxx:178
void svt::OWizardMachine::OWizardMachine(class vcl::Window *,enum WizardButtonFlags)
enum WizardButtonFlags _nButtonFlags setBits=0xf
include/vcl/gdimtf.hxx:195
include/vcl/gdimtf.hxx:194
_Bool GDIMetaFile::CreateThumbnail(class BitmapEx &,enum BmpConversion,enum BmpScaleFlag) const
enum BmpScaleFlag nScaleFlag setBits=0x1
sc/inc/rangelst.hxx:48
@ -43,13 +43,13 @@ sc/source/ui/view/cellsh1.cxx:115
sc/source/ui/view/cellsh1.cxx:138
class rtl::OUString FlagsToString(enum InsertDeleteFlags,enum InsertDeleteFlags)
enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
sw/source/core/view/viewsh.cxx:734
sw/source/core/view/viewsh.cxx:733
void lcl_InvalidateAllContent(class SwViewShell &,enum SwInvalidateFlags)
enum SwInvalidateFlags nInv setBits=0x2
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:1529
sw/source/filter/ww8/wrtw8esh.cxx:1526
enum ShapeFlag AddMirrorFlags(enum ShapeFlag,const class SwMirrorGrf &)
enum ShapeFlag nFlags setBits=0xa00 clearBits=0x5ef
xmloff/inc/MetaExportComponent.hxx:32

720
compilerplugins/clang/constantparam.booleans.results
View File

File diff suppressed because it is too large Load Diff

168
compilerplugins/clang/constantparam.constructors.results
View File

@ -1,7 +1,11 @@
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx:120
class tools::Rectangle getRectangle(class svt::IAccessibleTableProvider *,int,_Bool,_Bool)
class tools::Rectangle getRectangle(class vcl::IAccessibleTableProvider *,int,_Bool,_Bool)
_Bool _bRowBar
isRowBarCell()
basctl/source/basicide/moduldlg.hxx:254
class SbModule * createModImpl(class weld::Window *,const class basctl::ScriptDocument &,class basctl::TreeListBox &,const class rtl::OUString &,const class rtl::OUString &,_Bool)
const class rtl::OUString & aModName
""
basctl/source/inc/dlged.hxx:202
void basctl::DlgEditor::printPage(int,class Printer *,const class rtl::OUString &)
const class rtl::OUString &
@ -22,7 +26,7 @@ chart2/source/controller/inc/CommandDispatchContainer.hxx:83
void chart::CommandDispatchContainer::setChartDispatch(const class com::sun::star::uno::Reference<class com::sun::star::frame::XDispatch> &,const class std::__debug::set<class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<class rtl::OUString> > &)
const class std::__debug::set<class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<class rtl::OUString> > & rChartCommands
impl_getAvailableCommands()
chart2/source/view/axes/VCartesianAxis.cxx:414
chart2/source/view/axes/VCartesianAxis.cxx:409
class rtl::OUString getTextLabelString(const class chart::FixedNumberFormatter &,const class com::sun::star::uno::Sequence<class rtl::OUString> *,const struct chart::TickInfo *,_Bool,class Color &,_Bool &)
_Bool bComplexCat
isComplexCategoryAxis()
@ -110,6 +114,10 @@ connectivity/source/manager/mdrivermanager.cxx:152
const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> & drivermanager::ExtractDriverFromCollectionElement::operator()(const struct std::pair<const class rtl::OUString, class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> > &) const
const struct std::pair<const class rtl::OUString, class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> > & _rElement
ExtractDriverFromCollectionElement()
cui/source/inc/cfgutil.hxx:256
void CuiConfigGroupListBox::Init(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,const class rtl::OUString &,_Bool)
const class rtl::OUString & sModuleLongName
""
dbaccess/source/core/api/RowSetRow.hxx:40
void dbaccess::ORowSetOldRowHelper::ORowSetOldRowHelper(const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > &)
const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > & _rRow
@ -146,7 +154,7 @@ desktop/source/deployment/inc/dp_interact.h:58
void dp_misc::ProgressLevel::update(const class com::sun::star::uno::Any &) const
const class com::sun::star::uno::Any & status
Any()
editeng/source/editeng/impedit3.cxx:153
editeng/source/editeng/impedit3.cxx:154
void lcl_DrawRedLines(class OutputDevice *,long,const class Point &,unsigned long,unsigned long,const long *,const class WrongList *,short,const class Point &,_Bool,_Bool)
_Bool bVertical
IsVertical()
@ -182,7 +190,7 @@ extensions/source/logging/filehandler.cxx:111
void logging::FileHandler::leaveMethod(class logging::ComponentMethodGuard<class logging::FileHandler>::Access)
class logging::ComponentMethodGuard<class logging::FileHandler>::Access
Access()
extensions/source/propctrlr/browserlistbox.hxx:110
extensions/source/propctrlr/browserlistbox.hxx:109
void pcr::OBrowserListBox::ActivateListBox(_Bool)
_Bool _bActive
IsVisible()
@ -194,19 +202,19 @@ extensions/source/propctrlr/listselectiondlg.hxx:38
void pcr::ListSelectionDialog::ListSelectionDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class rtl::OUString &)
class weld::Window * _pParent
impl_getDefaultDialogFrame_nothrow()
extensions/source/propctrlr/usercontrol.hxx:62
extensions/source/propctrlr/usercontrol.hxx:63
void pcr::OFormatSampleControl::OFormatSampleControl(class vcl::Window *)
class vcl::Window * pParent
impl_getDefaultDialogParent_nothrow()
extensions/source/propctrlr/usercontrol.hxx:102
extensions/source/propctrlr/usercontrol.hxx:103
void pcr::OFormattedNumericControl::OFormattedNumericControl(class vcl::Window *,long)
class vcl::Window * pParent
impl_getDefaultDialogParent_nothrow()
extensions/source/propctrlr/usercontrol.hxx:128
extensions/source/propctrlr/usercontrol.hxx:129
void pcr::OFileUrlControl::OFileUrlControl(class vcl::Window *)
class vcl::Window * pParent
impl_getDefaultDialogParent_nothrow()
extensions/source/propctrlr/usercontrol.hxx:145
extensions/source/propctrlr/usercontrol.hxx:146
void pcr::OTimeDurationControl::OTimeDurationControl(class vcl::Window *)
class vcl::Window * pParent
impl_getDefaultDialogParent_nothrow()
@ -252,11 +260,11 @@ include/comphelper/servicedecl.hxx:221
PostProcessDefaultT()
include/connectivity/dbtools.hxx:180
class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> getConnection_withFeedback(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
const class rtl::OUString & _rPwd
const class rtl::OUString & _rUser
""
include/connectivity/dbtools.hxx:180
class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> getConnection_withFeedback(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
const class rtl::OUString & _rUser
const class rtl::OUString & _rPwd
""
include/connectivity/dbtools.hxx:620
class rtl::OUString createStandardCreateStatement(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,class dbtools::ISQLStatementHelper *,const class rtl::OUString &)
@ -296,11 +304,11 @@ include/connectivity/sqlerror.hxx:158
ParamValue()
include/connectivity/sqlerror.hxx:241
class com::sun::star::sdbc::SQLException connectivity::SQLError::getSQLException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &) const
const class connectivity::SQLError::ParamValue & _rParamValue2
const class connectivity::SQLError::ParamValue & _rParamValue3
ParamValue()
include/connectivity/sqlerror.hxx:241
class com::sun::star::sdbc::SQLException connectivity::SQLError::getSQLException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &) const
const class connectivity::SQLError::ParamValue & _rParamValue3
const class connectivity::SQLError::ParamValue & _rParamValue2
ParamValue()
include/editeng/brushitem.hxx:61
void SvxBrushItem::SvxBrushItem(class SvStream &,unsigned short,unsigned short)
@ -434,7 +442,7 @@ include/sfx2/docfile.hxx:277
_Bool SfxMedium::SignDocumentContentUsingCertificate(_Bool,const class com::sun::star::uno::Reference<class com::sun::star::security::XCertificate> &)
_Bool bHasValidDocumentSignature
HasValidSignatures()
include/sfx2/objsh.hxx:645
include/sfx2/objsh.hxx:630
void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short)
const class JobSetup & rSetup
JobSetup()
@ -466,7 +474,7 @@ include/svl/intitem.hxx:115
void SfxInt32Item::SfxInt32Item(unsigned short,class SvStream &)
unsigned short which
Which()
include/svl/intitem.hxx:135
include/svl/intitem.hxx:136
void SfxUInt32Item::SfxUInt32Item(unsigned short,class SvStream &)
unsigned short which
Which()
@ -494,11 +502,11 @@ include/svtools/ehdl.hxx:37
void SfxErrorContext::SfxErrorContext(unsigned short,class weld::Window *,const struct std::pair<const char *, class ErrCode> *,const class std::locale &)
const class std::locale & rResLocaleP
SvtResLocale()
include/svx/charmap.hxx:156
include/svx/charmap.hxx:157
void SvxShowCharSet::DrawChars_Impl(class OutputDevice &,int,int)
int n2
LastInView()
include/svx/charmap.hxx:156
include/svx/charmap.hxx:157
void SvxShowCharSet::DrawChars_Impl(class OutputDevice &,int,int)
int n1
FirstInView()
@ -514,6 +522,10 @@ include/vbahelper/vbahelper.hxx:123
class rtl::OUString extractStringFromAny(const class com::sun::star::uno::Any &,const class rtl::OUString &,_Bool)
const class rtl::OUString & rDefault
""
include/vcl/accessibletable.hxx:83
class tools::Rectangle vcl::table::IAccessibleTable::calcHeaderRect(_Bool)
_Bool _bIsColumnBar
isColumnBar()
include/vcl/dockwin.hxx:38
void DockingData::DockingData(const class Point &,const class tools::Rectangle &,_Bool)
_Bool b
@ -534,31 +546,31 @@ include/vcl/field.hxx:380
class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rLocaleDataWrapper
ImplGetLocaleDataWrapper()
include/vcl/FilterConfigItem.hxx:74
include/vcl/FilterConfigItem.hxx:75
class rtl::OUString FilterConfigItem::ReadString(const class rtl::OUString &,const class rtl::OUString &)
const class rtl::OUString & rDefault
""
include/vcl/graphictools.hxx:280
include/vcl/graphictools.hxx:278
void SvtGraphicFill::SvtGraphicFill(const class tools::PolyPolygon &,class Color,double,enum SvtGraphicFill::FillRule,enum SvtGraphicFill::FillType,const struct SvtGraphicFill::Transform &,_Bool,enum SvtGraphicFill::HatchType,class Color,enum SvtGraphicFill::GradientType,class Color,class Color,int,const class Graphic &)
class Color aFillColor
Color()
include/vcl/outdev.hxx:1566
include/vcl/outdev.hxx:1544
class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const class Point &,const class Size &,const class Bitmap &,long,long)
const class Point & rSrcPt
Point()
include/vcl/print.hxx:645
include/vcl/print.hxx:644
class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setSubgroupControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
const class rtl::OUString & i_rHelpId
""
include/vcl/print.hxx:661
include/vcl/print.hxx:660
class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,const class com::sun::star::uno::Sequence<unsigned char> &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
const class rtl::OUString & i_rTitle
""
include/vcl/print.hxx:672
include/vcl/print.hxx:671
class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
const class rtl::OUString & i_rTitle
""
include/vcl/print.hxx:680
include/vcl/print.hxx:679
class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setEditControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
const class rtl::OUString & i_rTitle
""
@ -570,15 +582,15 @@ include/vcl/toolkit/unowrap.hxx:79
class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> UnoWrapperBase::CreateAccessible(class Menu *,_Bool)
_Bool bIsMenuBar
IsMenuBar()
include/vcl/transfer.hxx:308
include/vcl/transfer.hxx:307
class com::sun::star::uno::Any TransferableDataHelper::GetAny(enum SotClipboardFormatId,const class rtl::OUString &) const
const class rtl::OUString & rDestDoc
""
include/vcl/transfer.hxx:346
include/vcl/transfer.hxx:345
class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
const class rtl::OUString & rDestDoc
""
include/vcl/treelistbox.hxx:747
include/vcl/treelistbox.hxx:739
void SvTreeListBox::ShowFocusRect(const class SvTreeListEntry *)
const class SvTreeListEntry * pEntry
FirstSelected()
@ -586,7 +598,7 @@ include/vcl/virdev.hxx:157
_Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(const class Size &,const class Fraction &,const class Point &,unsigned char *)
const class Point & rNewOffset
Point()
include/vcl/weld.hxx:319
include/vcl/weld.hxx:338
void weld::ComboBox::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
const class rtl::OUString & rId
""
@ -658,7 +670,7 @@ opencl/source/opencl_device.cxx:432
void (anonymous namespace)::LogWriter::text(const class rtl::OString &)
const class rtl::OString & rText
""
opencl/source/openclwrapper.cxx:714
opencl/source/openclwrapper.cxx:712
struct _cl_device_id * findDeviceIdByDeviceString(const class rtl::OUString &,const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > &)
const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > & rPlatforms
fillOpenCLInfo()
@ -674,11 +686,11 @@ sc/inc/typedstrdata.hxx:43
_Bool ScTypedStrData::LessCaseInsensitive::operator()(const class ScTypedStrData &,const class ScTypedStrData &) const
const class ScTypedStrData & left
LessCaseInsensitive()
sc/qa/unit/helper/qahelper.hxx:201
sc/qa/unit/helper/qahelper.hxx:195
class tools::SvRef<class ScDocShell> ScBootstrapFixture::saveAndReload(class ScDocShell *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum SfxFilterFlags)
const class rtl::OUString & rUserData
""
sc/source/core/tool/token.cxx:4898
sc/source/core/tool/token.cxx:4897
void appendTokenByType(struct sc::TokenStringContext &,class rtl::OUStringBuffer &,const class formula::FormulaToken &,const class ScAddress &,_Bool)
_Bool bFromRangeName
IsFromRangeName()
@ -706,15 +718,15 @@ sc/source/filter/inc/xestyle.hxx:146
_Bool CheckItems(const class XclExpRoot &,const class SfxItemSet &,short,_Bool)
_Bool bDeep
IsStyleXF()
sc/source/filter/inc/xichart.hxx:881
sc/source/filter/inc/xichart.hxx:883
class com::sun::star::uno::Reference<class com::sun::star::chart2::XCoordinateSystem> XclImpChType::CreateCoordSystem(_Bool) const
_Bool b3dChart
Is3dChart()
sc/source/filter/inc/xichart.hxx:884
sc/source/filter/inc/xichart.hxx:886
class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartType> XclImpChType::CreateChartType(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDiagram> &,_Bool) const
_Bool b3dChart
Is3dChart()
sc/source/filter/inc/xichart.hxx:901
sc/source/filter/inc/xichart.hxx:903
void XclImpChChart3d::Convert(class ScfPropertySet &,_Bool) const
_Bool b3dWallChart
Is3dWallChart()
@ -734,11 +746,11 @@ sc/source/ui/inc/AccessibleCsvControl.hxx:480
void ScAccessibleCsvCell::ScAccessibleCsvCell(class ScCsvGrid &,const class rtl::OUString &,int,int)
class ScCsvGrid & rGrid
implGetGrid()
sc/source/ui/vba/vbasheetobject.hxx:184
sc/source/ui/vba/vbasheetobject.hxx:171
void ScVbaButton::ScVbaButton(const class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> &,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> &)
const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> & rxFormIC
createForm()
sc/source/ui/vba/vbawindows.cxx:101
sc/source/ui/vba/vbawindows.cxx:102
void WindowEnumImpl::WindowEnumImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Any &)
const class com::sun::star::uno::Any & aApplication
Application()
@ -790,6 +802,10 @@ sdext/source/presenter/PresenterConfigurationAccess.hxx:115
class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> sdext::presenter::PresenterConfigurationAccess::GetNodeProperties(const class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameAccess> &,const class rtl::OUString &)
const class rtl::OUString & rsPathToNode
""
sfx2/source/inc/versdlg.hxx:53
void SfxVersionDialog::SfxVersionDialog(class weld::Window *,class SfxViewFrame *,_Bool)
_Bool
IsSaveVersionOnClose()
slideshow/source/engine/opengl/TransitionImpl.cxx:637
class std::shared_ptr<class OGLTransitionImpl> makeSimpleTransition(const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class std::shared_ptr<class Operation>, class std::allocator<class std::shared_ptr<class Operation> > > &,const struct TransitionSettings &)
const struct TransitionSettings & rSettings
@ -810,27 +826,27 @@ starmath/inc/cursor.hxx:185
void SmCursor::Draw(class OutputDevice &,class Point,_Bool)
_Bool isCaretVisible
IsCursorVisible()
store/source/lockbyte.cxx:269
store/source/lockbyte.cxx:268
void store::FileHandle::CloseFile::operator()(struct store::FileHandle &) const
struct store::FileHandle & rFile
destructor_type()
store/source/lockbyte.cxx:491
store/source/lockbyte.cxx:490
void store::FileMapping::UnmapFile::operator()(struct store::FileMapping &) const
struct store::FileMapping & rMapping
destructor_type()
store/source/lockbyte.cxx:815
store/source/lockbyte.cxx:814
void store::ResourceHolder::ResourceHolder<T>(const type-parameter-?-? &)
const type-parameter-?-? & value
T()
svtools/source/contnr/imivctl.hxx:452
svtools/source/contnr/imivctl.hxx:405
void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
const class SvxIconChoiceCtrlColumnInfo &
SvxIconChoiceCtrlColumnInfo()
svx/inc/dragmt3d.hxx:89
svx/inc/dragmt3d.hxx:91
void E3dDragRotate::E3dDragRotate(class SdrDragView &,const class SdrMarkList &,enum E3dDragConstraint,_Bool)
_Bool bFull
IsSolidDragging()
svx/inc/dragmt3d.hxx:106
svx/inc/dragmt3d.hxx:108
void E3dDragMove::E3dDragMove(class SdrDragView &,const class SdrMarkList &,enum SdrHdlKind,enum E3dDragConstraint,_Bool)
_Bool bFull
IsSolidDragging()
@ -846,7 +862,11 @@ svx/source/inc/xmlxtimp.hxx:43
_Bool SvxXMLXTableImport::load(const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> &,_Bool *)
const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> & xTable
createInstance()
sw/inc/doc.hxx:907
svx/source/svdraw/svdmodel.cxx:1889
void addPair(class std::__debug::vector<struct std::pair<class rtl::OUString, class com::sun::star::uno::Any>, class std::allocator<struct std::pair<class rtl::OUString, class com::sun::star::uno::Any> > > &,const class rtl::OUString &,const type-parameter-?-?)
const type-parameter-?-? val
IsAnchoredTextOverflowLegacy()
sw/inc/doc.hxx:910
const class SwTOXMark & SwDoc::GotoTOXMark(const class SwTOXMark &,enum SwTOXSearch,_Bool)
_Bool bInReadOnly
IsReadOnlyAvailable()
@ -882,15 +902,15 @@ sw/source/core/access/acctable.cxx:104
void SwAccessibleTableData_Impl::SwAccessibleTableData_Impl(class SwAccessibleMap &,const class SwTabFrame *,_Bool,_Bool)
_Bool bIsInPagePreview
IsInPagePreview()
sw/source/core/crsr/crstrvl.cxx:651
sw/source/core/crsr/crstrvl.cxx:650
void lcl_MakeFieldLst(class SetGetExpFields &,const class SwFieldType &,const _Bool,const _Bool)
const _Bool bInReadOnly
IsReadOnlyAvailable()
sw/source/core/graphic/grfatr.cxx:49
sw/source/core/graphic/grfatr.cxx:50
_Bool lcl_IsHoriOnEvenPages(enum MirrorGraph,_Bool)
_Bool bToggle
IsGrfToggle()
sw/source/core/inc/anchoredobjectposition.hxx:184
sw/source/core/inc/anchoredobjectposition.hxx:189
long objectpositioning::SwAnchoredObjectPosition::AdjustVertRelPos(const long,const _Bool,const _Bool,const class SwFrame &,const long,const _Bool,const _Bool) const
const _Bool bFollowTextFlow
DoesObjFollowsTextFlow()
@ -994,6 +1014,10 @@ sw/source/uibase/lingu/sdrhhcwrap.hxx:43
void SdrHHCWrapper::SdrHHCWrapper(class SwView *,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font *,int,_Bool)
_Bool bInteractive
IsInteractive()
toolkit/inc/helper/unopropertyarrayhelper.hxx:39
void UnoPropertyArrayHelper::UnoPropertyArrayHelper(const class com::sun::star::uno::Sequence<int> &)
const class com::sun::star::uno::Sequence<int> & rIDs
ImplGetPropertyIds()
vcl/inc/fontinstance.hxx:73
_Bool LogicalFontInstance::GetGlyphBoundRect(unsigned short,class tools::Rectangle &,_Bool) const
_Bool
@ -1002,7 +1026,7 @@ vcl/inc/fontinstance.hxx:74
_Bool LogicalFontInstance::GetGlyphOutline(unsigned short,class basegfx::B2DPolyPolygon &,_Bool) const
_Bool
IsVertical()
vcl/inc/salgdi.hxx:594
vcl/inc/salgdi.hxx:595
_Bool SalGraphics::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &)
const class rtl::OUString & aCaption
""
@ -1018,59 +1042,59 @@ vcl/source/control/field2.cxx:366
void ImplPatternProcessStrictModify(class Edit *,const class rtl::OString &,const class rtl::OUString &,_Bool)
_Bool bSameMask
ImplIsSameMask()
vcl/source/control/field2.cxx:453
vcl/source/control/field2.cxx:452
_Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
_Bool bSameMask
ImplIsSameMask()
vcl/source/control/field2.cxx:453
_Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
_Bool bStrictFormat
IsStrictFormat()
vcl/source/control/field2.cxx:453
vcl/source/control/field2.cxx:452
_Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
_Bool & rbInKeyInput
ImplGetInPattKeyInput()
vcl/source/control/field2.cxx:998
vcl/source/control/field2.cxx:452
_Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
_Bool bStrictFormat
IsStrictFormat()
vcl/source/control/field2.cxx:997
_Bool ImplDateProcessKeyInput(const class KeyEvent &,enum ExtDateFieldFormat,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rLocaleDataWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field2.cxx:1010
vcl/source/control/field2.cxx:1009
_Bool ImplDateGetValue(const class rtl::OUString &,class Date &,enum ExtDateFieldFormat,const class LocaleDataWrapper &,const class CalendarWrapper &)
const class LocaleDataWrapper & rLocaleDataWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field2.cxx:1894
_Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
_Bool bDuration
IsDuration()
vcl/source/control/field2.cxx:1894
_Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rLocaleDataWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field2.cxx:1894
vcl/source/control/field2.cxx:1893
_Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
_Bool bStrictFormat
IsStrictFormat()
vcl/source/control/field.cxx:953
vcl/source/control/field2.cxx:1893
_Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
_Bool bDuration
IsDuration()
vcl/source/control/field2.cxx:1893
_Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rLocaleDataWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field.cxx:954
_Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
_Bool bUseThousandSep
IsUseThousandSep()
vcl/source/control/field.cxx:953
vcl/source/control/field.cxx:954
_Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field.cxx:1730
_Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
_Bool bUseThousandSep
IsUseThousandSep()
vcl/source/control/field.cxx:1730
vcl/source/control/field.cxx:1731
_Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rWrapper
ImplGetLocaleDataWrapper()
vcl/source/control/field.cxx:1737
vcl/source/control/field.cxx:1731
_Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
_Bool bUseThousandSep
IsUseThousandSep()
vcl/source/control/field.cxx:1738
_Bool ImplCurrencyGetValue(const class rtl::OUString &,long &,unsigned short,const class LocaleDataWrapper &)
const class LocaleDataWrapper & rWrapper
ImplGetLocaleDataWrapper()
vcl/source/edit/vclmedit.cxx:92
vcl/source/edit/vclmedit.cxx:95
void ImpVclMEdit::Enable(_Bool)
_Bool bEnable
IsEnabled()

650
compilerplugins/clang/constantparam.numbers.results
View File

File diff suppressed because it is too large Load Diff

10
cui/source/customize/cfg.cxx
View File

@ -219,11 +219,11 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet
{
SvxConfigPageHelper::InitImageType();
m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, nullptr);
m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, nullptr);
m_nContextMenusPageId = AddTabPage("contextmenus", CreateSvxContextMenuConfigPage, nullptr);
m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, nullptr);
m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, nullptr);
m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage);
m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage);
m_nContextMenusPageId = AddTabPage("contextmenus", CreateSvxContextMenuConfigPage);
m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage);
m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage);
const SfxPoolItem* pItem =
pInSet->GetItem( pInSet->GetPool()->GetWhich( SID_CONFIG ) );

5
include/sfx2/tabdlg.hxx
View File

@ -123,13 +123,12 @@ protected:
public:
SfxTabDialog(vcl::Window* pParent,
const OUString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * = nullptr, bool bEditFmt = false);
const SfxItemSet * = nullptr);
virtual ~SfxTabDialog() override;
virtual void dispose() override;
sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui
CreateTabPage pCreateFunc, // != 0
GetTabPageRanges pRangesFunc); // can be 0
CreateTabPage pCreateFunc); // != 0
void AddTabPage( sal_uInt16 nId,
const OUString &rRiderText,

2
include/svtools/brwbox.hxx
View File

@ -295,7 +295,7 @@ private:
bool GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove = false);
void SelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool bMakeVisible);
void ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections);
void ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice);
bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); }

17
include/vcl/bitmap.hxx
View File

@ -59,16 +59,6 @@ enum class BmpScaleFlag
};
enum class BmpDitherFlags
{
NONE = 0x0000,
Floyd = 0x0001,
};
namespace o3tl
{
template<> struct typed_flags<BmpDitherFlags> : is_typed_flags<BmpDitherFlags, 0x01> {};
}
#define BMP_COL_TRANS Color( 252, 3, 251 )
enum class BmpConversion
@ -172,16 +162,14 @@ public:
*/
bool Convert( BmpConversion eConversion );
/** Apply a dither algorithm to the bitmap
/** Apply a Floyd dither algorithm to the bitmap
This method dithers the bitmap inplace, i.e. a true color
bitmap is converted to a paletted bitmap, reducing the color
deviation by error diffusion.
@param nDitherFlags
The algorithm to be used for dithering
*/
bool Dither( BmpDitherFlags nDitherFlags );
bool Dither();
/** Crop the bitmap
@ -533,7 +521,6 @@ public:
SAL_DLLPRIVATE void ImplSetSalBitmap( const std::shared_ptr<SalBitmap>& xImpBmp );
SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales );
SAL_DLLPRIVATE bool ImplDitherFloyd();
public:

8
sc/source/ui/dbgui/subtdlg.cxx
View File

@ -29,10 +29,10 @@ ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
{
get(m_pBtnRemove, "remove");
AddTabPage("1stgroup", ScTpSubTotalGroup1::Create, nullptr);
AddTabPage("2ndgroup", ScTpSubTotalGroup2::Create, nullptr);
AddTabPage("3rdgroup", ScTpSubTotalGroup3::Create, nullptr);
AddTabPage("options", ScTpSubTotalOptions::Create, nullptr);
AddTabPage("1stgroup", ScTpSubTotalGroup1::Create);
AddTabPage("2ndgroup", ScTpSubTotalGroup2::Create);
AddTabPage("3rdgroup", ScTpSubTotalGroup3::Create);
AddTabPage("options", ScTpSubTotalOptions::Create);
m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) );
}

6
sc/source/ui/dbgui/validate.cxx
View File

@ -93,9 +93,9 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
, m_bOwnRefHdlr(false)
, m_bRefInputting(false)
{
m_nValuePageId = AddTabPage("criteria", ScTPValidationValue::Create, nullptr);
AddTabPage("inputhelp", ScTPValidationHelp::Create, nullptr);
AddTabPage("erroralert", ScTPValidationError::Create, nullptr);
m_nValuePageId = AddTabPage("criteria", ScTPValidationValue::Create);
AddTabPage("inputhelp", ScTPValidationHelp::Create);
AddTabPage("erroralert", ScTPValidationError::Create);
get(m_pHBox, "refinputbox");
}

48
sc/source/ui/pagedlg/hfedtdlg.cxx
View File

@ -53,8 +53,8 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"HeaderDialog", "modules/scalc/ui/headerdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
AddTabPage( "headerright", ScRightHeaderEditPage::Create );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create );
}
ScHFEditFooterDlg::ScHFEditFooterDlg(
@ -64,8 +64,8 @@ ScHFEditFooterDlg::ScHFEditFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"FooterDialog", "modules/scalc/ui/footerdialog.ui" )
{
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
AddTabPage( "footerright", ScRightFooterEditPage::Create );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create );
}
ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg(
@ -75,7 +75,7 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"LeftHeaderDialog", "modules/scalc/ui/leftheaderdialog.ui" )
{
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create );
}
ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg(
@ -85,7 +85,7 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"RightHeaderDialog", "modules/scalc/ui/rightheaderdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "headerright", ScRightHeaderEditPage::Create );
}
ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg(
@ -95,7 +95,7 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"LeftFooterDialog", "modules/scalc/ui/leftfooterdialog.ui" )
{
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create );
}
ScHFEditRightFooterDlg::ScHFEditRightFooterDlg(
@ -105,7 +105,7 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"RightFooterDialog", "modules/scalc/ui/rightfooterdialog.ui" )
{
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footerright", ScRightFooterEditPage::Create );
}
ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
@ -115,9 +115,9 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"SharedHeaderDialog", "modules/scalc/ui/sharedheaderdialog.ui" )
{
AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
AddTabPage( "header", ScRightHeaderEditPage::Create );
AddTabPage( "footerright", ScRightFooterEditPage::Create );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create );
}
ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
@ -127,9 +127,9 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"SharedFooterDialog", "modules/scalc/ui/sharedfooterdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "headerright", ScRightHeaderEditPage::Create );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create );
AddTabPage( "footer", ScRightFooterEditPage::Create );
}
ScHFEditAllDlg::ScHFEditAllDlg(
@ -139,10 +139,10 @@ ScHFEditAllDlg::ScHFEditAllDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"AllHeaderFooterDialog", "modules/scalc/ui/allheaderfooterdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
AddTabPage( "headerright", ScRightHeaderEditPage::Create );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create );
AddTabPage( "footerright", ScRightFooterEditPage::Create );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create );
}
ScHFEditActiveDlg::ScHFEditActiveDlg(
@ -160,8 +160,8 @@ ScHFEditActiveDlg::ScHFEditActiveDlg(
if ( bRightPage )
{
AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "header", ScRightHeaderEditPage::Create );
AddTabPage( "footer", ScRightFooterEditPage::Create );
}
else
{
@ -170,16 +170,16 @@ ScHFEditActiveDlg::ScHFEditActiveDlg(
bool bShareHeader = rCoreSet.Get(ATTR_PAGE_HEADERSET).GetItemSet().
Get(ATTR_PAGE_SHARED).GetValue();
if ( bShareHeader )
AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "header", ScRightHeaderEditPage::Create );
else
AddTabPage( "header", ScLeftHeaderEditPage::Create, nullptr );
AddTabPage( "header", ScLeftHeaderEditPage::Create );
bool bShareFooter = rCoreSet.Get(ATTR_PAGE_FOOTERSET).GetItemSet().
Get(ATTR_PAGE_SHARED).GetValue();
if ( bShareFooter )
AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footer", ScRightFooterEditPage::Create );
else
AddTabPage( "footer", ScLeftFooterEditPage::Create, nullptr );
AddTabPage( "footer", ScLeftFooterEditPage::Create );
}
}

10
sfx2/source/dialog/dinfdlg.cxx
View File

@ -1165,11 +1165,11 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent,
SetText( aTitle );
// Property Pages
m_nDocInfoId = AddTabPage("general", SfxDocumentPage::Create, nullptr);
AddTabPage("description", SfxDocumentDescPage::Create, nullptr);
AddTabPage("customprops", SfxCustomPropertiesPage::Create, nullptr);
AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, nullptr);
AddTabPage("security", SfxSecurityPage::Create, nullptr);
m_nDocInfoId = AddTabPage("general", SfxDocumentPage::Create);
AddTabPage("description", SfxDocumentDescPage::Create);
AddTabPage("customprops", SfxCustomPropertiesPage::Create);
AddTabPage("cmisprops", SfxCmisPropertiesPage::Create);
AddTabPage("security", SfxSecurityPage::Create);
}

11
sfx2/source/dialog/tabdlg.cxx
View File

@ -379,9 +379,8 @@ SfxTabDialog::SfxTabDialog
(
vcl::Window* pParent, // Parent Window
const OUString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path
const SfxItemSet* pItemSet, // Itemset with the data;
const SfxItemSet* pItemSet // Itemset with the data;
// can be NULL, when Pages are onDemand
bool bEditFmt // when yes -> additional Button for standard
)
: TabDialog(pParent, rID, rUIXMLDescription)
, m_pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr)
@ -389,7 +388,7 @@ SfxTabDialog::SfxTabDialog
, m_bStandardPushed(false)
, m_pExampleSet(nullptr)
{
Init_Impl(bEditFmt);
Init_Impl(/*bEditFmt*/false);
sal_uInt16 nPageCount = m_pTabCtrl->GetPageCount();
for (sal_uInt16 nPage = 0; nPage < nPageCount; ++nPage)
@ -622,13 +621,11 @@ void SfxTabDialog::Start_Impl()
sal_uInt16 SfxTabDialog::AddTabPage
(
const OString &rName, // Page ID
CreateTabPage pCreateFunc, // Pointer to the Factory Method
GetTabPageRanges pRangesFunc // Pointer to the Method for querying
// Ranges onDemand
CreateTabPage pCreateFunc // Pointer to the Factory Method
)
{
sal_uInt16 nId = m_pTabCtrl->GetPageId(rName);
m_pImpl->aData.push_back(new Data_Impl(nId, rName, pCreateFunc, pRangesFunc));
m_pImpl->aData.push_back(new Data_Impl(nId, rName, pCreateFunc, nullptr));
return nId;
}

12
svtools/source/brwbox/brwbox2.cxx
View File

@ -751,7 +751,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->DrawRect( aRect );
}
ImplPaintData( *pDev, tools::Rectangle( aRealPos, aRealSize ), true, /*bDrawSelection*/true );
ImplPaintData( *pDev, tools::Rectangle( aRealPos, aRealSize ), true );
// restore the column widths/data row height
nDataRowHeight = nOriginalHeight;
@ -771,7 +771,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
}
void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections)
void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice)
{
Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0);
Size aOverallAreaSize = _bForeignDevice ? _rRect.GetSize() : pDataWin->GetOutputSizePixel();
@ -828,8 +828,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
tools::Rectangle aRowRect( Point( _rRect.TopLeft().X(), aPos.Y() ),
Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
bool bRowSelected = _bDrawSelections
&& !bHideSelect
bool bRowSelected = !bHideSelect
&& IsRowSelected( nRow );
if ( bRowSelected )
{
@ -865,8 +864,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
}
// prepare Column-AutoHighlight
bool bColAutoHighlight = _bDrawSelections
&& bColumnCursor
bool bColAutoHighlight = bColumnCursor
&& IsColumnSelected( pCol->GetId() );
if ( bColAutoHighlight )
{
@ -1027,7 +1025,7 @@ void BrowseBox::PaintData( vcl::Window const & rWin, vcl::RenderContext& rRender
Resize();
// MI: who was that? Window::Update();
ImplPaintData(rRenderContext, rRect, false, true);
ImplPaintData(rRenderContext, rRect, false);
}
void BrowseBox::UpdateScrollbars()

1
svtools/source/contnr/imivctl.hxx
View File

@ -317,7 +317,6 @@ public:
tools::Rectangle CalcTextRect(
SvxIconChoiceCtrlEntry*,
const Point* pPos = nullptr,
bool bForInplaceEdit = false,
const OUString* pStr = nullptr
);

24
svtools/source/contnr/imivctl1.cxx
View File

@ -1473,7 +1473,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry));
tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, false, &aEntryText));
tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, &aEntryText));
tools::Rectangle aBmpRect(CalcBmpRect(pEntry, &rPos));
bool bShowSelection = (bSelected && (eSelectionMode != SelectionMode::NONE));
@ -1673,7 +1673,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pE
}
tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry,
const Point* pEntryPos, bool bEdit, const OUString* pStr )
const Point* pEntryPos, const OUString* pStr )
{
OUString aEntryText;
if( !pStr )
@ -1687,7 +1687,6 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
aBound.SetPos( *pEntryPos );
tools::Rectangle aTextRect( aMaxTextRect );
if( !bEdit )
aTextRect = pView->GetTextRect( aTextRect, aEntryText, nCurTextDrawFlags );
Size aTextSize( aTextRect.GetSize() );
@ -1701,23 +1700,6 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
case WB_ICON:
aPos.AdjustY(aImageSize.Height() );
aPos.AdjustY(VER_DIST_BMP_STRING );
// at little more space when editing
if( bEdit )
{
// +20%
long nMinWidth = (( (aImageSize.Width()*10) / 100 ) * 2 ) +
aImageSize.Width();
if( nMinWidth > nBoundWidth )
nMinWidth = nBoundWidth;
if( aTextSize.Width() < nMinWidth )
aTextSize.setWidth( nMinWidth );
// when editing, overlap with the area below is allowed
Size aOptSize = aMaxTextRect.GetSize();
if( aOptSize.Height() > aTextSize.Height() )
aTextSize.setHeight( aOptSize.Height() );
}
aPos.AdjustX((nBoundWidth - aTextSize.Width()) / 2 );
break;
@ -2886,7 +2868,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
OUString sQuickHelpText = pEntry->GetQuickHelpText();
OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) );
tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, false, &aEntryText ) );
tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, &aEntryText ) );
if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
return false;

18
sw/source/ui/dialog/uiregionsw.cxx
View File

@ -1409,11 +1409,11 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
, rWrtSh(rSh)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
m_nSectionPageId = AddTabPage("section", SwInsertSectionTabPage::Create, nullptr);
m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create, nullptr);
m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr);
m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
m_nSectionPageId = AddTabPage("section", SwInsertSectionTabPage::Create);
m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create);
m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ));
m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create);
m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create);
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = rHtmlOpt.GetExportMode();
@ -2057,10 +2057,10 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
, rWrtSh(rSh)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create, nullptr);
m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr );
m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create);
m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ) );
m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create);
m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create);
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = rHtmlOpt.GetExportMode();

12
sw/source/ui/fldui/fldtdlg.cxx
View File

@ -65,14 +65,14 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa
GetOKButton().SetClickHdl(LINK(this, SwFieldDlg, OKHdl));
m_nDokId = AddTabPage("document", SwFieldDokPage::Create, nullptr);
m_nVarId = AddTabPage("variables", SwFieldVarPage::Create, nullptr);
m_nDokInf = AddTabPage("docinfo", SwFieldDokInfPage::Create, nullptr);
m_nDokId = AddTabPage("document", SwFieldDokPage::Create);
m_nVarId = AddTabPage("variables", SwFieldVarPage::Create);
m_nDokInf = AddTabPage("docinfo", SwFieldDokInfPage::Create);
if (!m_bHtmlMode)
{
m_nRefId = AddTabPage("ref", SwFieldRefPage::Create, nullptr);
m_nFuncId = AddTabPage("functions", SwFieldFuncPage::Create, nullptr);
m_nRefId = AddTabPage("ref", SwFieldRefPage::Create);
m_nFuncId = AddTabPage("functions", SwFieldFuncPage::Create);
utl::OConfigurationTreeRoot aCfgRoot
= utl::OConfigurationTreeRoot::createWithComponentContext(
@ -87,7 +87,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa
OUString("DatabaseFields")) >>= bDatabaseFields;
if (bDatabaseFields)
m_nDbId = AddTabPage("database", SwFieldDBPage::Create, nullptr);
m_nDbId = AddTabPage("database", SwFieldDBPage::Create);
else
#endif
RemoveTabPage("database");

10
sw/source/ui/index/cnttab.cxx
View File

@ -289,11 +289,11 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
}
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
m_nSelectId = AddTabPage("index", SwTOXSelectTabPage::Create, nullptr);
AddTabPage("styles", SwTOXStylesTabPage::Create, nullptr);
m_nColumnId = AddTabPage("columns", SwColumnPage::Create, nullptr);
m_nBackGroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr);
m_nEntriesId = AddTabPage("entries", SwTOXEntryTabPage::Create, nullptr);
m_nSelectId = AddTabPage("index", SwTOXSelectTabPage::Create);
AddTabPage("styles", SwTOXStylesTabPage::Create);
m_nColumnId = AddTabPage("columns", SwColumnPage::Create);
m_nBackGroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ));
m_nEntriesId = AddTabPage("entries", SwTOXEntryTabPage::Create);
if(!pCurTOX)
SetCurPageId(m_nSelectId);

2
vcl/inc/printdlg.hxx
View File

@ -227,7 +227,7 @@ namespace vcl
css::beans::PropertyValue* getValueForWindow( vcl::Window* ) const;
void preparePreview( bool i_bPrintChanged = true, bool i_bMayUseCache = false );
void preparePreview( bool i_bMayUseCache );
void setupPaperSidesBox();
void storeToSettings();
void readFromSettings();

20
vcl/source/gdi/bitmap3.cxx
View File

@ -888,23 +888,13 @@ void Bitmap::AdaptBitCount(Bitmap& rNew) const
}
}
bool Bitmap::Dither( BmpDitherFlags nDitherFlags )
{
bool bRet = false;
const Size aSizePix( GetSizePixel() );
if( aSizePix.Width() == 1 || aSizePix.Height() == 1 )
bRet = true;
else if( nDitherFlags & BmpDitherFlags::Floyd )
bRet = ImplDitherFloyd();
return bRet;
}
bool Bitmap::ImplDitherFloyd()
bool Bitmap::Dither()
{
const Size aSize( GetSizePixel() );
if( aSize.Width() == 1 || aSize.Height() == 1 )
return true;
bool bRet = false;
if( ( aSize.Width() > 3 ) && ( aSize.Height() > 2 ) )

32
vcl/source/window/printdlg.cxx
View File

@ -943,7 +943,7 @@ void PrintDialog::setPreviewText()
mpNumPagesText->SetText( aNewText );
}
void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
void PrintDialog::preparePreview( bool i_bMayUseCache )
{
VclPtr<Printer> aPrt( maPController->getPrinter() );
Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) );
@ -979,8 +979,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
if( mnCurPage < 0 )
mnCurPage = 0;
if( i_bNewPage )
{
const MapMode aMapMode( MapUnit::Map100thMM );
if( nPages > 0 )
{
@ -1003,7 +1002,6 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
mpForwardBtn->Enable( mnCurPage < nPages-1 );
mpBackwardBtn->Enable( mnCurPage != 0 );
mpPageEdit->Enable( nPages > 1 );
}
}
void PrintDialog::updateOrientationBox( const bool bAutomatic )
@ -1199,7 +1197,7 @@ void PrintDialog::updateNup( bool i_bMayUseCache )
mpNupOrderWin->setValues( aMPS.nOrder, nCols, nRows );
preparePreview( true, i_bMayUseCache );
preparePreview( i_bMayUseCache );
}
void PrintDialog::updateNupFromPages( bool i_bMayUseCache )
@ -1851,7 +1849,7 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, void )
}
else if ( pButton == mpPreviewBox )
{
preparePreview( true, true );
preparePreview( true );
}
else if( pButton == mpForwardBtn )
{
@ -1872,7 +1870,7 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, void )
checkOptionalControlDependencies();
// update preview and page settings
preparePreview();
preparePreview(false);
}
if( mpBrochureBtn->IsChecked() )
{
@ -1903,7 +1901,7 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, void )
maPController->setReversePrint( bChecked );
maPController->setValue( "PrintReverse",
makeAny( bChecked ) );
preparePreview( true, true );
preparePreview( true );
}
else if( pButton == mpBorderCB )
{
@ -1942,7 +1940,7 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, void )
updateOrientationBox( false );
// tdf#63905 don't use cache: page size may change
preparePreview();
preparePreview(false);
}
checkControlDependencies();
}
@ -1966,7 +1964,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void )
mpOKButton->SetText( maPrintText );
updatePrinterText();
setPaperSizes();
preparePreview();
preparePreview(false);
}
else // print to file
{
@ -1977,7 +1975,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void )
setPaperSizes();
updateOrientationBox();
preparePreview( true, true );
preparePreview( true );
}
setupPaperSidesBox();
@ -2021,7 +2019,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void )
checkPaperSize( aPaperSize );
maPController->setPaperSizeFromUser( aPaperSize );
preparePreview();
preparePreview(false);
}
}
@ -2037,7 +2035,7 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit&, rEdit, void )
else if( &rEdit == mpPageEdit )
{
mnCurPage = sal_Int32( mpPageEdit->GetValue() - 1 );
preparePreview( true, true );
preparePreview( true );
}
else if( &rEdit == mpCopyCountField )
{
@ -2061,7 +2059,7 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void )
checkOptionalControlDependencies();
// update preview and page settings
preparePreview();
preparePreview(false);
}
}
@ -2090,7 +2088,7 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void )
checkOptionalControlDependencies();
// update preview and page settings
preparePreview();
preparePreview(false);
}
}
}
@ -2116,7 +2114,7 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void )
checkOptionalControlDependencies();
// update preview and page settings
preparePreview();
preparePreview(false);
}
}
@ -2148,7 +2146,7 @@ IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit&, i_rBox, void )
checkOptionalControlDependencies();
// update preview and page settings
preparePreview();
preparePreview(false);
}
}

2
vcl/unx/generic/dtrans/bmp.cxx
View File

@ -743,7 +743,7 @@ css::uno::Sequence<sal_Int8> x11::convertBitmapDepth(
Bitmap bm;
ReadDIB(bm, in, true);
if (bm.GetBitCount() == 24 && depth <= 8) {
bm.Dither(BmpDitherFlags::Floyd);
bm.Dither();
}
if (bm.GetBitCount() != depth) {
switch (depth) {