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

loplugin:singlevalfields improvement

Browse Source 
look for any kind of types, not just POD types, helps to find
smart pointer fields that are only assigned nullptr

Change-Id: I2d887e98db012f03b646e1023985bcc196285abc
Reviewed-on: https://gerrit.libreoffice.org/62382
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-10-26 08:37:40 +02:00
parent 4bf2052e9d
commit c0cc59adca
29 changed files with 349 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
basic/source/inc/scriptcont.hxx
View File

@ -32,7 +32,6 @@ namespace basic
class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword
{
OUString maScriptLanguage;
css::uno::Reference< css::container::XNameAccess > mxCodeNameAccess;
// Methods to distinguish between different library types

4
basic/source/uno/scriptcont.cxx
View File

@ -105,14 +105,12 @@ void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName
// Ctor for service
SfxScriptLibraryContainer::SfxScriptLibraryContainer()
:maScriptLanguage( "StarBasic" )
{
// all initialisation has to be done
// by calling XInitialization::initialize
}
SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embed::XStorage >& xStorage )
:maScriptLanguage( "StarBasic" )
{
init( OUString(), xStorage );
}
@ -163,7 +161,7 @@ void SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameCont
xmlscript::ModuleDescriptor aMod;
aMod.aName = aElementName;
aMod.aLanguage = maScriptLanguage;
aMod.aLanguage = "StarBasic";
Any aElement = xLib->getByName( aElementName );
aElement >>= aMod.aCode;

2
canvas/source/opengl/ogl_spritedevicehelper.cxx
View File

