loplugin:singlevalfields
Change-Id: I70dc861573fd1b3d799c88aa2a6d9a3eda0e2a43 Reviewed-on: https://gerrit.libreoffice.org/64327 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
parent
cabf739612
commit
14b366e57a
@ -4,25 +4,19 @@ chart2/source/view/inc/PlottingPositionHelper.hxx:206
|
||||
connectivity/source/inc/dbase/dindexnode.hxx:125
|
||||
connectivity::dbase::ONDXPage bNoDelete
|
||||
unsigned int
|
||||
cui/source/inc/cfg.hxx:249
|
||||
cui/source/inc/cfg.hxx:248
|
||||
SvxConfigEntry nId
|
||||
sal_uInt16
|
||||
editeng/source/misc/hangulhanja.cxx:78
|
||||
editeng/source/misc/hangulhanja.cxx:79
|
||||
editeng::HangulHanjaConversion_Impl m_eConvType
|
||||
class HangulHanjaConversion::ConversionType
|
||||
filter/source/graphicfilter/eps/eps.cxx:139
|
||||
filter/source/graphicfilter/eps/eps.cxx:141
|
||||
PSWriter nNextChrSetId
|
||||
sal_uInt8
|
||||
include/opencl/openclwrapper.hxx:46
|
||||
openclwrapper::GPUEnv mnIsUserCreated
|
||||
int
|
||||
include/svtools/headbar.hxx:219
|
||||
HeaderBar mnBorderOff1
|
||||
long
|
||||
include/svtools/headbar.hxx:220
|
||||
HeaderBar mnBorderOff2
|
||||
long
|
||||
include/svtools/ruler.hxx:627
|
||||
include/svtools/ruler.hxx:625
|
||||
Ruler mnBorderWidth
|
||||
long
|
||||
include/tools/ref.hxx:126
|
||||
@ -31,9 +25,15 @@ include/tools/ref.hxx:126
|
||||
include/vbahelper/vbapagesetupbase.hxx:50
|
||||
VbaPageSetupBase mnOrientPortrait
|
||||
sal_Int32
|
||||
include/vcl/dialog.hxx:50
|
||||
include/vcl/dialog.hxx:48
|
||||
Dialog mnMousePositioned
|
||||
long
|
||||
include/vcl/headbar.hxx:216
|
||||
HeaderBar mnBorderOff1
|
||||
long
|
||||
include/vcl/headbar.hxx:217
|
||||
HeaderBar mnBorderOff2
|
||||
long
|
||||
libreofficekit/source/gtk/tilebuffer.hxx:219
|
||||
LOEvent m_nSetGraphicSelectionType
|
||||
int
|
||||
@ -76,7 +76,7 @@ sw/source/filter/ww8/docxexport.hxx:100
|
||||
sw/source/filter/ww8/ww8scan.hxx:65
|
||||
SprmInfo nVari
|
||||
unsigned int
|
||||
sw/source/uibase/inc/tautofmt.hxx:50
|
||||
sw/source/uibase/inc/tautofmt.hxx:48
|
||||
SwAutoFormatDlg m_nDfltStylePos
|
||||
sal_uInt8
|
||||
vcl/inc/canvasbitmap.hxx:57
|
||||
@ -88,7 +88,7 @@ vcl/inc/unx/i18n_ic.hxx:33
|
||||
vcl/inc/unx/salframe.h:130
|
||||
X11SalFrame mbInputFocus
|
||||
int
|
||||
vcl/workben/icontest.cxx:144
|
||||
vcl/workben/icontest.cxx:145
|
||||
IconTestApp nRet
|
||||
int
|
||||
writerfilter/source/dmapper/PageBordersHandler.hxx:54
|
||||
|
||||
@ -10,7 +10,7 @@ basctl/source/basicide/baside2.hxx:87
|
||||
basctl/source/inc/dlged.hxx:132
|
||||
basctl::DlgEditor aMarkIdle
|
||||
basctl DlgEditor Mark
|
||||
basic/source/runtime/methods.cxx:3450
|
||||
basic/source/runtime/methods.cxx:3439
|
||||
(anonymous namespace)::RandomNumberGenerator global_rng
|
||||
5489
|
||||
binaryurp/source/proxy.hxx:83
|
||||
@ -91,24 +91,45 @@ connectivity/source/inc/OColumn.hxx:48
|
||||
connectivity/source/inc/writer/WTable.hxx:69
|
||||
connectivity::writer::OWriterTable m_nStartCol
|
||||
0
|
||||
cui/source/inc/linkdlg.hxx:64
|
||||
cui/source/customize/cfgutil.cxx:445
|
||||
CuiConfigGroupBoxResource_Impl m_hdImage
|
||||
res/harddisk_16.png
|
||||
cui/source/customize/cfgutil.cxx:446
|
||||
CuiConfigGroupBoxResource_Impl m_libImage
|
||||
res/im30820.png
|
||||
cui/source/customize/cfgutil.cxx:447
|
||||
CuiConfigGroupBoxResource_Impl m_macImage
|
||||
res/im30821.png
|
||||
cui/source/customize/cfgutil.cxx:448
|
||||
CuiConfigGroupBoxResource_Impl m_docImage
|
||||
res/im30826.png
|
||||
cui/source/inc/cfgutil.hxx:228
|
||||
CuiConfigGroupListBox m_pStylesInfo
|
||||
0
|
||||
cui/source/inc/linkdlg.hxx:63
|
||||
SvBaseLinksDlg aUpdateIdle
|
||||
cui SvBaseLinksDlg UpdateIdle
|
||||
cui/source/inc/thesdlg.hxx:37
|
||||
cui/source/inc/thesdlg.hxx:38
|
||||
LookUpComboBox m_aModifyIdle
|
||||
cui LookUpComboBox Modify
|
||||
cui/source/options/optgdlg.cxx:1102
|
||||
LanguageConfig_Impl aLanguageOptions
|
||||
0
|
||||
cui/source/options/optjava.hxx:79
|
||||
cui/source/options/optjava.hxx:78
|
||||
SvxJavaOptionsPage m_aResetIdle
|
||||
cui options SvxJavaOptionsPage Reset
|
||||
cui/source/options/treeopt.cxx:456
|
||||
OptionsPageInfo m_pPage
|
||||
0
|
||||
cui/source/options/treeopt.cxx:472
|
||||
OptionsGroupInfo m_bLoadError
|
||||
0
|
||||
dbaccess/source/filter/xml/xmlStyleImport.hxx:74
|
||||
dbaxml::OTableStylesContext sTableStyleServiceName
|
||||
table
|
||||
dbaccess/source/filter/xml/xmlStyleImport.hxx:75
|
||||
dbaxml::OTableStylesContext sColumnStyleServiceName
|
||||
table-column
|
||||
dbaccess/source/filter/xml/xmlStyleImport.hxx:76
|
||||
dbaxml::OTableStylesContext sCellStyleServiceName
|
||||
table-cell
|
||||
desktop/source/app/cmdlineargs.hxx:137
|
||||
desktop::CommandLineArgs m_quickstart
|
||||
0
|
||||
@ -139,9 +160,6 @@ framework/source/uiconfiguration/imagemanagerimpl.hxx:182
|
||||
helpcompiler/inc/BasCodeTagger.hxx:35
|
||||
BasicCodeTagger m_Highlighter
|
||||
0
|
||||
i18npool/inc/collator_unicode.hxx:65
|
||||
i18npool::Collator_Unicode implementationName
|
||||
com.sun.star.i18n.Collator_Unicode
|
||||
include/basegfx/pixel/bpixel.hxx:43
|
||||
basegfx::BPixel::(anonymous union)::(anonymous) mnValue
|
||||
0
|
||||
@ -283,16 +301,16 @@ include/svx/svdmark.hxx:144
|
||||
include/svx/svdmark.hxx:145
|
||||
SdrMarkList mbGluePointNameOk
|
||||
0
|
||||
include/svx/svdmrkv.hxx:116
|
||||
include/svx/svdmrkv.hxx:111
|
||||
SdrMarkView mnFrameHandlesLimit
|
||||
50
|
||||
include/test/beans/xpropertyset.hxx:56
|
||||
apitest::XPropertySet maPropsToTest
|
||||
1
|
||||
include/vcl/ITiledRenderable.hxx:90
|
||||
include/vcl/ITiledRenderable.hxx:91
|
||||
vcl::ITiledRenderable mnTilePixelWidth
|
||||
256
|
||||
include/vcl/ITiledRenderable.hxx:90
|
||||
include/vcl/ITiledRenderable.hxx:91
|
||||
vcl::ITiledRenderable mnTilePixelHeight
|
||||
256
|
||||
include/vcl/opengl/OpenGLContext.hxx:57
|
||||
@ -301,6 +319,9 @@ include/vcl/opengl/OpenGLContext.hxx:57
|
||||
include/vcl/slider.hxx:39
|
||||
Slider mnChannelPixOffset
|
||||
0
|
||||
include/vcl/xtextedt.hxx:36
|
||||
ExtTextEngine maGroupChars
|
||||
(){}[]
|
||||
libreofficekit/source/gtk/lokdocview.cxx:84
|
||||
LOKDocViewPrivateImpl m_bIsLoading
|
||||
0
|
||||
@ -328,6 +349,9 @@ sal/osl/unx/signal.cxx:82
|
||||
sal/osl/unx/sockimpl.hxx:37
|
||||
oslSocketImpl m_bIsInShutdown
|
||||
1
|
||||
sal/qa/osl/process/osl_process.cxx:151
|
||||
Test_osl_executeProcess env_param_
|
||||
-env
|
||||
sal/qa/osl/process/osl_Thread.cxx:214
|
||||
myThread m_aFlag
|
||||
0
|
||||
@ -364,7 +388,7 @@ sc/inc/scmod.hxx:81
|
||||
sc/inc/table.hxx:178
|
||||
ScTable mpRowHeights
|
||||
0
|
||||
sc/qa/unit/ucalc.hxx:41
|
||||
sc/qa/unit/ucalc.hxx:42
|
||||
Test::RangeNameDef mnIndex
|
||||
1
|
||||
sc/source/core/data/column.cxx:3377
|
||||
@ -388,16 +412,16 @@ sc/source/ui/inc/acredlin.hxx:50
|
||||
sc/source/ui/inc/acredlin.hxx:51
|
||||
ScAcceptChgDlg aReOpenIdle
|
||||
ScAcceptChgDlg ReOpenIdle
|
||||
sc/source/ui/inc/autostyl.hxx:57
|
||||
sc/source/ui/inc/autostyl.hxx:58
|
||||
ScAutoStyleList aTimer
|
||||
ScAutoStyleList Timer
|
||||
sc/source/ui/inc/autostyl.hxx:58
|
||||
sc/source/ui/inc/autostyl.hxx:59
|
||||
ScAutoStyleList aInitIdle
|
||||
ScAutoStyleList InitIdle
|
||||
sc/source/ui/inc/checklistmenu.hxx:155
|
||||
sc/source/ui/inc/checklistmenu.hxx:156
|
||||
ScMenuFloatingWindow::MenuItemData mpAction
|
||||
0
|
||||
sc/source/ui/inc/checklistmenu.hxx:156
|
||||
sc/source/ui/inc/checklistmenu.hxx:157
|
||||
ScMenuFloatingWindow::MenuItemData mpSubMenuWin
|
||||
0
|
||||
sc/source/ui/inc/conflictsdlg.hxx:134
|
||||
@ -412,7 +436,7 @@ sc/source/ui/inc/viewdata.hxx:288
|
||||
sd/inc/sdpptwrp.hxx:42
|
||||
SdPPTFilter pBas
|
||||
0
|
||||
sd/source/filter/html/htmlex.hxx:113
|
||||
sd/source/filter/html/htmlex.hxx:114
|
||||
HtmlExport mbAutoSlide
|
||||
1
|
||||
sd/source/ui/framework/module/ShellStackGuard.hxx:82
|
||||
@ -451,16 +475,16 @@ sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:92
|
||||
sdext/source/pdfimport/pdfparse/pdfparse.cxx:60
|
||||
StringEmitContext m_aBuf
|
||||
256
|
||||
sfx2/source/appl/lnkbase2.cxx:76
|
||||
sfx2/source/appl/lnkbase2.cxx:77
|
||||
sfx2::ImplBaseLinkData::tDDEType pItem
|
||||
0
|
||||
sfx2/source/appl/lnkbase2.cxx:81
|
||||
sfx2/source/appl/lnkbase2.cxx:82
|
||||
sfx2::ImplBaseLinkData::(anonymous) DDEType
|
||||
0
|
||||
sfx2/source/appl/newhelp.hxx:292
|
||||
sfx2/source/appl/newhelp.hxx:291
|
||||
SfxHelpIndexWindow_Impl aIdle
|
||||
sfx2 appl SfxHelpIndexWindow_Impl
|
||||
sfx2/source/appl/newhelp.hxx:424
|
||||
sfx2/source/appl/newhelp.hxx:423
|
||||
SfxHelpTextWindow_Impl aSelectIdle
|
||||
sfx2 appl SfxHelpTextWindow_Impl Select
|
||||
sfx2/source/control/itemdel.cxx:31
|
||||
@ -469,15 +493,21 @@ sfx2/source/control/itemdel.cxx:31
|
||||
slideshow/source/engine/slideshowimpl.cxx:479
|
||||
(anonymous namespace)::SlideShowImpl maFrameSynchronization
|
||||
0.02
|
||||
slideshow/test/testview.cxx:59
|
||||
ImplTestView mbIsClearCalled
|
||||
0
|
||||
soltools/cpp/cpp.h:120
|
||||
includelist deleted
|
||||
1
|
||||
soltools/mkdepend/def.h:130
|
||||
soltools/mkdepend/def.h:116
|
||||
inclist i_notified
|
||||
1
|
||||
soltools/mkdepend/def.h:132
|
||||
soltools/mkdepend/def.h:118
|
||||
inclist i_searched
|
||||
1
|
||||
soltools/mkdepend/def.h:119
|
||||
inclist i_included_sym
|
||||
0
|
||||
starmath/inc/edit.hxx:54
|
||||
SmEditWindow aModifyIdle
|
||||
SmEditWindow ModifyIdle
|
||||
@ -487,7 +517,7 @@ starmath/source/cfgitem.hxx:102
|
||||
stoc/source/corereflection/lrucache.hxx:51
|
||||
LRU_Cache _pBlock
|
||||
0
|
||||
stoc/source/inspect/introspection.cxx:1530
|
||||
stoc/source/inspect/introspection.cxx:1528
|
||||
(anonymous namespace)::Cache::Data hits
|
||||
1
|
||||
stoc/source/security/access_controller.cxx:306
|
||||
@ -511,7 +541,10 @@ svtools/source/contnr/imivctl.hxx:161
|
||||
svtools/source/contnr/imivctl.hxx:162
|
||||
SvxIconChoiceCtrl_Impl aCallSelectHdlIdle
|
||||
svtools contnr SvxIconChoiceCtrl_Impl CallSelectHdl
|
||||
svtools/source/dialogs/roadmapwizard.cxx:54
|
||||
svtools/source/contnr/imivctl.hxx:192
|
||||
SvxIconChoiceCtrl_Impl pCurEditedEntry
|
||||
0
|
||||
svtools/source/dialogs/roadmapwizard.cxx:55
|
||||
svt::RoadmapWizardImpl pRoadmap
|
||||
0
|
||||
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx:44
|
||||
@ -559,6 +592,12 @@ sw/inc/viewopt.hxx:189
|
||||
sw/source/core/bastyp/calc.cxx:95
|
||||
CalcOp eOp
|
||||
0
|
||||
sw/source/core/doc/tblrwcl.cxx:100
|
||||
CR_SetBoxWidth pUndo
|
||||
0
|
||||
sw/source/core/doc/tblrwcl.cxx:174
|
||||
CR_SetLineHeight pUndo
|
||||
0
|
||||
sw/source/core/docnode/threadmanager.hxx:125
|
||||
ThreadManager maStartNewThreadIdle
|
||||
SW ThreadManager StartNewThreadIdle
|
||||
@ -568,28 +607,28 @@ sw/source/core/inc/UndoSort.hxx:38
|
||||
sw/source/filter/inc/rtf.hxx:30
|
||||
RTFSurround::(anonymous union)::(anonymous) nJunk
|
||||
0
|
||||
sw/source/filter/ww8/ww8par3.cxx:323
|
||||
sw/source/filter/ww8/ww8par3.cxx:335
|
||||
WW8LST bSimpleList
|
||||
1
|
||||
sw/source/filter/ww8/ww8par3.cxx:324
|
||||
sw/source/filter/ww8/ww8par3.cxx:336
|
||||
WW8LST bRestartHdn
|
||||
1
|
||||
sw/source/filter/ww8/ww8par3.cxx:356
|
||||
sw/source/filter/ww8/ww8par3.cxx:368
|
||||
WW8LVL bV6Prev
|
||||
1
|
||||
sw/source/filter/ww8/ww8par3.cxx:357
|
||||
sw/source/filter/ww8/ww8par3.cxx:369
|
||||
WW8LVL bV6PrSp
|
||||
1
|
||||
sw/source/filter/ww8/ww8par3.cxx:358
|
||||
sw/source/filter/ww8/ww8par3.cxx:370
|
||||
WW8LVL bV6
|
||||
1
|
||||
sw/source/filter/ww8/ww8par.hxx:659
|
||||
sw/source/filter/ww8/ww8par.hxx:660
|
||||
WW8FormulaControl mfUnknown
|
||||
0
|
||||
sw/source/filter/ww8/ww8par.hxx:668
|
||||
sw/source/filter/ww8/ww8par.hxx:667
|
||||
WW8FormulaControl mhpsCheckBox
|
||||
20
|
||||
sw/source/filter/ww8/ww8par.hxx:1011
|
||||
sw/source/filter/ww8/ww8par.hxx:1013
|
||||
WW8TabBandDesc mbHasSpacing
|
||||
1
|
||||
sw/source/filter/ww8/ww8scan.hxx:1166
|
||||
@ -601,7 +640,7 @@ sw/source/filter/ww8/ww8scan.hxx:1516
|
||||
sw/source/filter/ww8/ww8scan.hxx:1517
|
||||
WW8Fib m_lcbHplxsdr
|
||||
0
|
||||
sw/source/filter/ww8/ww8struc.hxx:892
|
||||
sw/source/filter/ww8/ww8struc.hxx:893
|
||||
WW8_TablePos nSp37
|
||||
2
|
||||
sw/source/ui/envelp/labfmt.hxx:67
|
||||
@ -622,6 +661,9 @@ sw/source/uibase/inc/srcedtw.hxx:87
|
||||
sw/source/uibase/inc/unotools.hxx:63
|
||||
SwOneExampleFrame m_aLoadedIdle
|
||||
sw uibase SwOneExampleFrame Loaded
|
||||
unotools/source/config/extendedsecurityoptions.cxx:88
|
||||
SvtExtendedSecurityOptions_Impl m_aSecureExtensionsSetName
|
||||
SecureExtensions
|
||||
unotools/source/config/saveopt.cxx:77
|
||||
SvtSaveOptions_Impl bROUserAutoSave
|
||||
0
|
||||
@ -718,12 +760,9 @@ vcl/source/gdi/dibtools.cxx:117
|
||||
vcl/source/gdi/dibtools.cxx:118
|
||||
(anonymous namespace)::DIBV5Header nV5Reserved
|
||||
0
|
||||
vcl/source/gdi/pdfwriter_impl.hxx:741
|
||||
vcl/source/gdi/pdfwriter_impl.hxx:740
|
||||
vcl::PDFWriterImpl m_DocDigest
|
||||
0
|
||||
vcl/source/window/cursor.cxx:39
|
||||
ImplCursorData mnPixSlant
|
||||
0
|
||||
writerfilter/source/dmapper/SettingsTable.cxx:239
|
||||
writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
|
||||
3
|
||||
|
||||
@ -442,10 +442,6 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
|
||||
|
||||
struct CuiConfigGroupBoxResource_Impl
|
||||
{
|
||||
OUString m_hdImage;
|
||||
OUString m_libImage;
|
||||
OUString m_macImage;
|
||||
OUString m_docImage;
|
||||
OUString m_sMyMacros;
|
||||
OUString m_sProdMacros;
|
||||
OUString m_sMacros;
|
||||
@ -456,10 +452,6 @@ struct CuiConfigGroupBoxResource_Impl
|
||||
};
|
||||
|
||||
CuiConfigGroupBoxResource_Impl::CuiConfigGroupBoxResource_Impl() :
|
||||
m_hdImage(RID_CUIBMP_HARDDISK),
|
||||
m_libImage(RID_CUIBMP_LIB),
|
||||
m_macImage(RID_CUIBMP_MACRO),
|
||||
m_docImage(RID_CUIBMP_DOC),
|
||||
m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)),
|
||||
m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
|
||||
m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)),
|
||||
@ -1493,7 +1485,7 @@ OUString CuiConfigGroupListBox::GetImage(
|
||||
{
|
||||
if (node->getName() == "user" || node->getName() == "share" )
|
||||
{
|
||||
aImage = xImp->m_hdImage;
|
||||
aImage = RID_CUIBMP_HARDDISK;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1530,16 +1522,16 @@ OUString CuiConfigGroupListBox::GetImage(
|
||||
}
|
||||
else
|
||||
{
|
||||
aImage = xImp->m_docImage;
|
||||
aImage = RID_CUIBMP_DOC;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
|
||||
aImage = xImp->m_macImage;
|
||||
aImage = RID_CUIBMP_MACRO;
|
||||
else
|
||||
aImage = xImp->m_libImage;
|
||||
aImage = RID_CUIBMP_LIB;
|
||||
}
|
||||
return aImage;
|
||||
}
|
||||
|
||||
@ -228,7 +228,7 @@ class CuiConfigGroupListBox
|
||||
SfxStylesInfo_Impl* m_pStylesInfo;
|
||||
std::unique_ptr<weld::TreeView> m_xTreeView;
|
||||
|
||||
OUString GetImage(
|
||||
static OUString GetImage(
|
||||
const css::uno::Reference< css::script::browse::XBrowseNode >& node,
|
||||
css::uno::Reference< css::uno::XComponentContext > const & xCtx,
|
||||
bool bIsRootNode);
|
||||
|
||||
@ -139,9 +139,6 @@ OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
|
||||
const Reference< XAttributeList > & xAttrList,
|
||||
const bool bTempAutoStyles )
|
||||
: SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList )
|
||||
, sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))
|
||||
, sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))
|
||||
, sCellStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))
|
||||
, m_nNumberFormatIndex(-1)
|
||||
, m_nMasterPageNameIndex(-1)
|
||||
, bAutoStyles(bTempAutoStyles)
|
||||
@ -238,13 +235,13 @@ OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
|
||||
switch( nFamily )
|
||||
{
|
||||
case XML_STYLE_FAMILY_TABLE_TABLE:
|
||||
sServiceName = sTableStyleServiceName;
|
||||
sServiceName = XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME;
|
||||
break;
|
||||
case XML_STYLE_FAMILY_TABLE_COLUMN:
|
||||
sServiceName = sColumnStyleServiceName;
|
||||
sServiceName = XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME;
|
||||
break;
|
||||
case XML_STYLE_FAMILY_TABLE_CELL:
|
||||
sServiceName = sCellStyleServiceName;
|
||||
sServiceName = XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME;
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
@ -71,9 +71,6 @@ namespace dbaxml
|
||||
|
||||
class OTableStylesContext : public SvXMLStylesContext
|
||||
{
|
||||
const OUString sTableStyleServiceName;
|
||||
const OUString sColumnStyleServiceName;
|
||||
const OUString sCellStyleServiceName;
|
||||
sal_Int32 m_nNumberFormatIndex;
|
||||
sal_Int32 m_nMasterPageNameIndex;
|
||||
bool bAutoStyles : 1;
|
||||
|
||||
@ -32,9 +32,6 @@ namespace util {
|
||||
|
||||
class VCL_DLLPUBLIC ExtTextEngine : public TextEngine
|
||||
{
|
||||
private:
|
||||
OUString const maGroupChars;
|
||||
|
||||
public:
|
||||
ExtTextEngine();
|
||||
virtual ~ExtTextEngine() override;
|
||||
|
||||
@ -56,7 +56,6 @@ class ImplTestView : public TestView,
|
||||
basegfx::B1DRange maPriority;
|
||||
bool mbIsClipSet;
|
||||
bool mbIsClipEmptied;
|
||||
bool mbIsClearCalled;
|
||||
bool mbDisposed;
|
||||
|
||||
|
||||
@ -69,7 +68,6 @@ public:
|
||||
maPriority(),
|
||||
mbIsClipSet(false),
|
||||
mbIsClipEmptied(false),
|
||||
mbIsClearCalled(false),
|
||||
mbDisposed( false )
|
||||
{
|
||||
}
|
||||
@ -143,7 +141,7 @@ public:
|
||||
// TestView
|
||||
virtual bool isClearCalled() const override
|
||||
{
|
||||
return mbIsClearCalled;
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual std::vector<std::pair<basegfx::B2DVector,double> > getCreatedSprites() const override
|
||||
|
||||
@ -116,8 +116,6 @@ struct inclist {
|
||||
boolean i_notified; /* whether we have revealed includes */
|
||||
boolean i_marked; /* whether it's in the makefile */
|
||||
boolean i_searched; /* whether we have read this */
|
||||
boolean i_included_sym; /* whether #include SYMBOL was found */
|
||||
/* Can't use i_list if TRUE */
|
||||
};
|
||||
|
||||
struct filepointer {
|
||||
|
||||
@ -56,7 +56,7 @@ struct inclist *inc_path(char *file, char *include, boolean dot, struct Includes
|
||||
* has already been expanded.
|
||||
*/
|
||||
for (ip = inclist; ip->i_file; ip++)
|
||||
if ((strcmp(ip->i_incstring, include) == 0) && !ip->i_included_sym)
|
||||
if (strcmp(ip->i_incstring, include) == 0)
|
||||
{
|
||||
found = TRUE;
|
||||
break;
|
||||
@ -284,7 +284,6 @@ struct inclist *newinclude(char const *newfile, char const *incstring)
|
||||
if (inclistp == inclist + MAXFILES - 1)
|
||||
fatalerr("out of space: increase MAXFILES\n");
|
||||
ip->i_file = copy(newfile);
|
||||
ip->i_included_sym = FALSE;
|
||||
if (incstring == NULL)
|
||||
ip->i_incstring = ip->i_file;
|
||||
else
|
||||
@ -312,10 +311,9 @@ void included_by(struct inclist *ip, struct inclist *newfile)
|
||||
for (i=0; i<ip->i_listlen; i++)
|
||||
if (ip->i_list[ i ] == newfile) {
|
||||
i = (int)strlen(newfile->i_file);
|
||||
if (!ip->i_included_sym &&
|
||||
!(i > 2 &&
|
||||
newfile->i_file[i-1] == 'c' &&
|
||||
newfile->i_file[i-2] == '.'))
|
||||
if (!(i > 2 &&
|
||||
newfile->i_file[i-1] == 'c' &&
|
||||
newfile->i_file[i-2] == '.'))
|
||||
{
|
||||
/* only complain if ip has */
|
||||
/* no #include SYMBOL lines */
|
||||
|
||||
@ -188,7 +188,6 @@ class SvxIconChoiceCtrl_Impl
|
||||
LocalFocus aFocus; // Data for focusrect
|
||||
::vcl::AccessibleFactoryAccess aAccFactory;
|
||||
|
||||
SvxIconChoiceCtrlEntry* pCurEditedEntry;
|
||||
SvxIconChoiceCtrlTextMode eTextMode;
|
||||
SelectionMode eSelectionMode;
|
||||
sal_Int32 nSelectionCount;
|
||||
@ -422,7 +421,6 @@ public:
|
||||
SvxIconChoiceCtrlEntry* pEntry
|
||||
);
|
||||
#endif
|
||||
bool IsEntryEditing() const { return (pCurEditedEntry!=nullptr); }
|
||||
size_t GetEntryCount() const { return aEntries.size(); }
|
||||
SvxIconChoiceCtrlEntry* GetEntry( size_t nPos )
|
||||
{
|
||||
|
||||
@ -68,7 +68,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
|
||||
{
|
||||
bChooseWithCursor = false;
|
||||
pEntryPaintDev = nullptr;
|
||||
pCurEditedEntry = nullptr;
|
||||
pCurHighlightFrame = nullptr;
|
||||
pAnchor = nullptr;
|
||||
pHdlEntry = nullptr;
|
||||
@ -124,7 +123,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
|
||||
|
||||
SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
|
||||
{
|
||||
pCurEditedEntry = nullptr;
|
||||
Clear(false);
|
||||
CancelUserEvents();
|
||||
pImpCursor.reset();
|
||||
|
||||
@ -285,11 +285,7 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
|
||||
}
|
||||
bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
|
||||
{
|
||||
// under OS/2, we get key up/down even while editing
|
||||
if( _pImpl->IsEntryEditing() )
|
||||
return true;
|
||||
bool bHandled = _pImpl->KeyInput( rKEvt );
|
||||
return bHandled;
|
||||
return _pImpl->KeyInput( rKEvt );
|
||||
}
|
||||
sal_Int32 SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const
|
||||
{
|
||||
|
||||
@ -97,14 +97,13 @@ struct CR_SetBoxWidth
|
||||
{
|
||||
SwShareBoxFormats aShareFormats;
|
||||
SwTableNode* pTableNd;
|
||||
SwUndoTableNdsChg* pUndo;
|
||||
SwTwips nDiff, nSide, nMaxSize, nLowerDiff;
|
||||
TableChgMode nMode;
|
||||
bool bBigger, bLeft;
|
||||
|
||||
CR_SetBoxWidth( TableChgWidthHeightType eType, SwTwips nDif, SwTwips nSid,
|
||||
SwTwips nMax, SwTableNode* pTNd )
|
||||
: pTableNd( pTNd ), pUndo( nullptr ),
|
||||
: pTableNd( pTNd ),
|
||||
nDiff( nDif ), nSide( nSid ), nMaxSize( nMax ), nLowerDiff( 0 )
|
||||
{
|
||||
bLeft = TableChgWidthHeightType::ColLeft == extractPosition( eType ) ||
|
||||
@ -114,7 +113,6 @@ struct CR_SetBoxWidth
|
||||
}
|
||||
CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
|
||||
: pTableNd( rCpy.pTableNd ),
|
||||
pUndo( rCpy.pUndo ),
|
||||
nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
|
||||
nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
|
||||
nMode( rCpy.nMode ),
|
||||
@ -171,20 +169,19 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
|
||||
struct CR_SetLineHeight
|
||||
{
|
||||
SwTableNode* pTableNd;
|
||||
SwUndoTableNdsChg* pUndo;
|
||||
SwTwips nMaxSpace, nMaxHeight;
|
||||
TableChgMode nMode;
|
||||
bool bBigger;
|
||||
|
||||
CR_SetLineHeight( TableChgWidthHeightType eType, SwTableNode* pTNd )
|
||||
: pTableNd( pTNd ), pUndo( nullptr ),
|
||||
: pTableNd( pTNd ),
|
||||
nMaxSpace( 0 ), nMaxHeight( 0 )
|
||||
{
|
||||
bBigger = bool(eType & TableChgWidthHeightType::BiggerMode );
|
||||
nMode = pTableNd->GetTable().GetTableChgMode();
|
||||
}
|
||||
CR_SetLineHeight( const CR_SetLineHeight& rCpy )
|
||||
: pTableNd( rCpy.pTableNd ), pUndo( rCpy.pUndo ),
|
||||
: pTableNd( rCpy.pTableNd ),
|
||||
nMaxSpace( rCpy.nMaxSpace ), nMaxHeight( rCpy.nMaxHeight ),
|
||||
nMode( rCpy.nMode ),
|
||||
bBigger( rCpy.bBigger )
|
||||
@ -2559,7 +2556,6 @@ bool SwTable::SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eTyp
|
||||
bRet = false,
|
||||
bLeft = TableChgWidthHeightType::ColLeft == extractPosition( eType ) ||
|
||||
TableChgWidthHeightType::CellLeft == extractPosition( eType );
|
||||
sal_uLong nBoxIdx = rCurrentBox.GetSttIdx();
|
||||
|
||||
// Get the current Box's edge
|
||||
// Only needed for manipulating the width
|
||||
@ -2868,14 +2864,6 @@ bool SwTable::SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eTyp
|
||||
// hand there is a case where sth gets deleted. :-(
|
||||
|
||||
xFndBox.reset();
|
||||
|
||||
if (ppUndo && *ppUndo && aParam.pUndo)
|
||||
{
|
||||
aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(m_eTableChgMode), eType,
|
||||
nAbsDiff, nRelDiff );
|
||||
if( !aParam.bBigger )
|
||||
aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
|
||||
}
|
||||
}
|
||||
|
||||
#if defined DBG_UTIL
|
||||
@ -3011,7 +2999,6 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eTy
|
||||
bRet = false,
|
||||
bTop = TableChgWidthHeightType::CellTop == extractPosition( eType );
|
||||
sal_uInt16 nBaseLinePos = GetTabLines().GetPos( pBaseLine );
|
||||
sal_uLong nBoxIdx = rCurrentBox.GetSttIdx();
|
||||
|
||||
CR_SetLineHeight aParam( eType,
|
||||
const_cast<SwTableNode*>(rCurrentBox.GetSttNd()->FindTableNode()) );
|
||||
@ -3169,14 +3156,6 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eTy
|
||||
// TL_CHART2: it is currently unclear if sth has to be done here.
|
||||
|
||||
xFndBox.reset();
|
||||
|
||||
if (ppUndo && *ppUndo && aParam.pUndo)
|
||||
{
|
||||
aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(m_eTableChgMode), eType,
|
||||
nAbsDiff, nRelDiff );
|
||||
if( bBigger )
|
||||
aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
|
||||
}
|
||||
}
|
||||
|
||||
CHECKTABLELAYOUT
|
||||
|
||||
@ -85,8 +85,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
|
||||
|
||||
static Sequence< OUString > GetPropertyNames();
|
||||
|
||||
OUString const m_aSecureExtensionsSetName;
|
||||
|
||||
SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode;
|
||||
};
|
||||
|
||||
@ -95,7 +93,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
|
||||
SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
|
||||
// Init baseclasses first
|
||||
: ConfigItem ( ROOTNODE_SECURITY )
|
||||
, m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET )
|
||||
, m_eOpenHyperlinkMode(SvtExtendedSecurityOptions::OPEN_NEVER)
|
||||
// Init member then.
|
||||
{
|
||||
@ -127,7 +124,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
|
||||
|
||||
// Enable notification mechanism of our baseclass.
|
||||
// We need it to get information about changes outside these class on our used configuration keys!
|
||||
Sequence<OUString> seqNotifyNames { m_aSecureExtensionsSetName };
|
||||
Sequence<OUString> seqNotifyNames { SECURE_EXTENSIONS_SET };
|
||||
EnableNotification( seqNotifyNames );
|
||||
}
|
||||
|
||||
|
||||
@ -27,7 +27,9 @@
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]"))
|
||||
static const std::wstring gaGroupChars = L"(){}[]";
|
||||
|
||||
ExtTextEngine::ExtTextEngine()
|
||||
{
|
||||
}
|
||||
|
||||
@ -43,14 +45,14 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
|
||||
const sal_uInt32 nParas = GetParagraphCount();
|
||||
if ( ( nPara < nParas ) && ( nPos < GetTextLen( nPara ) ) )
|
||||
{
|
||||
sal_Int32 nMatchIndex = maGroupChars.indexOf( GetText( rCursor.GetPara() )[ nPos ] );
|
||||
if ( nMatchIndex != -1 )
|
||||
size_t nMatchIndex = gaGroupChars.find( GetText( rCursor.GetPara() )[ nPos ] );
|
||||
if ( nMatchIndex != std::wstring::npos )
|
||||
{
|
||||
if ( ( nMatchIndex % 2 ) == 0 )
|
||||
{
|
||||
// search forwards
|
||||
sal_Unicode nSC = maGroupChars[ nMatchIndex ];
|
||||
sal_Unicode nEC = maGroupChars[ nMatchIndex+1 ];
|
||||
sal_Unicode nSC = gaGroupChars[ nMatchIndex ];
|
||||
sal_Unicode nEC = gaGroupChars[ nMatchIndex+1 ];
|
||||
|
||||
sal_Int32 nCur = nPos+1;
|
||||
sal_uInt16 nLevel = 1;
|
||||
@ -85,8 +87,8 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
|
||||
else
|
||||
{
|
||||
// search backwards
|
||||
sal_Unicode nEC = maGroupChars[ nMatchIndex ];
|
||||
sal_Unicode nSC = maGroupChars[ nMatchIndex-1 ];
|
||||
sal_Unicode nEC = gaGroupChars[ nMatchIndex ];
|
||||
sal_Unicode nSC = gaGroupChars[ nMatchIndex-1 ];
|
||||
|
||||
sal_Int32 nCur = rCursor.GetIndex()-1;
|
||||
sal_uInt16 nLevel = 1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user