compilerplugins/clang/unusedfields.py | 53 ++++++-----
cui/source/dialogs/screenshotannotationdlg.cxx | 13 --
cui/source/inc/cuitabarea.hxx | 1
cui/source/tabpages/tparea.cxx | 1
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/eschesdo.hxx | 3
framework/source/fwe/classes/addonmenu.cxx | 19 +--
include/framework/addonmenu.hxx | 9 -
include/svx/nbdtmg.hxx | 7 -
include/vcl/fltcall.hxx | 4
sc/source/filter/excel/impop.cxx | 9 -
sc/source/filter/excel/namebuff.cxx | 12 +-
sc/source/filter/inc/namebuff.hxx | 9 -
sc/source/filter/oox/worksheethelper.cxx | 1
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sd/source/ui/dlg/TemplateScanner.cxx | 4
sfx2/source/inc/objshimp.hxx | 6 -
svtools/source/filter/SvFilterOptionsDialog.cxx | 5 -
svx/inc/sdr/overlay/overlayhandle.hxx | 4
svx/source/form/dataaccessdescriptor.cxx | 31 ++----
svx/source/sdr/overlay/overlayhandle.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 10 +-
svx/source/svdraw/svdhdl.cxx | 2
sw/source/uibase/sidebar/PageStylesPanel.hxx | 1
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 1
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 1
ucbhelper/source/provider/resultsetmetadata.cxx | 7 -
vcl/inc/svdata.hxx | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 +--
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 5 -
30 files changed, 97 insertions(+), 148 deletions(-)
New commits:
commit b18e1bc61ccba9d0c74274e2fe45b2b422c601cf
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 20 12:13:42 2016 +0200
loplugin:unusedfields
Change-Id: I852e98b16fdcb88b04e39d11e3101d502c918c24
Reviewed-on: https://gerrit.libreoffice.org/29078
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.py
b/compilerplugins/clang/unusedfields.py
index c3b5145..be5a5ca 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -10,10 +10,6 @@ definitionToTypeMap = dict()
callSet = set()
readFromSet = set()
sourceLocationSet = set()
-# things we need to exclude for reasons like :
-# - it's a weird template thingy that confuses the plugin
-exclusionSet = set([
- ])
# clang does not always use exactly the same numbers in the type-parameter
vars it generates
# so I need to substitute them to ensure we can match correctly.
@@ -27,18 +23,24 @@ with io.open("loplugin.unusedfields.log", "rb",
buffering=1024*1024) as txt:
for line in txt:
tokens = line.strip().split("\t")
if tokens[0] == "definition:":
- funcInfo = (normalizeTypeParams(tokens[1]), tokens[2])
- definitionSet.add(funcInfo)
- definitionToTypeMap[funcInfo] = tokens[3]
- definitionToSourceLocationMap[funcInfo] = tokens[4]
+ fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+ definitionSet.add(fieldInfo)
+ definitionToTypeMap[fieldInfo] = tokens[3]
+ definitionToSourceLocationMap[fieldInfo] = tokens[4]
elif tokens[0] == "touch:":
- callInfo = (normalizeTypeParams(tokens[1]), tokens[2])
- callSet.add(callInfo)
+ if len(tokens) == 3:
+ callInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+ callSet.add(callInfo)
+ else:
+ callInfo = (normalizeTypeParams(tokens[1]), "")
+ callSet.add(callInfo)
elif tokens[0] == "read:":
- idx1 = line.find("\t",6)
- readInfo = (normalizeTypeParams(tokens[1]), tokens[2])
- readFromSet.add(readInfo)
-
+ if len(tokens) == 3:
+ readInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+ readFromSet.add(readInfo)
+ else:
+ readInfo = (normalizeTypeParams(tokens[1]), "")
+ readFromSet.add(readInfo)
# Invert the definitionToSourceLocationMap
# If we see more than one method at the same sourceLocation, it's being
autogenerated as part of a template
# and we should just ignore
@@ -53,9 +55,6 @@ for k, definitions in
sourceLocationToDefinitionMap.iteritems():
untouchedSet = set()
for d in definitionSet:
- clazz = d[0] + " " + d[1]
- if clazz in exclusionSet:
- continue
if d in callSet:
continue
srcLoc = definitionToSourceLocationMap[d];
@@ -86,9 +85,22 @@ for d in definitionSet:
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")
or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
+ or srcLoc.startswith("hwpfilter/")
+ or srcLoc.startswith("embeddedobj/source/inc/")
or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")):
+ or srcLoc.startswith("bridges/")):
+ continue
+ if d[0] in set([ "AtkObjectWrapperClass", "AtkObjectWrapper", "GLOMenu",
"GLOAction", "_XRegion", "SalMenuButtonItem", "Vertex",
+ "OOoMountOperationClass", "SwCSS1ItemIds", "ScCompiler::AddInMap",
"MemoryByteGrabber", "textcat_t", "fp_t", "ngram_t",
+ "ImplPPTParaPropSet", "DataNode"]):
continue
- untouchedSet.add((clazz + " " + definitionToTypeMap[d], srcLoc))
+ # unit testing code
+ if (srcLoc.startswith("cppu/source/uno/check.cxx"):
+ continue
+ fieldType = definitionToTypeMap[d]
+ if fieldType in set([ "class rptui::OModuleClient" ]):
+ continue
+ untouchedSet.add((d[0] + " " + d[1] + " " + fieldType, srcLoc))
writeonlySet = set()
for d in definitionSet:
@@ -147,9 +159,4 @@ with open("loplugin.unusedfields.report-writeonly", "wt")
as f:
f.write( t[1] + "\n" )
f.write( " " + t[0] + "\n" )
-
-
-# add an empty line at the end to make it easier for the unusedFieldsremove
plugin to mmap() the output file
-print
-
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx
b/cui/source/dialogs/screenshotannotationdlg.cxx
index 4c13a28..f8f693e 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -43,11 +43,8 @@ using namespace com::sun::star;
class ControlDataEntry
{
public:
- ControlDataEntry(
- const vcl::Window& rControl,
- const basegfx::B2IRange& rB2IRange)
- : mrControl(rControl),
- maB2IRange(rB2IRange)
+ ControlDataEntry(const basegfx::B2IRange& rB2IRange)
+ : maB2IRange(rB2IRange)
{
}
@@ -57,7 +54,6 @@ public:
}
private:
- const vcl::Window& mrControl;
basegfx::B2IRange maB2IRange;
};
@@ -225,10 +221,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
if (!aCurrentRange.isEmpty())
{
- rControlDataCollection.push_back(
- ControlDataEntry(
- rCurrent,
- aCurrentRange));
+ rControlDataCollection.push_back(ControlDataEntry(aCurrentRange));
}
for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 7486f7a..ef7ca4c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -221,7 +221,6 @@ private:
VclPtr<SvxXRectPreview> m_pCtlXRectPreview;
const SfxItemSet& m_rOutAttrs;
- RectPoint m_eRP;
XColorListRef m_pColorList;
XGradientListRef m_pGradientList;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ff8360f..e0caa7e 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -72,7 +72,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const
SfxItemSet& rInAttrs
"cui/ui/areatabpage.ui",
rInAttrs ),
m_rOutAttrs (rInAttrs ),
- m_eRP( RectPoint::LT ),
m_pColorList( nullptr ),
m_pGradientList( nullptr ),
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 7aa8083..0eb7c28 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -68,7 +68,6 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
, maMapModeDest( MAP_INCH, Point(), Fraction( 1, EES_MAP_FRACTION ),
Fraction( 1, EES_MAP_FRACTION ) )
, mpPicStrm(nullptr)
, mpHostAppData(nullptr)
- , mnPagesWritten(0)
, mbIsTitlePossible(false)
{
}
@@ -832,7 +831,6 @@ void ImplEESdrWriter::ImplWritePage(
ImplWriteShape( aObj, rSolverContainer );
}
}
- mnPagesWritten++;
}
ImplEscherExSdr::ImplEscherExSdr( EscherEx& rEx )
diff --git a/filter/source/msfilter/eschesdo.hxx
b/filter/source/msfilter/eschesdo.hxx
index 351d288..da24e94 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -111,7 +111,6 @@ protected:
MapMode maMapModeSrc;
MapMode maMapModeDest;
- css::uno::Reference< css::task::XStatusIndicator > mXStatusIndicator;
css::uno::Reference< css::drawing::XDrawPage > mXDrawPage;
css::uno::Reference< css::drawing::XShapes > mXShapes;
@@ -121,8 +120,6 @@ protected:
EscherExHostAppData* mpHostAppData;
- sal_uInt32 mnPagesWritten;
-
bool mbIsTitlePossible;
diff --git a/framework/source/fwe/classes/addonmenu.cxx
b/framework/source/fwe/classes/addonmenu.cxx
index 09176d5..ebfcb0a 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -46,8 +46,7 @@ const sal_uInt16 SID_HELPMENU = (SID_SFX_START +
410);
namespace framework
{
-AddonMenu::AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame
) :
- m_xFrame( rFrame )
+AddonMenu::AddonMenu()
{
}
@@ -62,8 +61,8 @@ bool AddonPopupMenu::IsCommandURLPrefix( const OUString&
aCmdURL )
return aCmdURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR );
}
-AddonPopupMenu::AddonPopupMenu( const css::uno::Reference< css::frame::XFrame
>& rFrame ) :
- AddonMenu( rFrame )
+AddonPopupMenu::AddonPopupMenu() :
+ AddonMenu()
{
}
@@ -94,12 +93,12 @@ bool AddonMenuManager::HasAddonMenuElements()
}
// Factory method to create different Add-On menu types
-VclPtr<PopupMenu> AddonMenuManager::CreatePopupMenuType( MenuType eMenuType,
const Reference< XFrame >& rFrame )
+VclPtr<PopupMenu> AddonMenuManager::CreatePopupMenuType( MenuType eMenuType )
{
if ( eMenuType == ADDON_MENU )
- return VclPtr<AddonMenu>::Create( rFrame );
+ return VclPtr<AddonMenu>::Create();
else if ( eMenuType == ADDON_POPUPMENU )
- return VclPtr<AddonPopupMenu>::Create( rFrame );
+ return VclPtr<AddonPopupMenu>::Create();
else
return nullptr;
}
@@ -115,7 +114,7 @@ VclPtr<AddonMenu> AddonMenuManager::CreateAddonMenu( const
Reference< XFrame >&
const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries =
aOptions.GetAddonsMenu();
if ( rAddonMenuEntries.getLength() > 0 )
{
- pAddonMenu = static_cast<AddonMenu
*>(AddonMenuManager::CreatePopupMenuType( ADDON_MENU, rFrame ).get());
+ pAddonMenu = static_cast<AddonMenu
*>(AddonMenuManager::CreatePopupMenuType( ADDON_MENU ).get());
::rtl::OUString aModuleIdentifier = GetModuleIdentifier( rContext,
rFrame );
AddonMenuManager::BuildMenu( pAddonMenu, ADDON_MENU, MENU_APPEND,
nUniqueMenuId, rAddonMenuEntries, rFrame, aModuleIdentifier );
@@ -235,7 +234,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const
Reference< XFrame >& rFrame,
AddonMenuManager::IsCorrectContext( aModuleIdentifier,
aContext ))
{
sal_uInt16 nId = nUniqueMenuId++;
- VclPtr<AddonPopupMenu> pAddonPopupMenu =
static_cast<AddonPopupMenu *>(AddonMenuManager::CreatePopupMenuType(
ADDON_POPUPMENU, rFrame ).get());
+ VclPtr<AddonPopupMenu> pAddonPopupMenu =
static_cast<AddonPopupMenu *>(AddonMenuManager::CreatePopupMenuType(
ADDON_POPUPMENU ).get());
AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU,
MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, aModuleIdentifier );
@@ -291,7 +290,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*
pCurrent
VclPtr<PopupMenu> pSubMenu;
if ( aAddonSubMenu.getLength() > 0 )
{
- pSubMenu = AddonMenuManager::CreatePopupMenuType(
nSubMenuType, rFrame );
+ pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType
);
AddonMenuManager::BuildMenu( pSubMenu, nSubMenuType,
MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModuleIdentifier );
// Don't create a menu item for an empty sub menu
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 136aa88..c11eea1 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -37,11 +37,8 @@ namespace framework
class FWE_DLLPUBLIC AddonMenu : public PopupMenu
{
public:
- AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame );
+ AddonMenu();
virtual ~AddonMenu() override;
-
- protected:
- css::uno::Reference< css::frame::XFrame > m_xFrame;
};
class AddonMenuManager;
@@ -57,7 +54,7 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
void SetCommandURL( const OUString& aCmdURL ) {
m_aCommandURL = aCmdURL; }
private:
- AddonPopupMenu( const css::uno::Reference< css::frame::XFrame >&
rFrame );
+ AddonPopupMenu();
OUString m_aCommandURL;
@@ -82,7 +79,7 @@ class FWE_DLLPUBLIC AddonMenuManager
static bool IsCorrectContext(const OUString& rModuleIdentifier, const
OUString& rContext);
// Factory method to create different Add-On menu types
- static VclPtr<PopupMenu> CreatePopupMenuType( MenuType eMenuType,
const css::uno::Reference< css::frame::XFrame >& rFrame );
+ static VclPtr<PopupMenu> CreatePopupMenuType( MenuType eMenuType );
// Create the Add-Ons menu
static VclPtr<AddonMenu> CreateAddonMenu( const css::uno::Reference<
css::frame::XFrame >& rFrame,
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index e598925..855f462 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -181,8 +181,6 @@ class SVX_DLLPUBLIC OutlineSettings_Impl
class SVX_DLLPUBLIC NBOTypeMgrBase
{
- public:
- NBOType eType;
private:
const SfxItemSet* pSet;
MapUnit eCoreUnit;
@@ -193,9 +191,8 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
NBOTypeMgrBase(const NBOTypeMgrBase&) = delete;
public:
- NBOTypeMgrBase(const NBOType aType)
- : eType(aType)
- , pSet(nullptr)
+ NBOTypeMgrBase()
+ : pSet(nullptr)
, eCoreUnit(MAP_TWIP)
, aNumCharFmtName(OUString())
, bIsLoading(false)
diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx
index e5d6ca6..1aba65e 100644
--- a/include/vcl/fltcall.hxx
+++ b/include/vcl/fltcall.hxx
@@ -34,16 +34,14 @@ struct FltCallDialogParameter
{
VclPtr<vcl::Window> pWindow;
- ResMgr* pResMgr;
FieldUnit eFieldUnit;
OUString aFilterExt;
// In and Out PropertySequence for all filter dialogs
css::uno::Sequence< css::beans::PropertyValue > aFilterData;
- FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni
) :
+ FltCallDialogParameter( vcl::Window* pW, FieldUnit eFiUni ) :
pWindow ( pW ),
- pResMgr ( pRsMgr ),
eFieldUnit ( eFiUni ) {};
};
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 510df21..ad28654 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -582,20 +582,19 @@ void ImportExcel::Externname25()
nOpt = aIn.ReaduInt16();
nRes = aIn.ReaduInt32();
- OUString aName( aIn.ReadByteString( false ) );
+ aIn.ReadByteString( false ); // name
if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) )
{// external name
- aName = ScfTools::ConvertToScDefinedName( aName );
- pExcRoot->pExtNameBuff->AddName( aName, mnLastRefIdx );
+ pExcRoot->pExtNameBuff->AddName( mnLastRefIdx );
}
else if( nOpt & 0x0010 )
{// ole link
- pExcRoot->pExtNameBuff->AddOLE( aName, mnLastRefIdx, nRes ); //
nRes is storage ID
+ pExcRoot->pExtNameBuff->AddOLE( mnLastRefIdx, nRes ); // nRes
is storage ID
}
else
{// dde link
- pExcRoot->pExtNameBuff->AddDDE( aName, mnLastRefIdx );
+ pExcRoot->pExtNameBuff->AddDDE( mnLastRefIdx );
}
}
diff --git a/sc/source/filter/excel/namebuff.cxx
b/sc/source/filter/excel/namebuff.cxx
index 3b12910..8947b3b 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -190,22 +190,22 @@ ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) :
{
}
-void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx )
+void ExtNameBuff::AddDDE( sal_Int16 nRefIdx )
{
- ExtName aNew( rName, 0x0001 );
+ ExtName aNew( 0x0001 );
maExtNames[ nRefIdx ].push_back( aNew );
}
-void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32
nStorageId )
+void ExtNameBuff::AddOLE( sal_Int16 nRefIdx, sal_uInt32 nStorageId )
{
- ExtName aNew( rName, 0x0002 );
+ ExtName aNew( 0x0002 );
aNew.nStorageId = nStorageId;
maExtNames[ nRefIdx ].push_back( aNew );
}
-void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx )
+void ExtNameBuff::AddName( sal_Int16 nRefIdx )
{
- ExtName aNew( GetScAddInName( rName ), 0x0004 );
+ ExtName aNew( 0x0004 );
maExtNames[ nRefIdx ].push_back( aNew );
}
diff --git a/sc/source/filter/inc/namebuff.hxx
b/sc/source/filter/inc/namebuff.hxx
index f6d7001..b60a2c4 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -221,11 +221,10 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) :
ExcRoot( p )
struct ExtName
{
- OUString aName;
sal_uInt32 nStorageId;
sal_uInt16 nFlags;
- inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ),
nStorageId( 0 ), nFlags( n ) {}
+ inline ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}
bool IsDDE() const;
bool IsOLE() const;
@@ -236,9 +235,9 @@ class ExtNameBuff : protected XclImpRoot
public:
explicit ExtNameBuff( const XclImpRoot& rRoot );
- void AddDDE( const OUString& rName, sal_Int16 nRefIdx );
- void AddOLE( const OUString& rName, sal_Int16 nRefIdx,
sal_uInt32 nStorageId );
- void AddName( const OUString& rName, sal_Int16 nRefIdx );
+ void AddDDE( sal_Int16 nRefIdx );
+ void AddOLE( sal_Int16 nRefIdx, sal_uInt32 nStorageId );
+ void AddName( sal_Int16 nRefIdx );
const ExtName* GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx )
const;
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 0bdb746..43c8848 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -395,7 +395,6 @@ private:
SheetViewSettings maSheetViewSett; /// View settings for this sheet.
VmlDrawingPtr mxVmlDrawing; /// Collection of all VML shapes.
ExtLst maExtLst; /// List of extended elements
- BiffSheetDrawingPtr mxBiffDrawing; /// Collection of all BIFF/DFF
shapes.
OUString maDrawingPath; /// Path to DrawingML fragment.
OUString maVmlDrawingPath; /// Path to legacy VML drawing
fragment.
awt::Size maDrawPageSize; /// Current size of the
drawing page in 1/100 mm.
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index d5ee45b..6fdad87 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -800,8 +800,6 @@ namespace
{
struct ScVisAreaChanged
{
- const ScIAccessibleViewForwarder* mpViewForwarder;
- explicit ScVisAreaChanged(const ScIAccessibleViewForwarder*
pViewForwarder) : mpViewForwarder(pViewForwarder) {}
void operator() (const ScShapeChild& rAccShapeData) const
{
if (rAccShapeData.mpAccShape.is())
@@ -818,7 +816,7 @@ void ScShapeChildren::VisAreaChanged() const
ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin();
while (aItr != aEndItr)
{
- ScVisAreaChanged aVisAreaChanged(&(aItr->maViewForwarder));
+ ScVisAreaChanged aVisAreaChanged;
std::for_each(aItr->maBackShapes.begin(), aItr->maBackShapes.end(),
aVisAreaChanged);
std::for_each(aItr->maControls.begin(), aItr->maControls.end(),
aVisAreaChanged);
std::for_each(aItr->maForeShapes.begin(), aItr->maForeShapes.end(),
aVisAreaChanged);
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx
b/sd/source/ui/dlg/TemplateScanner.cxx
index 9650894..e0d7902 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -61,16 +61,13 @@ class FolderDescriptor
public:
FolderDescriptor (
int nPriority,
- const OUString& rsTitle,
const OUString& rsContentIdentifier,
const Reference<css::ucb::XCommandEnvironment>& rxFolderEnvironment)
: mnPriority(nPriority),
- msTitle(rsTitle),
msContentIdentifier(rsContentIdentifier),
mxFolderEnvironment(rxFolderEnvironment)
{ }
int mnPriority;
- OUString msTitle;
OUString msContentIdentifier;
// Reference<sdbc::XResultSet> mxFolderResultSet;
Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment;
@@ -336,7 +333,6 @@ TemplateScanner::State TemplateScanner::GatherFolderList()
mpFolderDescriptors->insert(
FolderDescriptor(
Classify(sTitle,sTargetDir),
- sTitle,
aId,
mxFolderEnvironment));
}
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index ca9c81a..bbcf19f 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -37,12 +37,6 @@
namespace svtools { class AsynchronLink; }
class SfxViewFrame;
-struct MarkData_Impl
-{
- OUString aMark;
- OUString aUserData;
- SfxViewFrame* pFrame;
-};
class SfxBasicManagerHolder;
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx
b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 6013aba..0ce7295 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -242,16 +242,13 @@ sal_Int16 SvFilterOptionsDialog::execute()
}
if ( nFormat < nFilterCount )
{
- std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt",
Application::GetSettings().GetUILanguageTag() ));
- FltCallDialogParameter aFltCallDlgPara(
Application::GetDefDialogParent(), pResMgr.get(), meFieldUnit );
+ FltCallDialogParameter aFltCallDlgPara(
Application::GetDefDialogParent(), meFieldUnit );
aFltCallDlgPara.aFilterData = maFilterDataSequence;
aFltCallDlgPara.aFilterExt =
aGraphicFilter.GetExportFormatShortName( nFormat );
bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat )
);
if ( ScopedVclPtrInstance<ExportDialog>( aFltCallDlgPara,
mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat )->Execute() ==
RET_OK )
nRet = ui::dialogs::ExecutableDialogResults::OK;
- pResMgr.reset();
-
// taking the out parameter from the dialog
maFilterDataSequence = aFltCallDlgPara.aFilterData;
}
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx
b/svx/inc/sdr/overlay/overlayhandle.hxx
index 5e916bf..64d6cd4 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -22,7 +22,6 @@ class SVX_DLLPUBLIC OverlayHandle : public
OverlayObjectWithBasePosition
protected:
basegfx::B2DSize maSize;
Color maStrokeColor;
- float mfTransparency;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer
createOverlayObjectPrimitive2DSequence() override;
@@ -31,8 +30,7 @@ public:
OverlayHandle(const basegfx::B2DPoint& rBasePos,
const basegfx::B2DSize& rSize,
Color& rStrokeColor,
- Color& rFillColor,
- float fTransparency = 0.0f);
+ Color& rFillColor);
virtual ~OverlayHandle() override;
};
diff --git a/svx/source/form/dataaccessdescriptor.cxx
b/svx/source/form/dataaccessdescriptor.cxx
index 3004f30..b4ca339 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -37,9 +37,6 @@ namespace svx
{
OUString maName;
DataAccessDescriptorProperty mnHandle;
- css::uno::Type maType;
- sal_Int16 mnAttributes;
- sal_uInt8 mnMemberId;
};
class ODADescriptorImpl
@@ -183,20 +180,20 @@ namespace svx
{
static PropertyMapEntry const s_aDesriptorProperties[] =
{
- { OUString("ActiveConnection"),
DataAccessDescriptorProperty::Connection,
cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("BookmarkSelection"),
DataAccessDescriptorProperty::BookmarkSelection, cppu::UnoType<bool>::get(),
PropertyAttribute::TRANSIENT, 0 },
- { OUString("Column"),
DataAccessDescriptorProperty::ColumnObject,
cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("ColumnName"),
DataAccessDescriptorProperty::ColumnName,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Command"),
DataAccessDescriptorProperty::Command,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("CommandType"),
DataAccessDescriptorProperty::CommandType,
::cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::TRANSIENT, 0 },
- { OUString("Component"),
DataAccessDescriptorProperty::Component,
cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("ConnectionResource"),
DataAccessDescriptorProperty::ConnectionResource,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Cursor"),
DataAccessDescriptorProperty::Cursor,
cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("DataSourceName"),
DataAccessDescriptorProperty::DataSource,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("DatabaseLocation"),
DataAccessDescriptorProperty::DatabaseLocation,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("EscapeProcessing"),
DataAccessDescriptorProperty::EscapeProcessing, cppu::UnoType<bool>::get(),
PropertyAttribute::TRANSIENT, 0 },
- { OUString("Filter"),
DataAccessDescriptorProperty::Filter,
::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Selection"),
DataAccessDescriptorProperty::Selection, cppu::UnoType<Sequence< Any
>>::get(), PropertyAttribute::TRANSIENT, 0 }
+ { OUString("ActiveConnection"),
DataAccessDescriptorProperty::Connection, },
+ { OUString("BookmarkSelection"),
DataAccessDescriptorProperty::BookmarkSelection, },
+ { OUString("Column"),
DataAccessDescriptorProperty::ColumnObject, },
+ { OUString("ColumnName"),
DataAccessDescriptorProperty::ColumnName, },
+ { OUString("Command"),
DataAccessDescriptorProperty::Command, },
+ { OUString("CommandType"),
DataAccessDescriptorProperty::CommandType, },
+ { OUString("Component"),
DataAccessDescriptorProperty::Component, },
+ { OUString("ConnectionResource"),
DataAccessDescriptorProperty::ConnectionResource, },
+ { OUString("Cursor"),
DataAccessDescriptorProperty::Cursor, },
+ { OUString("DataSourceName"),
DataAccessDescriptorProperty::DataSource, },
+ { OUString("DatabaseLocation"),
DataAccessDescriptorProperty::DatabaseLocation, },
+ { OUString("EscapeProcessing"),
DataAccessDescriptorProperty::EscapeProcessing, },
+ { OUString("Filter"),
DataAccessDescriptorProperty::Filter, },
+ { OUString("Selection"),
DataAccessDescriptorProperty::Selection, }
};
for (unsigned i=0; i<SAL_N_ELEMENTS(s_aDesriptorProperties); ++i)
diff --git a/svx/source/sdr/overlay/overlayhandle.cxx
b/svx/source/sdr/overlay/overlayhandle.cxx
index c5f1c0c..0c89165 100644
--- a/svx/source/sdr/overlay/overlayhandle.cxx
+++ b/svx/source/sdr/overlay/overlayhandle.cxx
@@ -47,12 +47,10 @@ primitive2d::Primitive2DContainer
OverlayHandle::createOverlayObjectPrimitive2DS
OverlayHandle::OverlayHandle(const B2DPoint& rBasePos,
const B2DSize& rSize,
Color& rStrokeColor,
- Color& rFillColor,
- float fTransparency)
+ Color& rFillColor)
: OverlayObjectWithBasePosition(rBasePos, rFillColor)
, maSize(rSize)
, maStrokeColor(rStrokeColor)
- , mfTransparency(fTransparency)
{
}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index f0be420..2d4d0a1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -245,7 +245,7 @@ sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ','
',' ',' ',' ',' ',' ','
sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ','
',' ',' '};
BulletsTypeMgr::BulletsTypeMgr()
- : NBOTypeMgrBase(eNBOType::BULLETS)
+ : NBOTypeMgrBase()
{
Init();
}
@@ -495,7 +495,7 @@ vcl::Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex)
}
// Graphic Bullet Type lib
GraphicBulletsTypeMgr::GraphicBulletsTypeMgr()
- : NBOTypeMgrBase(eNBOType::BULLETS)
+ : NBOTypeMgrBase()
{
Init();
}
@@ -717,7 +717,7 @@ MixBulletsSettings_Impl*
MixBulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,n
MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[]
={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr};
MixBulletsTypeMgr::MixBulletsTypeMgr()
- : NBOTypeMgrBase(eNBOType::MIXBULLETS)
+ : NBOTypeMgrBase()
{
Init();
for(sal_Int32 nItem = 0; nItem < DEFAULT_BULLET_TYPES; nItem++ )
@@ -1170,7 +1170,7 @@ bool MixBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
}
// Numbering Type lib
NumberingTypeMgr::NumberingTypeMgr()
- : NBOTypeMgrBase(eNBOType::NUMBERING)
+ : NBOTypeMgrBase()
, pNumberSettingsArr (new NumberSettingsArr_Impl)
{
Init();
@@ -1357,7 +1357,7 @@ bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex)
}
// Multi-level /Outline Type lib
OutlineTypeMgr::OutlineTypeMgr()
- : NBOTypeMgrBase(eNBOType::OUTLINE)
+ : NBOTypeMgrBase()
{
Init();
for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 3216a7f..0ba525c 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -616,7 +616,7 @@ void SdrHdl::CreateB2dIAObject()
default:
break;
}
- pNewOverlayObject = new
sdr::overlay::OverlayHandle(aPosition, aB2DSize, aHandleStrokeColor,
aHandleFillColor, nRotationAngle);
+ pNewOverlayObject = new
sdr::overlay::OverlayHandle(aPosition, aB2DSize, aHandleStrokeColor,
aHandleFillColor);
}
else
{
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx
b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 55aa095..2f82abc 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -82,7 +82,6 @@ private:
::std::unique_ptr<SfxInt16Item> mpPageColumnItem;
::std::unique_ptr<SvxPageItem> mpPageItem;
- ::std::unique_ptr<XFillStyleItem> mpBgFillStyleItem;
::std::unique_ptr<XFillColorItem> mpBgColorItem;
::std::unique_ptr<XFillGradientItem> mpBgGradientItem;
::std::unique_ptr<XFillHatchItem> mpBgHatchItem;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index a5d6406..2862bd9 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -229,7 +229,6 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_eResourceTypeForLocks( UNKNOWN ),
m_pProvider( pProvider ),
- m_rSessionFactory( rSessionFactory ),
m_bTransient( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 8ee5ace..1e02090 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -93,7 +93,6 @@ class Content : public ::ucbhelper::ContentImplHelper,
// resource type for general LOCK method only
ResourceType m_eResourceTypeForLocks;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
- rtl::Reference< DAVSessionFactory > m_rSessionFactory;
bool m_bTransient;
bool m_bCollection;
bool m_bDidGetOrHead;
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx
b/ucbhelper/source/provider/resultsetmetadata.cxx
index 5a6d651..fe36117 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -56,16 +56,13 @@ struct ResultSetMetaData_Impl
osl::Mutex m_aMutex;
std::vector< ::ucbhelper::ResultSetColumnData > m_aColumnData;
bool m_bObtainedTypes;
- bool m_bGlobalReadOnlyValue;
explicit ResultSetMetaData_Impl( sal_Int32 nSize )
- : m_aColumnData( nSize ), m_bObtainedTypes( false ),
- m_bGlobalReadOnlyValue( true ) {}
+ : m_aColumnData( nSize ), m_bObtainedTypes( false ) {}
explicit ResultSetMetaData_Impl(
const std::vector< ::ucbhelper::ResultSetColumnData >& rColumnData )
- : m_aColumnData( rColumnData ), m_bObtainedTypes( false ),
- m_bGlobalReadOnlyValue( false ) {}
+ : m_aColumnData( rColumnData ), m_bObtainedTypes( false ) {}
};
}
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 3836d15..a1a76a1 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -117,7 +117,6 @@ struct ImplSVAppData
OUString* mpToolkitName; // Toolkit Name
Help* mpHelp; // Application help
VclPtr<PopupMenu> mpActivePopupMenu; // Actives
Popup-Menu (in Execute)
- ImplIdleMgr* mpIdleMgr; // Idle-Manager
VclPtr<ImplWheelWindow> mpWheelWindow; // WheelWindow
ImplHotKey* mpFirstHotKey; //
HotKey-Verwaltung
ImplEventHook* mpFirstEventHook; // Event-Hooks
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92b9b96..6dd8a78 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -225,7 +225,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
m_xFrame(xFrame),
m_xStatusIndicator(xStatusIndicator),
m_pMapperStream(nullptr),
- m_aDefaultState(this),
+ m_aDefaultState(),
m_bSkipUnknown(false),
m_aFontIndexes(),
m_aColorTable(),
@@ -3181,9 +3181,8 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool
bHex)
}
}
-RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
- : m_pDocumentImpl(pDocumentImpl),
- nInternalState(RTFInternalState::NORMAL),
+RTFParserState::RTFParserState()
+ : nInternalState(RTFInternalState::NORMAL),
eDestination(Destination::NORMAL),
eFieldStatus(RTFFieldStatus::NONE),
nBorderState(RTFBorderState::NONE),
@@ -3212,7 +3211,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl*
pDocumentImpl)
aPicture(),
aShape(),
aDrawingObject(),
- aFrame(this),
+ aFrame(),
eRunType(RunType::LOCH),
isRightToLeft(false),
nYear(0),
@@ -3237,7 +3236,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl*
pDocumentImpl)
void RTFDocumentImpl::resetFrame()
{
- m_aStates.top().aFrame = RTFFrame(&m_aStates.top());
+ m_aStates.top().aFrame = RTFFrame();
}
RTFColorTableEntry::RTFColorTableEntry()
@@ -3293,9 +3292,8 @@ RTFDrawingObject::RTFDrawingObject()
{
}
-RTFFrame::RTFFrame(RTFParserState* pParserState)
- : m_pDocumentImpl(pParserState->m_pDocumentImpl),
- m_nX(0),
+RTFFrame::RTFFrame()
+ : m_nX(0),
m_nY(0),
m_nW(0),
m_nH(0),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d1b5ca1..10b47ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -195,7 +195,7 @@ private:
Id m_nHRule;
boost::optional<Id> m_oWrap;
public:
- RTFFrame(RTFParserState* pParserState);
+ RTFFrame();
sal_Int16 m_nAnchorType;
/// Convert the stored properties to Sprms
@@ -213,9 +213,8 @@ class RTFDocumentImpl;
class RTFParserState
{
public:
- RTFParserState(RTFDocumentImpl* pDocumentImpl);
+ RTFParserState();
- RTFDocumentImpl* m_pDocumentImpl;
RTFInternalState nInternalState;
Destination eDestination;
RTFFieldStatus eFieldStatus;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
