summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-29 09:09:05 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-30 07:01:41 +0000
commitfbd23182ee1804fd87a13d79a71e231549767408 (patch)
treeba2e1c8af7bcfc71908ae6a1858315e6547b3c73 /sd
parentf160d8c879b7184b2a41f2310a09c0432c14379a (diff)
loplugin:unusedfields
Change-Id: If06fffa8db050df0f9c1c7da6163575bf522382e Reviewed-on: https://gerrit.libreoffice.org/26754 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/anminfo.hxx1
-rw-r--r--sd/source/core/anminfo.cxx2
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx3
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx5
4 files changed, 3 insertions, 8 deletions
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index db2aeb38553b..96cb5a0a8860 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -57,7 +57,6 @@ public:
bool mbSecondSoundOn; ///< for object fading.
bool mbSecondPlayFull; ///< for object fading.
sal_uInt16 mnVerb; ///< for OLE object
- sal_uLong mnPresOrder;
SdrObject& mrObject;
void SetBookmark( const OUString& rBookmark );
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index b62b0ee46368..f0b5f10bd7f4 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -52,7 +52,6 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
mbSecondSoundOn (false),
mbSecondPlayFull (false),
mnVerb (0),
- mnPresOrder (TREELIST_APPEND),
mrObject (rObject)
{
maBlueScreen = RGB_Color(COL_LIGHTMAGENTA);
@@ -82,7 +81,6 @@ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rOb
mbSecondSoundOn (rAnmInfo.mbSecondSoundOn),
mbSecondPlayFull (rAnmInfo.mbSecondPlayFull),
mnVerb (rAnmInfo.mnVerb),
- mnPresOrder (TREELIST_APPEND),
mrObject (rObject)
{
// can not be copied
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 33dcc56e877b..965089423b12 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -357,7 +357,6 @@ TemplateScanner::State TemplateScanner::ScanFolder()
FolderDescriptor aDescriptor (*mpFolderDescriptors->begin());
mpFolderDescriptors->erase(mpFolderDescriptors->begin());
- OUString sTitle (aDescriptor.msTitle);
OUString aId (aDescriptor.msContentIdentifier);
maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext());
@@ -365,7 +364,7 @@ TemplateScanner::State TemplateScanner::ScanFolder()
{
// Scan the folder and insert it into the list of template
// folders.
- mpTemplateDirectory = new TemplateDir (sTitle);
+ mpTemplateDirectory = new TemplateDir;
mpTemplateDirectory->EnableSorting(mbEntrySortingEnabled);
// Continue with scanning all entries in the folder.
eNextState = INITIALIZE_ENTRY_SCAN;
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index eed8d9445bec..3af88714267e 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -72,11 +72,10 @@ private:
class TemplateDir
{
public:
- TemplateDir (const OUString& rsRegion )
- : msRegion(rsRegion), maEntries(),
+ TemplateDir()
+ : maEntries(),
mbSortingEnabled(false), mpEntryCompare(nullptr) {}
- OUString msRegion;
::std::vector<TemplateEntry*> maEntries;
void EnableSorting(bool bSortingEnabled = true);