summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-07-28 09:19:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-28 16:52:20 +0200
commit096168cacc574a71482520e5c3fbd79f975dc6ad (patch)
treef101b976c39e2d4fc7f456510efdce7c4f5c6056
parente8493f9349d18cbcb323930a9bf200c542a72d62 (diff)
loplugin:writeonlyvars
Change-Id: I00b495685cc9f74440051eafa2f8681a050a536e Reviewed-on: https://gerrit.libreoffice.org/76497 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--framework/source/accelerators/presethandler.cxx42
-rw-r--r--sd/source/ui/dlg/BulletAndPositionDlg.cxx13
2 files changed, 0 insertions, 55 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index c40c22cbc5bd..b8b637c5455e 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -436,48 +436,6 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
sRelPathUser = sLocalizedUserPath;
}
- // read content of level 3 (presets, targets)
- css::uno::Sequence< OUString > lNames;
- const OUString* pNames;
- sal_Int32 c;
- sal_Int32 i;
- std::vector<OUString> lPresets;
- std::vector<OUString> lTargets;
-
- // read preset names of share layer
- if (xShare.is())
- {
- lNames = xShare->getElementNames();
- pNames = lNames.getConstArray();
- c = lNames.getLength();
-
- for (i=0; i<c; ++i)
- {
- OUString sTemp = pNames[i];
- sal_Int32 nPos = sTemp.indexOf(".xml");
- if (nPos > -1)
- sTemp = sTemp.copy(0,nPos);
- lPresets.push_back(sTemp);
- }
- }
-
- // read preset names of user layer
- if (xUser.is())
- {
- lNames = xUser->getElementNames();
- pNames = lNames.getConstArray();
- c = lNames.getLength();
-
- for (i=0; i<c; ++i)
- {
- OUString sTemp = pNames[i];
- sal_Int32 nPos = sTemp.indexOf(".xml");
- if (nPos > -1)
- sTemp = sTemp.copy(0,nPos);
- lTargets.push_back(sTemp);
- }
- }
-
{
SolarMutexGuard g;
m_xWorkingStorageShare = xShare;
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 265274c1ff4d..dd811411d493 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -448,9 +448,6 @@ void SvxBulletAndPositionDlg::InitControls()
bool bSameStart = true;
bool bSamePrefix = true;
bool bSameSuffix = true;
- bool bAllLevel = true;
- bool bSameCharFmt = true;
- bool bSameVOrient = true;
bool bSameSize = true;
bool bSameBulColor = true;
bool bSameBulRelSize = true;
@@ -460,13 +457,10 @@ void SvxBulletAndPositionDlg::InitControls()
const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM];
OUString sFirstCharFmt;
- sal_Int16 eFirstOrient = text::VertOrientation::NONE;
SvxAdjust eFirstAdjust = SvxAdjust::Left;
Size aFirstSize(0, 0);
sal_uInt16 nMask = 1;
sal_uInt16 nLvl = SAL_MAX_UINT16;
- sal_uInt16 nHighestLevel = 0;
- (void)nHighestLevel;
bool bBullColor = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_COLOR);
bool bBullRelSize = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_REL_SIZE);
@@ -483,7 +477,6 @@ void SvxBulletAndPositionDlg::InitControls()
{
nLvl = i;
sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
- eFirstOrient = aNumFmtArr[i]->GetVertOrient();
if (bShowBitmap)
aFirstSize = aNumFmtArr[i]->GetGraphicSize();
}
@@ -495,10 +488,6 @@ void SvxBulletAndPositionDlg::InitControls()
bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
- bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels()
- == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
- bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
- bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
//bSameAdjust &= eFirstAdjust == aNumFmtArr[i]->GetNumAdjust();
if (bShowBitmap && bSameSize)
bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -510,7 +499,6 @@ void SvxBulletAndPositionDlg::InitControls()
&= aNumFmtArr[i]->GetFirstLineOffset()
== aNumFmtArr[nLvl]->GetFirstLineOffset();
}
- nHighestLevel = i;
}
nMask <<= 1;
@@ -523,7 +511,6 @@ void SvxBulletAndPositionDlg::InitControls()
else
{
nNumberingType = SVX_NUM_NUMBER_NONE;
- bAllLevel = false;
bSameDistBorderNum = false;
bSameIndent = false;
bSameBulRelSize = false;