@ -77,7 +77,6 @@ namespace oglcanvas
{
SpriteDeviceHelper::SpriteDeviceHelper() :
mpDevice(nullptr),
mpSpriteCanvas(nullptr),
maActiveSprites(),
maLastUpdate(),
@ -138,7 +137,6 @@ namespace oglcanvas
{
// release all references
mpSpriteCanvas = nullptr;
mpDevice = nullptr;
mpTextureCache.reset();
if( mxContext->isInitialized() )

8
canvas/source/opengl/ogl_spritedevicehelper.hxx
View File

@ -115,14 +115,6 @@ namespace oglcanvas
bool activateWindowContext();
private:
/** Phyical output device
Deliberately not a refcounted reference, because of
potential circular references for canvas. Needed to
create bitmaps
*/
css::rendering::XGraphicDevice* mpDevice;
/// Pointer to sprite canvas (owner of this helper), needed to create bitmaps
SpriteCanvas* mpSpriteCanvas;

12
compilerplugins/clang/singlevalfields.could-be-bool.results
View File

@ -7,9 +7,6 @@ connectivity/source/inc/dbase/dindexnode.hxx:125
filter/source/graphicfilter/eps/eps.cxx:139
PSWriter nNextChrSetId
sal_uInt8
include/vcl/split.hxx:40
Splitter mbInKeyEvent
long
sal/rtl/cipher.cxx:110
Cipher_Impl m_algorithm
rtlCipherAlgorithm
@ -34,12 +31,6 @@ sc/source/ui/vba/vbahyperlink.hxx:82
soltools/cpp/cpp.h:121
includelist always
char
svl/source/numbers/zforfind.hxx:111
ImpSvNumberInputScan nNegCheck
short
svl/source/numbers/zforfind.hxx:115
ImpSvNumberInputScan mnEra
sal_Int16
svx/source/inc/cell.hxx:205
sdr::table::Cell mnCellContentType
css::table::CellContentType
@ -55,6 +46,9 @@ sw/source/filter/ww8/ww8scan.hxx:65
vcl/inc/canvasbitmap.hxx:57
vcl::unotools::VclCanvasBitmap m_nEndianness
sal_Int8
vcl/inc/printdlg.hxx:151
vcl::PrintDialog::JobTabPage mnCollateUIMode
long
vcl/inc/unx/i18n_ic.hxx:33
SalI18N_InputContext mbUseable
int

60
compilerplugins/clang/singlevalfields.cxx
View File

@ -103,7 +103,6 @@ public:
private:
void niceName(const FieldDecl*, MyFieldInfo&);
std::string getExprValue(const Expr*);
bool isInterestingType(const QualType&);
const FunctionDecl* get_top_FunctionDecl_from_Stmt(const Stmt&);
void checkCallExpr(const Stmt* child, const CallExpr* callExpr, std::string& assignValue, bool& bPotentiallyAssignedTo);
void markAllFields(const RecordDecl* recordDecl);
@ -127,8 +126,7 @@ bool SingleValFields::VisitFieldDecl( const FieldDecl* fieldDecl )
const FieldDecl* canonicalDecl = fieldDecl;
if( ignoreLocation( fieldDecl )
|| isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation()))
|| !isInterestingType(fieldDecl->getType()) )
|| isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation())) )
return true;
MyFieldInfo aInfo;
@ -150,11 +148,17 @@ bool SingleValFields::VisitCXXConstructorDecl( const CXXConstructorDecl* decl )
{
const CXXCtorInitializer* init = *it;
const FieldDecl* fieldDecl = init->getMember();
if( !fieldDecl || !isInterestingType(fieldDecl->getType()) )
if( !fieldDecl )
continue;
MyFieldAssignmentInfo aInfo;
niceName(fieldDecl, aInfo);
aInfo.value = getExprValue(init->getInit());
const Expr * expr = init->getInit();
// unwrap any single-arg constructors, this helps to find smart pointers
// that are only assigned nullptr
if (auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(expr))
if (cxxConstructExpr->getNumArgs() == 1)
expr = cxxConstructExpr->getArg(0);
aInfo.value = getExprValue(expr);
assignedSet.insert(aInfo);
}
return true;
@ -193,15 +197,10 @@ void SingleValFields::markAllFields(const RecordDecl* recordDecl)
for(auto fieldDecl = recordDecl->field_begin();
fieldDecl != recordDecl->field_end(); ++fieldDecl)
{
if (isInterestingType(fieldDecl->getType())) {
MyFieldAssignmentInfo aInfo;
niceName(*fieldDecl, aInfo);
aInfo.value = "?";
assignedSet.insert(aInfo);
}
else if (fieldDecl->getType()->isRecordType()) {
markAllFields(fieldDecl->getType()->getAs<RecordType>()->getDecl());
}
MyFieldAssignmentInfo aInfo;
niceName(*fieldDecl, aInfo);
aInfo.value = "?";
assignedSet.insert(aInfo);
}
const CXXRecordDecl* cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl);
if (!cxxRecordDecl || !cxxRecordDecl->hasDefinition()) {
@ -244,7 +243,7 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* memberExpr )
return true;
}
if (ignoreLocation(memberExpr) || !isInterestingType(fieldDecl->getType()))
if (ignoreLocation(memberExpr))
return true;
const FunctionDecl* parentFunction = getParentFunctionDecl(memberExpr);
@ -315,9 +314,9 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* memberExpr )
// cannot be assigned to anymore
break;
}
else if (isa<CallExpr>(parent))
else if (auto callExpr = dyn_cast<CallExpr>(parent))
{
checkCallExpr(child, dyn_cast<CallExpr>(parent), assignValue, bPotentiallyAssignedTo);
checkCallExpr(child, callExpr, assignValue, bPotentiallyAssignedTo);
break;
}
else if (isa<CXXConstructExpr>(parent))
@ -413,22 +412,30 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* memberExpr )
return true;
}
bool SingleValFields::isInterestingType(const QualType& qt) {
return qt.isCXX11PODType(compiler.getASTContext());
}
void SingleValFields::checkCallExpr(const Stmt* child, const CallExpr* callExpr, std::string& assignValue, bool& bPotentiallyAssignedTo)
{
if (callExpr->getCallee() == child) {
return;
}
const FunctionDecl* functionDecl;
if (isa<CXXMemberCallExpr>(callExpr)) {
functionDecl = dyn_cast<CXXMemberCallExpr>(callExpr)->getMethodDecl();
if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(callExpr)) {
functionDecl = memberCallExpr->getMethodDecl();
} else {
functionDecl = callExpr->getDirectCallee();
}
if (functionDecl) {
if (auto operatorCallExpr = dyn_cast<CXXOperatorCallExpr>(callExpr)) {
if (operatorCallExpr->getArg(0) == child) {
const CXXMethodDecl* calleeMethodDecl = dyn_cast_or_null<CXXMethodDecl>(operatorCallExpr->getDirectCallee());
if (calleeMethodDecl) {
if (operatorCallExpr->getOperator() == OO_Equal) {
assignValue = getExprValue(operatorCallExpr->getArg(1));
bPotentiallyAssignedTo = true;
return;
}
}
}
}
for (unsigned i = 0; i < callExpr->getNumArgs(); ++i) {
if (i >= functionDecl->getNumParams()) // can happen in template code
break;
@ -484,6 +491,13 @@ std::string SingleValFields::getExprValue(const Expr* arg)
return "?";
if (arg->isValueDependent())
return "?";
// ParenListExpr containing a CXXNullPtrLiteralExpr and has a NULL type pointer
if (auto parenListExpr = dyn_cast<ParenListExpr>(arg))
{
if (parenListExpr->getNumExprs() == 1)
return getExprValue(parenListExpr->getExpr(0));
return "?";
}
if (auto constructExpr = dyn_cast<CXXConstructExpr>(arg))
{
if (constructExpr->getNumArgs() >= 1

488
compilerplugins/clang/singlevalfields.results
View File

@ -1,63 +1,126 @@
accessibility/inc/standard/vclxaccessiblebox.hxx:160
VCLXAccessibleBox m_nIndexInParent
-1
chart2/source/controller/inc/dlg_CreationWizard.hxx:68
chart::CreationWizard m_nLastState
3
chart2/source/controller/inc/SeriesOptionsItemConverter.hxx:65
chart::wrapper::SeriesOptionsItemConverter m_nAllSeriesAxisIndex
-1
basic/source/inc/scriptcont.hxx:35
basic::SfxScriptLibraryContainer maScriptLanguage
StarBasic
basic/source/runtime/methods.cxx:3430
(anonymous namespace)::RandomNumberGenerator global_rng
5489
binaryurp/source/writerstate.hxx:41
binaryurp::WriterState typeCache
256
binaryurp/source/writerstate.hxx:43
binaryurp::WriterState oidCache
256
binaryurp/source/writerstate.hxx:45
binaryurp::WriterState tidCache
256
bridges/inc/bridge.hxx:90
bridges::cpp_uno::shared::Bridge nRef
1
bridges/inc/cppinterfaceproxy.hxx:90
bridges::cpp_uno::shared::CppInterfaceProxy nRef
1
bridges/inc/unointerfaceproxy.hxx:86
bridges::cpp_uno::shared::UnoInterfaceProxy nRef
1
bridges/source/jni_uno/jni_bridge.h:53
jni_uno::Bridge m_ref
1
canvas/source/opengl/ogl_spritedevicehelper.hxx:124
oglcanvas::SpriteDeviceHelper mpDevice
0
chart2/source/controller/inc/TitleDialogData.hxx:34
chart::TitleDialogData aPossibilityList
7
chart2/source/controller/inc/TitleDialogData.hxx:35
chart::TitleDialogData aExistenceList
7
chart2/source/controller/inc/TitleDialogData.hxx:36
chart::TitleDialogData aTextList
7
chart2/source/model/main/DataPoint.hxx:108
chart::DataPoint m_bNoParentPropAllowed
0
chart2/source/view/charttypes/BubbleChart.hxx:56
chart::BubbleChart m_fBubbleSizeScaling
1
connectivity/source/drivers/mork/MErrorResource.hxx:31
connectivity::mork::ErrorDescriptor m_nErrorCondition
0
comphelper/source/misc/random.cxx:42
comphelper::rng::RandomNumberGenerator global_rng
5489
connectivity/source/inc/dbase/DIndexIter.hxx:36
connectivity::dbase::OIndexIterator m_pOperator
0
connectivity/source/inc/dbase/DIndexIter.hxx:37
connectivity::dbase::OIndexIterator m_pOperand
0
connectivity/source/inc/OColumn.hxx:41
connectivity::OColumn m_AutoIncrement
0
connectivity/source/inc/OColumn.hxx:42
connectivity::OColumn m_CaseSensitive
0
connectivity/source/inc/OColumn.hxx:43
connectivity::OColumn m_Searchable
1
connectivity/source/inc/OColumn.hxx:44
connectivity::OColumn m_Currency
0
connectivity/source/inc/OColumn.hxx:45
connectivity::OColumn m_Signed
0
connectivity/source/inc/OColumn.hxx:46
connectivity::OColumn m_ReadOnly
1
connectivity/source/inc/OColumn.hxx:47
connectivity::OColumn m_Writable
0
connectivity/source/inc/OColumn.hxx:48
connectivity::OColumn m_DefinitelyWritable
0
connectivity/source/inc/writer/WTable.hxx:69
connectivity::writer::OWriterTable m_nStartCol
0
cppcanvas/source/mtfrenderer/emfpregion.hxx:32
cppcanvas::internal::EMFPRegion iw
0
cppcanvas/source/mtfrenderer/emfpregion.hxx:32
cppcanvas::internal::EMFPRegion ih
0
cppcanvas/source/mtfrenderer/emfpregion.hxx:32
cppcanvas::internal::EMFPRegion ix
0
cppcanvas/source/mtfrenderer/emfpregion.hxx:32
cppcanvas::internal::EMFPRegion iy
cui/source/options/optgdlg.cxx:1096
LanguageConfig_Impl aLanguageOptions
0
desktop/source/app/cmdlineargs.hxx:137
desktop::CommandLineArgs m_quickstart
0
emfio/inc/mtftools.hxx:487
emfio::MtfTools meLatestRasterOp
4
filter/source/graphicfilter/icgm/cgm.hxx:47
CGM mnOutdx
28000
filter/source/graphicfilter/icgm/cgm.hxx:48
CGM mnOutdy
21000
filter/source/graphicfilter/icgm/elements.hxx:67
CGMElements eColorModel
0
filter/source/graphicfilter/idxf/dxfvec.hxx:31
DXFLineInfo fWidth
0
editeng/source/editeng/eertfpar.hxx:34
EditRTFParser aRTFMapMode
9
filter/source/msfilter/viscache.hxx:31
Impl_OlePres nFormat
3
framework/source/uiconfiguration/imagemanagerimpl.hxx:182
framework::ImageManagerImpl m_aResourceString
private:resource/images/moduleimages
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:213
(anonymous namespace)::ModuleUIConfigurationManager m_aPropResourceURL
ResourceURL
framework/source/uiconfiguration/uiconfigurationmanager.cxx:191
(anonymous namespace)::UIConfigurationManager m_aPropResourceURL
ResourceURL
framework/source/uielement/uicommanddescription.cxx:141
framework::ConfigurationAccess_UICommand m_aPropLabel
Label
framework/source/uielement/uicommanddescription.cxx:142
framework::ConfigurationAccess_UICommand m_aPropName
Name
framework/source/uielement/uicommanddescription.cxx:143
framework::ConfigurationAccess_UICommand m_aPropPopup
Popup
framework/source/uielement/uicommanddescription.cxx:144
framework::ConfigurationAccess_UICommand m_aPropPopupLabel
PopupLabel
framework/source/uielement/uicommanddescription.cxx:145
framework::ConfigurationAccess_UICommand m_aPropTooltipLabel
TooltipLabel
framework/source/uielement/uicommanddescription.cxx:146
framework::ConfigurationAccess_UICommand m_aPropTargetURL
TargetURL
framework/source/uielement/uicommanddescription.cxx:147
framework::ConfigurationAccess_UICommand m_aPropIsExperimental
IsExperimental
helpcompiler/inc/BasCodeTagger.hxx:35
BasicCodeTagger m_Highlighter
0
include/basegfx/pixel/bpixel.hxx:43
basegfx::BPixel::(anonymous union)::(anonymous) mnValue
0
@ -71,20 +134,17 @@ include/canvas/rendering/irendermodule.hxx:40
canvas::Vertex g
1
include/canvas/rendering/irendermodule.hxx:40
canvas::Vertex b
canvas::Vertex r
1
include/canvas/rendering/irendermodule.hxx:40
canvas::Vertex r
canvas::Vertex b
1
include/canvas/rendering/irendermodule.hxx:42
canvas::Vertex z
0
include/editeng/svxacorr.hxx:247
SvxAutoCorrect cEnDash
8211
include/editeng/svxacorr.hxx:247
SvxAutoCorrect cEmDash
8212
include/connectivity/sqlparse.hxx:139
connectivity::OSQLParser m_pParseTree
0
include/editeng/swafopt.hxx:58
editeng::SortedAutoCompleteStrings owning_
1
@ -100,6 +160,9 @@ include/filter/msfilter/dffpropset.hxx:35
include/i18nutil/casefolding.hxx:57
i18nutil::Mapping nmap
0
include/o3tl/cow_wrapper.hxx:198
o3tl::cow_wrapper::impl_t m_ref_count
1
include/o3tl/vector_pool.hxx:93
o3tl::detail::struct_from_value::type nextFree
-1
@ -109,8 +172,8 @@ include/oox/core/contexthandler2.hxx:220
include/oox/dump/dumperbase.hxx:1683
oox::dump::RecordObjectBase mbBinaryOnly
0
include/svtools/ctrlbox.hxx:455
FontSizeBox bRelativeMode
include/svtools/ctrlbox.hxx:448
FontSizeBox bRelative
0
include/svtools/svparser.hxx:74
SvParser::TokenStackType nTokenValue
@ -118,180 +181,168 @@ include/svtools/svparser.hxx:74
include/svtools/svparser.hxx:75
SvParser::TokenStackType bTokenHasValue
0
include/tools/b3dtrans.hxx:62
B3dTransformationSet mfNearBound
0.001
include/tools/b3dtrans.hxx:63
B3dTransformationSet mfFarBound
1.0009999999999999
include/vcl/filter/pdfdocument.hxx:200
vcl::filter::PDFNameElement m_nLength
include/svx/ctredlin.hxx:122
SvxRedlinTable aDaTiFirst
0
include/svx/ctredlin.hxx:123
SvxRedlinTable aDaTiLast
0
include/svx/deflt3d.hxx:40
E3dDefaultAttributes bDefaultCubePosIsCenter
0
include/svx/deflt3d.hxx:47
E3dDefaultAttributes bDefaultLatheSmoothed
1
include/svx/deflt3d.hxx:48
E3dDefaultAttributes bDefaultLatheSmoothFrontBack
0
include/svx/deflt3d.hxx:50
E3dDefaultAttributes bDefaultLatheCloseFront
1
include/svx/deflt3d.hxx:51
E3dDefaultAttributes bDefaultLatheCloseBack
1
include/svx/deflt3d.hxx:54
E3dDefaultAttributes bDefaultExtrudeSmoothed
1
include/svx/deflt3d.hxx:55
E3dDefaultAttributes bDefaultExtrudeSmoothFrontBack
0
include/svx/dialcontrol.hxx:110
svx::DialControl::DialControl_Impl mpLinkField
0
include/svx/dialcontrol.hxx:111
svx::DialControl::DialControl_Impl mnLinkedFieldValueMultiplyer
0
include/svx/dialcontrol.hxx:115
svx::DialControl::DialControl_Impl mnInitialAngle
0
include/svx/dialcontrol.hxx:119
svx::DialControl::DialControl_Impl mbNoRot
0
include/svx/svdmark.hxx:144
SdrMarkList mbPointNameOk
0
include/svx/svdmark.hxx:145
SdrMarkList mbGluePointNameOk
0
include/test/beans/xpropertyset.hxx:56
apitest::XPropertySet maPropsToTest
1
include/vcl/opengl/OpenGLContext.hxx:57
OpenGLCapabilitySwitch mbLimitedShaderRegisters
0
include/vcl/slider.hxx:39
Slider mnChannelPixOffset
0
include/vcl/slider.hxx:51
Slider mbFullDrag
1
include/vcl/status.hxx:78
StatusBar mbVisibleItems
1
libreofficekit/source/gtk/lokdocview.cxx:84
LOKDocViewPrivateImpl m_bIsLoading
0
linguistic/source/dlistimp.cxx:78
DicEvtListenerHelper nNumVerboseListeners
0
lotuswordpro/inc/xfilter/xfborders.hxx:119
XFBorder m_fOffset
0
lotuswordpro/inc/xfilter/xfcellstyle.hxx:140
XFCellStyle m_fTextIndent
0
lotuswordpro/inc/xfilter/xfcellstyle.hxx:148
XFCellStyle m_bWrapText
0
lotuswordpro/inc/xfilter/xfdrawstyle.hxx:125
XFDrawStyle m_eWrap
0
lotuswordpro/inc/xfilter/xffont.hxx:245
XFFont m_eRelief
0
lotuswordpro/inc/xfilter/xffont.hxx:247
XFFont m_eEmphasize
0
lotuswordpro/inc/xfilter/xffont.hxx:249
XFFont m_bEmphasizeTop
1
lotuswordpro/inc/xfilter/xffont.hxx:250
XFFont m_bOutline
0
lotuswordpro/inc/xfilter/xffont.hxx:251
XFFont m_bShadow
0
lotuswordpro/inc/xfilter/xffont.hxx:252
XFFont m_bBlink
0
lotuswordpro/inc/xfilter/xffont.hxx:255
XFFont m_fCharSpace
0
lotuswordpro/inc/xfilter/xffont.hxx:256
XFFont m_nWidthScale
100
lotuswordpro/inc/xfilter/xfnumberstyle.hxx:103
XFNumberStyle m_nMinInteger
1
lotuswordpro/inc/xfilter/xfnumberstyle.hxx:104
XFNumberStyle m_nMinExponent
2
lotuswordpro/inc/xfilter/xfnumberstyle.hxx:107
XFNumberStyle m_bCurrencySymbolPost
0
lotuswordpro/inc/xfilter/xfparastyle.hxx:224
XFParaStyle m_eLastLineAlign
0
lotuswordpro/inc/xfilter/xfparastyle.hxx:225
XFParaStyle m_bJustSingleWord
0
lotuswordpro/inc/xfilter/xfparastyle.hxx:226
XFParaStyle m_bKeepWithNext
0
lotuswordpro/inc/xfilter/xfparastyle.hxx:240
XFParaStyle m_nPageNumber
0
lotuswordpro/inc/xfilter/xfparastyle.hxx:241
XFParaStyle m_bNumberLines
1
lotuswordpro/inc/xfilter/xfparastyle.hxx:242
XFParaStyle m_nLineNumberRestart
0
opencl/source/opencl_device.cxx:54
(anonymous namespace)::LibreOfficeDeviceEvaluationIO inputSize
15360
opencl/source/opencl_device.cxx:55
(anonymous namespace)::LibreOfficeDeviceEvaluationIO outputSize
15360
package/inc/ZipFile.hxx:61
ZipFile aInflater
1
package/source/zipapi/XUnbufferedStream.hxx:57
XUnbufferedStream maInflater
1
pyuno/source/module/pyuno_impl.hxx:312
pyuno::RuntimeCargo valid
1
sal/osl/unx/signal.cxx:82
(anonymous namespace)::SignalAction Action
1
sal/qa/osl/process/osl_Thread.cxx:214
myThread m_aFlag
0
sal/qa/osl/process/osl_Thread.cxx:254
OCountThread m_aFlag
0
sal/qa/osl/process/osl_Thread.cxx:318
ONoScheduleThread m_aFlag
0
sal/qa/osl/process/osl_Thread.cxx:359
OAddThread m_aFlag
0
sc/inc/compiler.hxx:111
ScRawToken::(anonymous union)::(anonymous) eInForceArray
0
sc/inc/rangenam.hxx:84
ScRangeData mnMaxRow
-1
sc/inc/rangenam.hxx:85
ScRangeData mnMaxCol
-1
sc/inc/listenercontext.hxx:47
sc::EndListeningContext maSet
0
sc/inc/markmulti.hxx:79
ScMultiSelIter aMarkArrayIter
0
sc/inc/refdata.hxx:37
ScSingleRefData::(anonymous) mnFlagValue
0
sc/inc/table.hxx:178
ScTable mpRowHeights
0
sc/qa/unit/ucalc.hxx:41
Test::RangeNameDef mnIndex
1
sc/source/core/tool/interpr8.cxx:99
ScETSForecastCalculation cfMinABCResolution
0.001
sc/source/filter/inc/formel.hxx:82
ConverterBase eStatus
sc/source/core/data/column.cxx:3385
(anonymous namespace)::RemoveEmptyBroadcasterHandler maSet
0
sc/source/core/data/documentimport.cxx:599
(anonymous namespace)::CellStoreInitializer::Impl maAttrs
1048576
sc/source/filter/inc/orcusinterface.hxx:179
ScOrcusConditionalFormat meEntryType
0
sc/source/filter/inc/xltracer.hxx:82
XclTracer mbEnabled
0
sc/source/ui/sidebar/CellLineStyleValueSet.hxx:32
sc::sidebar::CellLineStyleValueSet pVDev
0
sd/inc/sdpptwrp.hxx:42
SdPPTFilter pBas
0
sd/source/filter/html/htmlex.hxx:113
HtmlExport mbAutoSlide
1
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx:81
sd::slidesorter::controller::VisibleAreaManager meRequestedAnimationMode
sd/source/ui/inc/DrawController.hxx:289
sd::DrawController mpCurrentPage
0
sd/source/ui/inc/drawview.hxx:64
sd::DrawView mpVDev
0
sd/source/ui/inc/ViewTabBar.hxx:144
sd::ViewTabBar mpTabPage
0
sd/source/ui/inc/WindowUpdater.hxx:96
sd::WindowUpdater maCTLOptions
0
sd/source/ui/presenter/SlideRenderer.hxx:82
sd::presenter::SlideRenderer maPreviewRenderer
1
sd/source/ui/slidesorter/view/SlsLayouter.cxx:41
sd::slidesorter::view::Layouter::Implementation mnVerticalGap
4
sd/source/ui/slidesorter/view/SlsLayouter.cxx:42
sd::slidesorter::view::Layouter::Implementation mnHorizontalGap
4
sd/source/ui/sidebar/PanelBase.hxx:56
sd::sidebar::PanelBase mpWrappedControl
0
sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx:46
sd::slidesorter::cache::BitmapFactory maRenderer
0
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx:79
sd::slidesorter::controller::VisibleAreaManager mnScrollAnimationId
-1
sdext/source/pdfimport/pdfparse/pdfparse.cxx:60
StringEmitContext m_aBuf
256
sfx2/source/appl/lnkbase2.cxx:76
sfx2::ImplBaseLinkData::tDDEType pItem
0
sfx2/source/appl/lnkbase2.cxx:81
sfx2::ImplBaseLinkData::(anonymous) DDEType
0
sfx2/source/bastyp/progress.cxx:56
SfxProgress_Impl bLocked
sfx2/source/view/impviewframe.hxx:38
SfxViewFrame_Impl pFocusWin
0
sfx2/source/control/dispatch.cxx:118
SfxDispatcher_Impl pParent
0
sfx2/source/control/dispatch.cxx:133
SfxDispatcher_Impl bModal
0
sfx2/source/doc/doctemplates.cxx:138
(anonymous namespace)::WaitWindow_Impl mnTextStyle
12576
sfx2/source/inc/workwin.hxx:188
SfxWorkWindow pParent
0
sfx2/source/view/printer.cxx:39
SfxPrinter_Impl mbAll
1
sfx2/source/view/printer.cxx:40
SfxPrinter_Impl mbSelection
1
sfx2/source/view/printer.cxx:41
SfxPrinter_Impl mbFromTo
1
sfx2/source/view/printer.cxx:42
SfxPrinter_Impl mbRange
1
soltools/cpp/cpp.h:120
includelist deleted
1
@ -301,42 +352,39 @@ soltools/mkdepend/def.h:130
soltools/mkdepend/def.h:132
inclist i_searched
1
starmath/source/cfgitem.hxx:102
SmMathConfig vFontPickList
5
stoc/source/corereflection/lrucache.hxx:51
LRU_Cache _pBlock
0
stoc/source/inspect/introspection.cxx:1530
(anonymous namespace)::Cache::Data hits
1
svx/source/svdraw/svdpdf.hxx:173
ImpSdrPdfImport maLineCap
stoc/source/security/access_controller.cxx:306
(anonymous namespace)::AccessController m_rec
0
stoc/source/security/lru_cache.h:54
stoc_sec::lru_cache m_block
0
svtools/source/dialogs/roadmapwizard.cxx:54
svt::RoadmapWizardImpl pRoadmap
0
svx/source/sidebar/line/LineWidthValueSet.hxx:46
svx::sidebar::LineWidthValueSet pVDev
0
sw/inc/ftninfo.hxx:46
SwEndNoteInfo aFormat
4
sw/inc/hints.hxx:223
SwAttrSetChg m_bDelSet
0
sw/inc/pagepreviewlayout.hxx:45
SwPagePreviewLayout mnXFree
568
sw/inc/pagepreviewlayout.hxx:46
SwPagePreviewLayout mnYFree
568
sw/inc/printdata.hxx:69
SwPrintData m_bUpdateFieldsInPrinting
1
sw/inc/viewopt.hxx:189
SwViewOption m_bTest10
0
sw/source/core/inc/UndoSort.hxx:38
SwSortUndoElement::(anonymous union)::(anonymous) nID
4294967295
sw/source/filter/html/htmlcss1.cxx:77
SwCSS1ItemIds nFormatBreak
93
sw/source/filter/html/htmlcss1.cxx:78
SwCSS1ItemIds nFormatPageDesc
92
sw/source/filter/html/htmlcss1.cxx:79
SwCSS1ItemIds nFormatKeep
109
sw/source/filter/html/svxcss1.hxx:202
SvxCSS1Parser nMinFixLineSpace
141
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk
0
@ -346,21 +394,12 @@ sw/source/filter/ww8/ww8par.hxx:659
sw/source/filter/ww8/ww8par.hxx:668
WW8FormulaControl mhpsCheckBox
20
tools/source/generic/config.cxx:59
ImplConfigData meLineEnd
2
ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx:65
webdav_ucp::DAVResourceAccess m_nRedirectLimit
5
unotools/source/config/saveopt.cxx:77
SvtSaveOptions_Impl bROUserAutoSave
0
vcl/inc/listbox.hxx:201
ImplListBoxWindow mnBorder
1
vcl/inc/octree.hxx:98
InverseColorMap nBits
3
vcl/inc/impfontcache.hxx:77
ImplFontCache m_aBoundRectCache
3000
vcl/inc/salprn.hxx:42
SalPrinterQueueInfo mnStatus
0
@ -403,8 +442,8 @@ vcl/source/filter/jpeg/transupp.h:147
vcl/source/filter/jpeg/transupp.h:149
(anonymous) crop_yoffset
0
vcl/source/filter/wmf/wmfwr.hxx:78
WMFWriter bSrcIsClipping
vcl/source/filter/wmf/wmfwr.hxx:94
WMFWriter bDstIsClipping
0
vcl/source/font/font.cxx:539
(anonymous namespace)::WeightSearchEntry weight
@ -448,24 +487,15 @@ vcl/source/gdi/dibtools.cxx:117
vcl/source/gdi/dibtools.cxx:118
(anonymous namespace)::DIBV5Header nV5Reserved
0
vcl/source/window/status.cxx:53
StatusBar::ImplData mbDrawItemFrames
vcl/source/gdi/pdfwriter_impl.hxx:763
vcl::PDFWriterImpl m_DocDigest
0
vcl/unx/generic/print/bitmap_gfx.cxx:281
psp::LZWEncoder mnClearCode
256
writerfilter/source/dmapper/GraphicImport.cxx:207
writerfilter::dmapper::GraphicImport_Impl nCurrentBorderLine
2
writerfilter/source/dmapper/NumberingManager.hxx:47
writerfilter::dmapper::ListLevel m_nJC
-1
writerfilter/source/dmapper/PropertyMap.hxx:232
writerfilter::dmapper::SectionPropertyMap m_nFirstPaperBin
-1
writerfilter/source/dmapper/PropertyMap.hxx:402
writerfilter::dmapper::ParagraphProperties m_bAnchorLock
vcl/source/window/status.cxx:52
StatusBar::ImplData mnItemBorderWidth
0
writerfilter/source/dmapper/SettingsTable.cxx:239
writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
3
writerfilter/source/rtftok/rtfdocumentimpl.hxx:620
writerfilter::rtftok::RTFDocumentImpl m_nNestedTRLeft
0

13
editeng/source/editeng/eertfpar.cxx
View File

@ -59,12 +59,13 @@ RtfImportInfo::~RtfImportInfo()
{
}
static constexpr MapUnit gRTFMapUnit = MapUnit::MapTwip;
EditRTFParser::EditRTFParser(
SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine) :
SvxRTFParser(rAttrPool, rIn),
aCurSel(std::move(aSel)),
mpEditEngine(pEditEngine),
aRTFMapMode(MapUnit::MapTwip),
nDefFont(0),
bLastActionInsertParaBreak(false)
{
@ -311,8 +312,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
// #i66167# adapt font heights to destination MapUnit if necessary
const MapUnit eDestUnit = mpEditEngine->GetEditDoc().GetItemPool().GetMetric(0);
const MapUnit eSrcUnit = aRTFMapMode.GetMapUnit();
if (eDestUnit != eSrcUnit)
if (eDestUnit != gRTFMapUnit)
{
sal_uInt16 const aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL };
for (unsigned short aFntHeightIem : aFntHeightIems)
@ -321,7 +321,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
{
sal_uInt32 nHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight();
long nNewHeight;
nNewHeight = OutputDevice::LogicToLogic( static_cast<long>(nHeight), eSrcUnit, eDestUnit );
nNewHeight = OutputDevice::LogicToLogic( static_cast<long>(nHeight), gRTFMapUnit, eDestUnit );
SvxFontHeightItem aFntHeightItem( nNewHeight, 100, aFntHeightIem );
aFntHeightItem.SetProp(
@ -504,9 +504,8 @@ void EditRTFParser::CreateStyleSheets()
void EditRTFParser::CalcValue()
{
const MapUnit eDestUnit = aEditMapMode.GetMapUnit();
const MapUnit eSrcUnit = aRTFMapMode.GetMapUnit();
if (eDestUnit != eSrcUnit)
nTokenValue = OutputDevice::LogicToLogic( nTokenValue, eSrcUnit, eDestUnit );
if (eDestUnit != gRTFMapUnit)
nTokenValue = OutputDevice::LogicToLogic( nTokenValue, gRTFMapUnit, eDestUnit );
}
void EditRTFParser::ReadField()

1
editeng/source/editeng/eertfpar.hxx
View File

@ -31,7 +31,6 @@ class EditRTFParser final : public SvxRTFParser
private:
EditSelection aCurSel;
EditEngine* mpEditEngine;
MapMode aRTFMapMode;
MapMode aEditMapMode;
sal_uInt16 nDefFont;

4
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
View File

@ -210,7 +210,6 @@ private:
bool m_bDisposed;
OUString m_aXMLPostfix;
OUString m_aPropUIName;
OUString m_aPropResourceURL;
OUString m_aModuleIdentifier;
css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@ -834,7 +833,6 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
, m_bDisposed( false )
, m_aXMLPostfix( ".xml" )
, m_aPropUIName( "UIName" )
, m_aPropResourceURL( "ResourceURL" )
, m_xContext( xContext )
, m_aListenerContainer( m_mutex )
{
@ -1078,7 +1076,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::get
impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
Sequence< PropertyValue > aUIElementInfo( 2 );
aUIElementInfo[0].Name = m_aPropResourceURL;
aUIElementInfo[0].Name = "ResourceURL";
aUIElementInfo[1].Name = m_aPropUIName;
aElementInfoSeq.resize( aUIElementInfoCollection.size() );

8
framework/source/uiconfiguration/uiconfigurationmanager.cxx
View File

@ -186,9 +186,7 @@ private:
bool m_bReadOnly;
bool m_bModified;
bool m_bDisposed;
OUString m_aXMLPostfix;
OUString m_aPropUIName;
OUString m_aPropResourceURL;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
osl::Mutex m_mutex;
cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
@ -673,9 +671,7 @@ UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::
m_bReadOnly( true )
, m_bModified( false )
, m_bDisposed( false )
, m_aXMLPostfix( ".xml" )
, m_aPropUIName( "UIName" )
, m_aPropResourceURL( "ResourceURL" )
, m_xContext( rxContext )
, m_aListenerContainer( m_mutex )
{
@ -856,7 +852,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElem
impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
Sequence< PropertyValue > aUIElementInfo( 2 );
aUIElementInfo[0].Name = m_aPropResourceURL;
aUIElementInfo[0].Name = "ResourceURL";
aUIElementInfo[1].Name = m_aPropUIName;
aElementInfoSeq.resize( aUIElementInfoCollection.size() );
@ -1084,7 +1080,7 @@ void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourc
if ( bInsertData )
{
pDataSettings->aName = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix;
pDataSettings->aName = RetrieveNameFromResourceURL( NewResourceURL ) + ".xml";
pDataSettings->aResourceURL = NewResourceURL;
UIElementDataHashMap& rElements = rElementType.aElementsHashMap;

58
framework/source/uielement/uicommanddescription.cxx
View File

@ -132,21 +132,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
OUString m_aConfigCmdAccess;
OUString m_aConfigPopupAccess;
OUString m_aPropUILabel;
OUString m_aPropUIContextLabel;
OUString m_aPropUIPopupLabel;
OUString m_aPropUITooltipLabel;
OUString m_aPropUITargetURL;
OUString m_aPropUIIsExperimental;
OUString m_aPropLabel;
OUString m_aPropName;
OUString m_aPropPopup;
OUString m_aPropPopupLabel;
OUString m_aPropTooltipLabel;
OUString m_aPropTargetURL;
OUString m_aPropIsExperimental;
OUString m_aPropProperties;
OUString m_aPrivateResourceURL;
Reference< XNameAccess > m_xGenericUICommands;
Reference< XMultiServiceFactory > m_xConfigProvider;
Reference< XNameAccess > m_xConfigAccess;
@ -167,21 +153,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ),
m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ),
m_aPropUILabel( "Label" ),
m_aPropUIContextLabel( "ContextLabel" ),
m_aPropUIPopupLabel( "PopupLabel" ),
m_aPropUITooltipLabel( "TooltipLabel" ),
m_aPropUITargetURL( "TargetURL" ),
m_aPropUIIsExperimental( "IsExperimental" ),
m_aPropLabel( "Label" ),
m_aPropName( "Name" ),
m_aPropPopup( "Popup" ),
m_aPropPopupLabel( "PopupLabel" ),
m_aPropTooltipLabel( "TooltipLabel" ),
m_aPropTargetURL( "TargetURL" ),
m_aPropIsExperimental( "IsExperimental" ),
m_aPropProperties( "Properties" ),
m_aPrivateResourceURL( PRIVATE_RESOURCE_URL ),
m_xGenericUICommands( rGenericUICommands ),
m_bConfigAccessInitialized( false ),
m_bCacheFilled( false ),
@ -220,7 +192,7 @@ Any ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
fillCache();
}
if ( rCommandURL.startsWith( m_aPrivateResourceURL ) )
if ( rCommandURL.startsWith( PRIVATE_RESOURCE_URL ) )
{
// special keys to retrieve information about a set of commands
// SAFE
@ -292,22 +264,22 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman
fillInfoFromResult( pIter->second, pIter->second.aLabel );
Sequence< PropertyValue > aPropSeq( 8 );
aPropSeq[0].Name = m_aPropLabel;
aPropSeq[0].Name = "Label";
aPropSeq[0].Value = !pIter->second.aContextLabel.isEmpty() ?
makeAny( pIter->second.aContextLabel ): makeAny( pIter->second.aLabel );
aPropSeq[1].Name = m_aPropName;
aPropSeq[1].Name = "Name";
aPropSeq[1].Value <<= pIter->second.aCommandName;
aPropSeq[2].Name = m_aPropPopup;
aPropSeq[2].Name = "Popup";
aPropSeq[2].Value <<= pIter->second.bPopup;
aPropSeq[3].Name = m_aPropProperties;
aPropSeq[3].Value <<= pIter->second.nProperties;
aPropSeq[4].Name = m_aPropPopupLabel;
aPropSeq[4].Name = "PopupLabel";
aPropSeq[4].Value <<= pIter->second.aPopupLabel;
aPropSeq[5].Name = m_aPropTooltipLabel;
aPropSeq[5].Name = "TooltipLabel";
aPropSeq[5].Value <<= pIter->second.aTooltipLabel;
aPropSeq[6].Name = m_aPropTargetURL;
aPropSeq[6].Name = "TargetURL";
aPropSeq[6].Value <<= pIter->second.aTargetURL;
aPropSeq[7].Name = m_aPropIsExperimental;
aPropSeq[7].Name = "IsExperimental";
aPropSeq[7].Value <<= pIter->second.bIsExperimental;
return makeAny( aPropSeq );
}
@ -333,13 +305,13 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
CmdToInfoMap aCmdToInfo;
aCmdToInfo.bPopup = _bPopup;
xNameAccess->getByName( m_aPropUILabel ) >>= aCmdToInfo.aLabel;
xNameAccess->getByName( m_aPropUIContextLabel ) >>= aCmdToInfo.aContextLabel;
xNameAccess->getByName( m_aPropUIPopupLabel ) >>= aCmdToInfo.aPopupLabel;
xNameAccess->getByName( m_aPropUITooltipLabel ) >>= aCmdToInfo.aTooltipLabel;
xNameAccess->getByName( m_aPropUITargetURL ) >>= aCmdToInfo.aTargetURL;
xNameAccess->getByName( m_aPropUIIsExperimental ) >>= aCmdToInfo.bIsExperimental;
xNameAccess->getByName( m_aPropProperties ) >>= aCmdToInfo.nProperties;
xNameAccess->getByName( "Label" ) >>= aCmdToInfo.aLabel;
xNameAccess->getByName( "ContextLabel" ) >>= aCmdToInfo.aContextLabel;
xNameAccess->getByName( "PopupLabel" ) >>= aCmdToInfo.aPopupLabel;
xNameAccess->getByName( "TooltipLabel" ) >>= aCmdToInfo.aTooltipLabel;
xNameAccess->getByName( "TargetURL" ) >>= aCmdToInfo.aTargetURL;
xNameAccess->getByName( "IsExperimental" ) >>= aCmdToInfo.bIsExperimental;
xNameAccess->getByName( m_aPropProperties ) >>= aCmdToInfo.nProperties;
m_aCmdInfoCache.emplace( aNameSeq[i], aCmdToInfo );

3
include/svtools/ctrlbox.hxx
View File

@ -445,8 +445,7 @@ private:
class SVT_DLLPUBLIC FontSizeBox : public MetricBox
{
FontMetric aFontMetric;
bool bRelative:1,
bStdSize:1;
bool bStdSize:1;
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();

7
sc/source/ui/sidebar/CellLineStyleValueSet.cxx
View File

@ -25,7 +25,6 @@ namespace sc { namespace sidebar {
CellLineStyleValueSet::CellLineStyleValueSet(vcl::Window* pParent)
: ValueSet(pParent, WB_TABSTOP)
, pVDev(nullptr)
, nSelItem(0)
{
SetColCount();
@ -37,12 +36,6 @@ CellLineStyleValueSet::~CellLineStyleValueSet()
disposeOnce();
}
void CellLineStyleValueSet::dispose()
{
pVDev.disposeAndClear();
ValueSet::dispose();
}
Size CellLineStyleValueSet::GetOptimalSize() const
{
return LogicToPixel(Size(80, 12 * 9), MapMode(MapUnit::MapAppFont));

2
sc/source/ui/sidebar/CellLineStyleValueSet.hxx
View File

@ -29,13 +29,11 @@ namespace sc { namespace sidebar {
class CellLineStyleValueSet : public ValueSet
{
private:
VclPtr<VirtualDevice> pVDev;
sal_uInt16 nSelItem;
OUString maStrUnit[CELL_LINE_STYLE_ENTRIES];
public:
explicit CellLineStyleValueSet(vcl::Window* pParent);
virtual ~CellLineStyleValueSet() override;
virtual void dispose() override;
void SetUnit(const OUString* str);
void SetSelItem(sal_uInt16 nSel);

1
sd/source/ui/inc/drawview.hxx
View File

@ -61,7 +61,6 @@ protected:
private:
DrawDocShell* mpDocShell;
DrawViewShell* mpDrawViewShell;
VclPtr<VirtualDevice> mpVDev;
sal_uInt16 mnPOCHSmph; ///< for blocking PageOrderChangedHint
};

12
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
View File

@ -52,7 +52,6 @@ namespace {
VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
maVisibleRequests(),
mnScrollAnimationId(Animator::NotAnAnimationId),
maRequestedVisibleTopLeft(),
mbIsCurrentSlideTrackingActive(true),
mnDisableCount(0)
@ -114,17 +113,6 @@ void VisibleAreaManager::MakeVisible()
if ( ! aNewVisibleTopLeft)
return;
// We now know what the visible area shall be. Scroll accordingly
// unless that is not already the visible area or a running scroll
// animation has it as its target area.
if (mnScrollAnimationId!=Animator::NotAnAnimationId
&& maRequestedVisibleTopLeft==aNewVisibleTopLeft)
return;
// Stop a running animation.
if (mnScrollAnimationId != Animator::NotAnAnimationId)
mrSlideSorter.GetController().GetAnimator()->RemoveAnimation(mnScrollAnimationId);
maRequestedVisibleTopLeft = aNewVisibleTopLeft.get();
VisibleAreaScroller aAnimation(
mrSlideSorter,

4
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
View File

@ -73,10 +73,6 @@ private:
*/
::std::vector<::tools::Rectangle> maVisibleRequests;
/** Animation id for a scroll animation that sets the top
and left of the visible area to maRequestedVisibleTopLeft.
*/
Animator::AnimationId mnScrollAnimationId;
Point maRequestedVisibleTopLeft;
bool mbIsCurrentSlideTrackingActive;
int mnDisableCount;

7
sd/source/ui/view/drawview.cxx
View File

@ -87,7 +87,6 @@ DrawView::DrawView(
: ::sd::View(*pDocSh->GetDoc(), pOutDev, pShell)
,mpDocShell(pDocSh)
,mpDrawViewShell(pShell)
,mpVDev(nullptr)
,mnPOCHSmph(0)
{
SetCurrentObj(OBJ_RECT);
@ -95,7 +94,6 @@ DrawView::DrawView(
DrawView::~DrawView()
{
mpVDev.disposeAndClear();
}
/**
@ -462,11 +460,6 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0*/)
{
if( mpVDev )
{
mpVDev.disposeAndClear();
}
bool bStandardPaint = true;
SdDrawDocument* pDoc = mpDocShell->GetDoc();

2
sfx2/source/view/impviewframe.hxx
View File

@ -35,7 +35,6 @@ struct SfxViewFrame_Impl
OUString aActualURL;
SfxFrame& rFrame;
VclPtr<vcl::Window> pWindow;
VclPtr<vcl::Window> pFocusWin;
sal_uInt16 nDocViewNo;
SfxInterfaceId nCurViewId;
bool bResizeInToOut:1;
@ -50,7 +49,6 @@ struct SfxViewFrame_Impl
explicit SfxViewFrame_Impl(SfxFrame& i_rFrame)
: rFrame(i_rFrame)
, pWindow(nullptr)
, pFocusWin(nullptr)
, nDocViewNo(0)
, nCurViewId(0)
, bResizeInToOut(false)

2
sfx2/source/view/viewfrm.cxx
View File

@ -1400,7 +1400,6 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
{
m_pImpl->bResizeInToOut = true;
m_pImpl->bObjLocked = false;
m_pImpl->pFocusWin = nullptr;
m_pImpl->nCurViewId = SFX_INTERFACE_NONE;
m_pImpl->bReloading = false;
m_pImpl->bIsDowning = false;
@ -1484,7 +1483,6 @@ SfxViewFrame::~SfxViewFrame()
KillDispatcher_Impl();
m_pImpl->pWindow.disposeAndClear();
m_pImpl->pFocusWin.clear();
if ( GetFrame().GetCurrentViewFrame() == this )
GetFrame().SetCurrentViewFrame_Impl( nullptr );

41
svtools/source/control/ctrlbox.cxx
View File

@ -1262,7 +1262,6 @@ void FontSizeBox::ImplInit()
{
EnableAutocomplete( false );
bRelative = false;
bStdSize = false;
SetShowTrailingZeros( false );
@ -1287,10 +1286,6 @@ void FontSizeBox::Reformat()
void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
{
// no font sizes need to be set for relative mode
if ( bRelative )
return;
// query font sizes
const sal_IntPtr* pTempAry;
const sal_IntPtr* pAry = nullptr;
@ -1372,21 +1367,18 @@ void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
{
if ( !bRelative )
sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() );
FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
// conversion loses precision; however font sizes should
// never have a problem with that
OUString aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) );
if ( !aName.isEmpty() && (GetEntryPos( aName ) != LISTBOX_ENTRY_NOTFOUND) )
{
sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() );
FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
// conversion loses precision; however font sizes should
// never have a problem with that
OUString aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) );
if ( !aName.isEmpty() && (GetEntryPos( aName ) != LISTBOX_ENTRY_NOTFOUND) )
{
mnLastValue = nTempValue;
SetText( aName );
mnFieldValue = mnLastValue;
SetEmptyFieldValueData( false );
return;
}
mnLastValue = nTempValue;
SetText( aName );
mnFieldValue = mnLastValue;
SetEmptyFieldValueData( false );
return;
}
MetricBox::SetValue( nNewValue, eInUnit );
@ -1399,13 +1391,10 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue )
sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const
{
if ( !bRelative )
{
FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
sal_Int64 nValue = aFontSizeNames.Name2Size( rStr );
if ( nValue )
return MetricField::ConvertValue( nValue, GetBaseValue(), GetDecimalDigits(), GetUnit(), eOutUnit );
}
FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
sal_Int64 nValue = aFontSizeNames.Name2Size( rStr );
if ( nValue )
return MetricField::ConvertValue( nValue, GetBaseValue(), GetDecimalDigits(), GetUnit(), eOutUnit );
return MetricBox::GetValueFromStringUnit( rStr, eOutUnit );
}

7
svx/source/sidebar/line/LineWidthValueSet.cxx
View File

@ -25,7 +25,6 @@ namespace svx { namespace sidebar {
LineWidthValueSet::LineWidthValueSet(vcl::Window* pParent)
: ValueSet(pParent, WB_TABSTOP)
, pVDev(nullptr)
, nSelItem(0)
, bCusEnable(false)
{
@ -43,12 +42,6 @@ LineWidthValueSet::~LineWidthValueSet()
disposeOnce();
}
void LineWidthValueSet::dispose()
{
pVDev.disposeAndClear();
ValueSet::dispose();
}
void LineWidthValueSet::SetUnit(std::array<OUString,9> const & strUnits)
{
maStrUnits = strUnits;

2
svx/source/sidebar/line/LineWidthValueSet.hxx
View File

@ -30,7 +30,6 @@ class LineWidthValueSet final : public ValueSet
public:
explicit LineWidthValueSet(vcl::Window* pParent);
virtual ~LineWidthValueSet() override;
virtual void dispose() override;
void SetUnit(std::array<OUString,9> const & strUnits);
void SetSelItem(sal_uInt16 nSel);
@ -43,7 +42,6 @@ public:
virtual Size GetOptimalSize() const override;
private:
VclPtr<VirtualDevice> pVDev;
sal_uInt16 nSelItem;
std::array<OUString,9> maStrUnits;
Image imgCus;

2
vcl/inc/printdlg.hxx
View File

@ -148,7 +148,7 @@ namespace vcl
BitmapEx const maCollateBmp;
BitmapEx const maNoCollateBmp;
long mnCollateUIMode;
bool mbCollateAlwaysOff;
JobTabPage( VclBuilder* );

6
vcl/source/filter/wmf/wmfwr.cxx
View File

@ -149,7 +149,6 @@ WMFWriter::WMFWriter()
, eDstROP2(RasterOp::OverPaint)
, eDstTextAlign(ALIGN_BASELINE)
, eDstHorTextAlign(W_TA_LEFT)
, bDstIsClipping(false)
, bHandleAllocated{}
, nDstPenHandle(0)
, nDstFontHandle(0)
@ -927,10 +926,6 @@ void WMFWriter::SetLineAndFillAttr()
aDstFillColor = aSrcFillColor;
CreateSelectDeleteBrush( aDstFillColor );
}
if ( bDstIsClipping ) {
bDstIsClipping=false;
aDstClipRegion=aSrcClipRegion;
}
}
void WMFWriter::SetAllAttr()
@ -1763,7 +1758,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
CreateSelectDeleteBrush( aDstFillColor );
aDstClipRegion = aSrcClipRegion = vcl::Region();
bDstIsClipping = false;
vcl::Font aFont;
aFont.SetCharSet( GetExtendedTextEncoding( RTL_TEXTENCODING_MS_1252 ) );

1
vcl/source/filter/wmf/wmfwr.hxx
View File

@ -91,7 +91,6 @@ private:
sal_uInt16 eDstHorTextAlign;
bool bDstIsClipping; // ???: not taken into account at the moment
vcl::Region aDstClipRegion; // ???: not taken into account at the moment
bool bHandleAllocated[MAXOBJECTHANDLES]; // which handles have been assigned
sal_uInt16 nDstPenHandle,nDstFontHandle,nDstBrushHandle; // which handles are owned by

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

@ -555,7 +555,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
: maCollateBmp(SV_PRINT_COLLATE_BMP)
, maNoCollateBmp(SV_PRINT_NOCOLLATE_BMP)
, mnCollateUIMode(0)
, mbCollateAlwaysOff(false)
{
pUIBuilder->get(mpPrinters, "printers");
pUIBuilder->get(mpStatusTxt, "status");
@ -580,13 +580,13 @@ void PrintDialog::JobTabPage::readFromSettings()
"CollateBox" );
if( aValue.equalsIgnoreAsciiCase("alwaysoff") )
{
mnCollateUIMode = 1;
mbCollateAlwaysOff = true;
mpCollateBox->Check( false );
mpCollateBox->Enable( false );
}
else
{
mnCollateUIMode = 0;
mbCollateAlwaysOff = false;
aValue = pItem->getValue( "PrintDialog",
"Collate" );
mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") );
@ -1283,7 +1283,7 @@ void PrintDialog::DataChanged( const DataChangedEvent& i_rDCEvt )
void PrintDialog::checkControlDependencies()
{
if( maJobPage.mpCopyCountField->GetValue() > 1 )
maJobPage.mpCollateBox->Enable( maJobPage.mnCollateUIMode == 0 );
maJobPage.mpCollateBox->Enable( !maJobPage.mbCollateAlwaysOff );
else
maJobPage.mpCollateBox->Enable( false );

10
vcl/source/window/status.cxx
View File

@ -49,13 +49,11 @@ public:
ImplData();
VclPtr<VirtualDevice> mpVirDev;
long mnItemBorderWidth;
};
StatusBar::ImplData::ImplData()
{
mpVirDev = nullptr;
mnItemBorderWidth = 0;
}
struct ImplStatusItem
@ -380,7 +378,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen
// compute output region
ImplStatusItem* pItem = mvItemList[nPos].get();
long nW = mpImplData->mnItemBorderWidth + 1;
long nW = 1;
tools::Rectangle aTextRect(aRect.Left() + nW, aRect.Top() + nW,
aRect.Right() - nW, aRect.Bottom() - nW);
@ -1083,7 +1081,7 @@ tools::Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
{
// get rectangle and subtract frame
aRect = ImplGetItemRectPos( nPos );
long nW = mpImplData->mnItemBorderWidth+1;
long nW = 1;
aRect.AdjustTop(nW-1 );
aRect.AdjustBottom( -(nW-1) );
aRect.AdjustLeft(nW );
@ -1105,7 +1103,7 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
// get rectangle
ImplStatusItem* pItem = mvItemList[ nPos ].get();
tools::Rectangle aRect = ImplGetItemRectPos( nPos );
long nW = mpImplData->mnItemBorderWidth + 1;
long nW = 1;
tools::Rectangle aTextRect( aRect.Left()+nW, aRect.Top()+nW,
aRect.Right()-nW, aRect.Bottom()-nW );
Point aPos = ImplGetItemTextPos( aTextRect.GetSize(),
@ -1463,7 +1461,7 @@ Size StatusBar::CalcWindowSizePixel() const
}
}
nCalcHeight = nMinHeight+nBarTextOffset + 2*mpImplData->mnItemBorderWidth;
nCalcHeight = nMinHeight+nBarTextOffset;
if( nCalcHeight < nProgressHeight+2 )
nCalcHeight = nProgressHeight+2;