chart2/source/view/main/ChartView.cxx | 1
codemaker/source/cppumaker/cpputype.cxx | 65 +++++++++-
comphelper/source/misc/configuration.cxx | 7 -
compilerplugins/clang/unusedfields.py | 21 ++-
cui/source/dialogs/pastedlg.cxx | 1
embeddedobj/source/commonembedding/specialobject.cxx | 1
extensions/source/propctrlr/cellbindinghelper.cxx | 1
extensions/source/propctrlr/formcomponenthandler.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4
reportdesign/source/ui/misc/UITools.cxx | 1
sc/source/filter/excel/xichart.cxx | 4
sc/source/filter/xml/xmlexprt.cxx | 1
scripting/source/stringresource/stringresource.cxx | 3
sd/source/ui/accessibility/AccessiblePageShape.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/view/sdview.cxx | 1
sdext/source/presenter/PresenterAccessibility.cxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 1
sfx2/source/dialog/filtergrouping.cxx | 3
sot/source/base/formats.cxx | 1
svtools/source/contnr/imivctl.hxx | 3
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 2
svtools/source/misc/transfer.cxx | 1
svx/inc/galbrws2.hxx | 1
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2
svx/source/dialog/imapwnd.hxx | 6
svx/source/inc/frmselimpl.hxx | 1
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/svdraw/svdocirc.cxx | 1
svx/source/svdraw/svdomeas.cxx | 1
sw/source/core/access/acccontext.hxx | 1
sw/source/core/frmedt/fefly1.cxx | 1
sw/source/uibase/config/cfgitems.cxx | 3
sw/source/uibase/inc/cfgitems.hxx | 2
sw/source/uibase/inc/drawbase.hxx | 3
sw/source/uibase/inc/navipi.hxx | 1
test/source/sheet/xsheetoutline.cxx | 2
tools/source/inet/inetmime.cxx | 6
ucb/source/cacher/cachedcontentresultset.cxx | 14 --
ucb/source/ucp/ftp/ftpcontent.cxx | 1
ucb/source/ucp/ftp/ftpresultsetI.cxx | 3
ucb/source/ucp/ftp/ftpresultsetI.hxx | 1
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 4
ucb/source/ucp/ftp/ftpresultsetbase.hxx | 28 +---
ucbhelper/source/provider/contentidentifier.cxx | 1
unotools/source/config/dynamicmenuoptions.cxx | 1
unoxml/source/dom/notation.cxx | 1
unoxml/source/dom/notation.hxx | 3
uui/source/iahndl.hxx | 1
vcl/source/filter/graphicfilter.cxx | 1
xmlhelp/source/cxxhelp/provider/content.cxx | 2
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 4
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 4
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 3
xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 1
xmloff/source/chart/SchXMLExport.cxx | 1
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/forms/attriblistmerge.hxx | 1
60 files changed, 110 insertions(+), 134 deletions(-)
New commits:
commit a508f639a033cefe10ad78a09d3b3c46c162aad9
Author: Noel Grandin <n...@peralex.com>
Date: Wed Nov 25 17:17:47 2015 +0200
mark UNO structs as SAL_WARN_UNUSED, where possible
Change-Id: Ie3de518f60c9f1313c68df54dbdc1fb2804f1f0d
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 9814f3c..30c19c0 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1735,7 +1735,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
const CreateShapeParam2D
if(2==nDimensionCount)
pSeriesPlotter->setTransformationSceneToScreen(
pVCooSys->getTransformationSceneToScreen() );
//better performance for big data
- awt::Size aCoordinateRegionResolution(1000,1000);
{
//calculate resolution for coordinate system
Sequence<sal_Int32> aCoordinateSystemResolution =
pVCooSys->getCoordinateSystemResolution( rPageSize, m_aPageResolution );
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index a27058d..e4f6fa8 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -201,6 +201,9 @@ protected:
bool passByReference(OUString const & name) const;
+ bool canBeWarnUnused(OUString const & name) const;
+ bool canBeWarnUnused(OUString const & name, int depth) const;
+
OUString resolveOuterTypedefs(OUString const & name) const;
OUString resolveAllTypedefs(OUString const & name) const;
@@ -906,6 +909,61 @@ bool CppuType::passByReference(OUString const & name)
const {
}
}
+bool CppuType::canBeWarnUnused(OUString const & name) const {
+ return canBeWarnUnused(name, 0);
+}
+bool CppuType::canBeWarnUnused(OUString const & name, int depth) const {
+ // prevent infinite recursion and blowing the stack
+ if (depth > 10)
+ return false;
+ OUString aResolvedName = resolveOuterTypedefs(name);
+ switch (m_typeMgr->getSort(aResolvedName)) {
+ case codemaker::UnoType::SORT_BOOLEAN:
+ case codemaker::UnoType::SORT_BYTE:
+ case codemaker::UnoType::SORT_SHORT:
+ case codemaker::UnoType::SORT_UNSIGNED_SHORT:
+ case codemaker::UnoType::SORT_LONG:
+ case codemaker::UnoType::SORT_UNSIGNED_LONG:
+ case codemaker::UnoType::SORT_HYPER:
+ case codemaker::UnoType::SORT_UNSIGNED_HYPER:
+ case codemaker::UnoType::SORT_FLOAT:
+ case codemaker::UnoType::SORT_DOUBLE:
+ case codemaker::UnoType::SORT_CHAR:
+ case codemaker::UnoType::SORT_ENUM_TYPE:
+ case codemaker::UnoType::SORT_STRING:
+ case codemaker::UnoType::SORT_TYPE:
+ return true;
+ case codemaker::UnoType::SORT_PLAIN_STRUCT_TYPE:
+ {
+ rtl::Reference< unoidl::Entity > ent;
+ m_typeMgr->getSort(aResolvedName, &ent);
+ rtl::Reference< unoidl::PlainStructTypeEntity > ent2(
+ dynamic_cast< unoidl::PlainStructTypeEntity * >(ent.get()));
+ if (!ent2->getDirectBase().isEmpty() &&
!canBeWarnUnused(ent2->getDirectBase(), depth+1))
+ return false;
+ for ( const unoidl::PlainStructTypeEntity::Member& rMember :
ent2->getDirectMembers())
+ {
+ if (!canBeWarnUnused(rMember.type, depth+1))
+ return false;
+ }
+ return true;
+ }
+ case codemaker::UnoType::SORT_SEQUENCE_TYPE:
+ {
+ OUString aInnerType = aResolvedName.copy(2);
+ return canBeWarnUnused(aInnerType, depth+1);
+ }
+ case codemaker::UnoType::SORT_ANY:
+ case codemaker::UnoType::SORT_INSTANTIATED_POLYMORPHIC_STRUCT_TYPE:
+ case codemaker::UnoType::SORT_INTERFACE_TYPE:
+ return false;
+ default:
+ throw CannotDumpException(
+ "unexpected entity \"" + name
+ + "\" in call to CppuType::canBeWarnUnused");
+ }
+}
+
OUString CppuType::resolveOuterTypedefs(OUString const & name) const {
for (OUString n(name);;) {
rtl::Reference< unoidl::Entity > ent;
@@ -1811,8 +1869,11 @@ private:
};
void PlainStructType::dumpDeclaration(FileStream & out) {
- out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" << indent()
- << "struct SAL_DLLPUBLIC_RTTI " << id_;
+ out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" <<
indent();
+ out << "struct SAL_DLLPUBLIC_RTTI ";
+ if (canBeWarnUnused(name_))
+ out << "SAL_WARN_UNUSED ";
+ out << id_;
OUString base(entity_->getDirectBase());
if (!base.isEmpty()) {
out << ": public " << codemaker::cpp::scopedCppName(u2b(base));
diff --git a/comphelper/source/misc/configuration.cxx
b/comphelper/source/misc/configuration.cxx
index 8b93ff9..69b4aea 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -128,11 +128,8 @@
comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {}
bool comphelper::detail::ConfigurationWrapper::isReadOnly(OUString const &
path)
const
{
-css::beans::Property SB(access_->getPropertyByHierarchicalName(path));
- return
- (access_->getPropertyByHierarchicalName(path).Attributes
- & css::beans::PropertyAttribute::READONLY)
- != 0;
+ css::beans::Property SB(access_->getPropertyByHierarchicalName(path));
+ return (SB.Attributes & css::beans::PropertyAttribute::READONLY) != 0;
}
css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index ed8c705..eccd83c 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -117,7 +117,6 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const
TransferableDataHelpe
aEnd( ((DataFlavorExVector&)*pFormats).end()
);
while( aIter != aEnd )
{
- css::datatransfer::DataFlavor aFlavor( *aIter );
SotClipboardFormatId nFormat = (*aIter++).mnSotId;
::std::map< SotClipboardFormatId, OUString >::iterator itName =
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx
b/embeddedobj/source/commonembedding/specialobject.cxx
index fe665bf..b9ec0ab 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -138,7 +138,6 @@ awt::Size SAL_CALL
OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect
throw embed::WrongStateException( "The own object has no model!",
static_cast< ::cppu::OWeakObject* >(this)
);
- awt::Size aResult;
return maSize;
}
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx
b/extensions/source/propctrlr/cellbindinghelper.cxx
index 860af6f..e1d8f1a 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -306,7 +306,6 @@ namespace pcr
OSL_ENSURE( xBindingProps.is() || !_rxBinding.is(),
"CellBindingHelper::getAddressFromCellBinding: no property set for the
binding!" );
if ( xBindingProps.is() )
{
- CellAddress aAddress;
bReturn = (bool)( xBindingProps->getPropertyValue(
PROPERTY_BOUND_CELL ) >>= _rAddress );
}
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index c853bcd..f0602f9 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -631,7 +631,7 @@ namespace pcr
sal_Int32 nPropId = m_pInfoService->getPropertyId( _rPropertyName );
DBG_ASSERT( nPropId != -1,
"FormComponentPropertyHandler::convertToPropertyValue: not one of my
properties!!" );
- Property aProperty( impl_getPropertyFromId_throw( nPropId ) );
+ impl_getPropertyFromId_throw( nPropId );
Any aControlValue( _rPropertyValue );
if ( !aControlValue.hasValue() )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 54dae84..31b1912 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1753,7 +1753,6 @@ awt::Point
ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
awt::Point aStartPos( nCascadeIndentX, nCascadeIndentY );
awt::Point aCurrPos( aStartPos );
- awt::Rectangle aRect;
if ( xContainerWindow.is() )
{
@@ -3274,8 +3273,6 @@ throw (uno::RuntimeException, std::exception)
if ( aUIElement.m_xUIElement.is() && xWindow.is() )
{
- awt::Rectangle aRect;
-
bWinFound = true;
uno::Reference< awt::XDockableWindow > xDockWindow( xWindow,
uno::UNO_QUERY );
if ( xDockWindow->isFloating() )
@@ -3590,7 +3587,6 @@ throw (uno::RuntimeException, std::exception)
{
if ( !bDockingInProgress )
{
- awt::Rectangle aRect;
uno::Reference< awt::XDockableWindow > xDockWindow( xWindow,
uno::UNO_QUERY );
if ( xDockWindow->isFloating() )
{
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index 083d42a..fbef47b 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -295,7 +295,6 @@ namespace
{
if ( SfxItemState::SET == _rItemSet.GetItemState(aIt->nWID) &&
xInfo->hasPropertyByName(aIt->sName) )
{
- const beans::Property aProp = xInfo->getPropertyByName(
aIt->sName );
if ( ( aIt->nFlags & beans::PropertyAttribute::READONLY ) !=
beans::PropertyAttribute::READONLY )
{
const SfxPoolItem* pItem = _rItemSet.GetItem(aIt->nWID);
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 75af048..be226cb 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1196,10 +1196,6 @@ void XclImpChText::ConvertTitlePosition( const
XclChTextKey& rTitleKey ) const
sal_Int32 nScRot = XclTools::GetScRotation( GetRotation(), 0 );
double fRad = nScRot * F_PI18000;
double fSin = fabs( sin( fRad ) );
- double fCos = fabs( cos( fRad ) );
- css::awt::Size aBoundSize(
- static_cast< sal_Int32 >( fCos * aTitleSize.Width + fSin *
aTitleSize.Height + 0.5 ),
- static_cast< sal_Int32 >( fSin * aTitleSize.Width + fCos *
aTitleSize.Height + 0.5 ) );
// calculate the title position from the values in the CHTEXT record
css::awt::Point aTitlePos(
CalcHmmFromChartX( maData.maRect.mnX ),
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 25eb603..c000b1d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1309,7 +1309,6 @@ void ScXMLExport::WriteRowContent()
}
if (!bIsFirst)
{
- table::CellAddress aCellAddress;
if (nIndex != -1)
AddAttribute(sAttrStyleName,
*pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle));
if (nPrevValidationIndex > -1)
diff --git a/scripting/source/stringresource/stringresource.cxx
b/scripting/source/stringresource/stringresource.cxx
index 07b7aaf..c539ce7 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1750,9 +1750,6 @@ void StringResourcePersistenceImpl::implScanLocaleNames(
const Sequence< OUStrin
}
else if( !bDefaultFound && aExtension == "default" )
{
- //OUString aName = aInetObj.getBase();
- Locale aLocale;
-
if( checkNamingSceme( aPureName, m_aNameBase, aDefaultLocale ) )
bDefaultFound = true;
}
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx
b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 5e490e06..bc83810 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -95,8 +95,6 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds()
if (xSet.is())
{
uno::Any aValue;
- awt::Point aPosition;
- awt::Size aSize;
aValue = xSet->getPropertyValue ("BorderLeft");
aValue >>= aBoundingBox.X;
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 86634c8..2b510f1 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -201,8 +201,6 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog(
mpViewShell->GetActiveWindow() ));
if ( pDlg )
{
- css::datatransfer::DataFlavor aFlavor;
-
pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, OUString() );
pDlg->Insert( SotClipboardFormatId::LINK_SOURCE, OUString() );
pDlg->Insert( SotClipboardFormatId::DRAWING, OUString() );
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 71c6ce2..8accd2a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -936,7 +936,6 @@ void View::DoConnect(SdrOle2Obj* pObj)
{
// TODO/LEAN: working with visual area can switch object
to running state
Size aDrawSize = aRect.GetSize();
- awt::Size aSz;
MapMode aMapMode( mrDoc.GetScaleUnit() );
Size aObjAreaSize = pObj->GetOrigObjSize( &aMapMode );
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx
b/sdext/source/presenter/PresenterAccessibility.cxx
index 9990473..3ecbbf4 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1019,8 +1019,6 @@ awt::Rectangle SAL_CALL
PresenterAccessible::AccessibleObject::getBounds()
{
ThrowIfDisposed();
- awt::Rectangle aBox;
-
const awt::Point aLocation (GetRelativeLocation());
const awt::Size aSize (GetSize());
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx
b/sdext/source/presenter/PresenterSlideSorter.cxx
index 58e5ebe..3ce9138 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1001,7 +1001,6 @@ void PresenterSlideSorter::PaintPreview (
// Paint a border around the preview.
if (mxPreviewFrame.is())
{
- const geometry::RealRectangle2D aBox (0, 0, aSize.Width, aSize.Height);
const util::Color aFrameColor (0x00000000);
PresenterCanvasHelper::SetDeviceColor(aRenderState, aFrameColor);
rxCanvas->drawPolyPolygon(mxPreviewFrame, aViewState, aRenderState);
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index 61af422..69e9dab 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -546,9 +546,6 @@ namespace sfx2
{
void operator() ( const MapGroupEntry2GroupEntry::value_type&
_rMapEntry )
{
-#ifdef DBG_UTIL
- FilterDescriptor aHaveALook = *_rMapEntry.first;
-#endif
*_rMapEntry.second = *_rMapEntry.first;
}
};
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index a22d3c7..50d347d 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1390,7 +1390,6 @@ static sal_uInt16 GetTransferableAction_Impl(
{
if( rDataFlavorExVector.size() )
{
- DataFlavor aFlavor;
const SotAction_Impl* pArrayStart = pArray;
SotClipboardFormatId nId = pArray->nFormatId;
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index 4979614..77097b7 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -83,8 +83,6 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds()
throw (RuntimeExcept
awt::Rectangle aBounds;
OExternalLockGuard aGuard( this );
- css::awt::Size aSize;
-
if ( m_pHeadBar )
aBounds = AWTRectangle( m_pHeadBar->GetItemRect( sal_uInt16(
m_nIndexInParent ) ) );
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index f9f84be..e8a900d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -603,7 +603,6 @@ void TransferableHelper::AddFormat( const DataFlavor&
rFlavor )
if( bAdd )
{
DataFlavorEx aFlavorEx;
- DataFlavor aObjDescFlavor;
aFlavorEx.MimeType = rFlavor.MimeType;
aFlavorEx.HumanPresentableName = rFlavor.HumanPresentableName;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index e41ae58..d06b788 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1644,7 +1644,6 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject&
rObj ) const
uno::Reference< beans::XPropertySetInfo > xInfo =
xSet->getPropertySetInfo();
if(xInfo->hasPropertyByName( sName ))
{
- beans::Property xProperty = xInfo->getPropertyByName( sName );
aVal = xSet->getPropertyValue( sName );
if( aVal.getValue() && form::FormButtonType_URL ==
*static_cast<form::FormButtonType const *>(aVal.getValue()) )
eType = OBJCNT_URLBUTTON;
diff --git a/test/source/sheet/xsheetoutline.cxx
b/test/source/sheet/xsheetoutline.cxx
index 018be89..406f0cb 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -120,8 +120,6 @@ void XSheetOutline::testShowLevel()
uno::Reference< sheet::XSpreadsheet > aSheet(init(), UNO_QUERY_THROW);
uno::Reference< sheet::XSheetOutline > aSheetOutline(aSheet,
UNO_QUERY_THROW);
- table::CellRangeAddress aLevelRangeAddress;
-
// test columns
table::CellRangeAddress aLevel1 = getAddressFromRangeString(aSheet,
colLevel1);
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index b2f0409..488fecd 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1127,30 +1127,26 @@ Any SAL_CALL CachedContentResultSet
throw UnknownPropertyException();
}
- Property aProp = m_pMyPropSetInfo->getPropertyByName( rPropertyName );
+ m_pMyPropSetInfo->getPropertyByName( rPropertyName );
//throws UnknownPropertyException, if so
Any aValue;
- if( rPropertyName == CCRS_PropertySetInfo
- ::m_aPropertyNameForCount )
+ if( rPropertyName == CCRS_PropertySetInfo::m_aPropertyNameForCount )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
aValue <<= m_nKnownCount;
}
- else if( rPropertyName == CCRS_PropertySetInfo
- ::m_aPropertyNameForFinalCount )
+ else if( rPropertyName ==
CCRS_PropertySetInfo::m_aPropertyNameForFinalCount )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
aValue <<= m_bFinalCount;
}
- else if( rPropertyName == CCRS_PropertySetInfo
- ::m_aPropertyNameForFetchSize )
+ else if( rPropertyName ==
CCRS_PropertySetInfo::m_aPropertyNameForFetchSize )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
aValue <<= m_nFetchSize;
}
- else if( rPropertyName == CCRS_PropertySetInfo
- ::m_aPropertyNameForFetchDirection )
+ else if( rPropertyName ==
CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
aValue <<= m_nFetchDirection;
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index c86d070..fd9ffda 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -889,7 +889,6 @@ static Graphic ImpGetScaledGraphic( const Graphic&
rGraphic, FilterConfigItem& r
if( ( nMode == 1 ) || ( nMode == 2 ) )
{
GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() );
- css::awt::Size aDefaultSize( 10000, 10000 );
Size aNewSize( OutputDevice::LogicToLogic( Size(
nLogicalWidth, nLogicalHeight ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) );
if( aNewSize.Width() && aNewSize.Height() )
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index ac70a8e96..0c7ca7d 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1833,7 +1833,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
std::vector< XMLPropertyState > aPropertyStates;
bool bIs3DChart = false;
- drawing::HomogenMatrix aTransMatrix;
msStringBuffer.setLength( 0 );
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 150b7b1..231b8bc 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2158,7 +2158,6 @@ void XMLShapeExport::ImpExportPolygonShape(
ImpExportNewTrans_FeaturesAndWrite(aTRScale, fTRShear, fTRRotate,
aTRTranslate, nFeatures);
// create and export ViewBox
- awt::Point aPoint(0, 0);
awt::Size aSize(FRound(aTRScale.getX()), FRound(aTRScale.getY()));
SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height);
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX,
aViewBox.GetExportString());
@@ -2620,7 +2619,6 @@ void XMLShapeExport::ImpExportConnectorShape(
fTRRotate, aTRTranslate, pRefPoint);
// fdo#49678: create and export ViewBox
- awt::Point aPoint(0, 0);
awt::Size aSize(FRound(aTRScale.getX()), FRound(aTRScale.getY()));
SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height);
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX,
aViewBox.GetExportString());
commit abc6071b7a8af354a56c91e4caecd8afc79f55cc
Author: Noel Grandin <n...@peralex.com>
Date: Wed Nov 25 14:45:38 2015 +0200
loplugin:unusedfields various
Change-Id: I18f94269a1172cf195ee402384f7144610e1e82d
diff --git a/compilerplugins/clang/unusedfields.py
b/compilerplugins/clang/unusedfields.py
index 9f3f16a..2d51785 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -57,10 +57,24 @@ for d in definitionSet:
if d in callSet:
continue
srcLoc = definitionToSourceLocationMap[d];
- if (srcLoc.startswith("include/")):
- continue
+ # ignore external source code
if (srcLoc.startswith("external/")):
continue
+ # ignore build folder
+ if (srcLoc.startswith("workdir/")):
+ continue
+ # ignore our stable/URE/UNO api
+ if (srcLoc.startswith("include/com/")
+ or srcLoc.startswith("include/cppu/")
+ or srcLoc.startswith("include/cppuhelper/")
+ or srcLoc.startswith("include/osl/")
+ or srcLoc.startswith("include/rtl/")
+ or srcLoc.startswith("include/sal/")
+ or srcLoc.startswith("include/salhelper/")
+ or srcLoc.startswith("include/systools/")
+ or srcLoc.startswith("include/typelib/")
+ or srcLoc.startswith("include/uno/")):
+ continue
# this is all representations of on-disk data structures
if (srcLoc.startswith("sc/source/filter/inc/scflt.hxx")
or srcLoc.startswith("sw/source/filter/ww8/")
@@ -69,7 +83,8 @@ for d in definitionSet:
or srcLoc.startswith("vcl/inc/unx/XIM.h")
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("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
+ or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")):
continue
tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc))
diff --git a/svtools/source/contnr/imivctl.hxx
b/svtools/source/contnr/imivctl.hxx
index 0dfbd0a..31272b7 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -175,10 +175,7 @@ class SvxIconChoiceCtrl_Impl
Size aImageSize;
Size aDefaultTextSize;
Size aOutputSize; // Pixel
- Point aDDLastEntryPos;
Point aDDLastRectPos;
- Point aDDPaintOffs;
- Point aDDStartPos;
VclPtr<SvtIconChoiceCtrl> pView;
IcnCursor_Impl* pImpCursor;
IcnGridMap_Impl* pGridMap;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index e1a9fca..e21cd19 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -115,7 +115,6 @@ private:
VclPtr<GalleryToolBox> maViewBox;
VclPtr<FixedLine> maSeparator;
VclPtr<FixedText> maInfoBar;
- Point maDragStartPos;
sal_uIntPtr mnCurActionPos;
GalleryBrowserMode meMode;
GalleryBrowserMode meLastMode;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 5360a9e..af43b22 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -805,14 +805,12 @@ public:
class EnumFunctor
{
const ExpressionFunct meFunct;
- double mnValue;
ParserContextSharedPtr mxContext;
public:
EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr&
rContext )
: meFunct( eFunct )
- , mnValue( 0 )
, mxContext( rContext )
{
}
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index e405570..7b85f1a 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -43,12 +43,6 @@ struct NotifyInfo
};
-struct NotifyPosSize
-{
- Size aPictureSize;
- Point aMousePos;
-};
-
#define SVD_IMAP_USERDATA 0x0001
const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 073b910..d5abe6b 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -106,7 +106,6 @@ struct FrameSelectorImpl : public Resource
Color maMarkCol; /// Selection marker color.
Color maHCLineCol; /// High contrast line color.
Point maVirDevPos; /// Position of virtual device in the
control.
- Point maMousePos; /// Last mouse pointer position.
FrameBorder maLeft; /// All data of left frame border.
FrameBorder maRight; /// All data of right frame border.
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx
b/svx/source/stbctrls/xmlsecctrl.cxx
index 4c8e9cc..d578582 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -41,8 +41,6 @@ SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl,
SfxUInt16Item );
struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
{
- Point maPos;
- Size maSize;
SignatureState mnState;
Image maImage;
Image maImageBroken;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 0ceaab1..318d140 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -355,7 +355,6 @@ struct ImpCircUser : public SdrDragStatUserData
{
Rectangle aR;
Point aCenter;
- Point aRadius;
Point aP1;
Point aP2;
long nMaxRad;
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 3dc86c4..4fdeeef 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -300,7 +300,6 @@ struct ImpMeasurePoly
ImpLineRec aMainline3; // those in between
ImpLineRec aHelpline1;
ImpLineRec aHelpline2;
- Rectangle aTextRect;
Size aTextSize;
long nLineLen;
long nLineAngle;
diff --git a/sw/source/core/access/acccontext.hxx
b/sw/source/core/access/acccontext.hxx
index e703bf4..cecb010 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -59,7 +59,6 @@ class SwAccessibleContext :
friend class SwAccessibleSelectionHelper;
protected:
- mutable ::osl::Mutex m_ListenerMutex;
mutable ::osl::Mutex m_Mutex;
private:
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index 5852a6d..9812268 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -31,8 +31,7 @@
SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
- SfxPoolItem(_nWhich),
- aIndexBackgrndCol(COL_GRAY)
+ SfxPoolItem(_nWhich)
{
bParagraphEnd =
bTab =
diff --git a/sw/source/uibase/inc/cfgitems.hxx
b/sw/source/uibase/inc/cfgitems.hxx
index 41be165..8c336e8 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -54,8 +54,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
bool bManualBreak :1;
bool bShowHiddenPara :1;
- Color aIndexBackgrndCol;
-
public:
SwDocDisplayItem( sal_uInt16 nWhich =
FN_PARAM_DOCDISP );
SwDocDisplayItem(
diff --git a/sw/source/uibase/inc/drawbase.hxx
b/sw/source/uibase/inc/drawbase.hxx
index 42c3ada..9ba4450 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.hxx
@@ -35,8 +35,7 @@ protected:
SwWrtShell* m_pSh;
VclPtr<SwEditWin> m_pWin;
Point m_aStartPos; // position of BeginCreate
- Point m_aMDPos; // position of MouseButtonDown
- sal_uInt16 m_nSlotId;
+ sal_uInt16 m_nSlotId;
bool m_bCreateObj :1;
bool m_bInsForm :1;
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 761f495..f7153da 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -67,7 +67,6 @@ class SwNavigationPI : public vcl::Window,
OUString m_sContentFileName;
OUString m_aContextArr[3];
OUString m_aStatusArr[4];
- Point m_aBoxBottomLeft; // Pos when Box is at bottom
SfxObjectShellLock *m_pxObjectShell;
SwView *m_pContentView;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 6ed448d..f4bc930 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -467,14 +467,12 @@ struct Parameter
Parameter * m_pNext;
OString m_aAttribute;
OString m_aCharset;
- OString m_aLanguage;
OString m_aValue;
sal_uInt32 m_nSection;
bool m_bExtended;
inline Parameter(Parameter * pTheNext, const OString& rTheAttribute,
const OString& rTheCharset,
- const OString& rTheLanguage,
const OString& rTheValue, sal_uInt32 nTheSection,
bool bTheExtended);
};
@@ -482,13 +480,11 @@ struct Parameter
inline Parameter::Parameter(Parameter * pTheNext,
const OString& rTheAttribute,
const OString& rTheCharset,
- const OString& rTheLanguage,
const OString& rTheValue,
sal_uInt32 nTheSection, bool bTheExtended):
m_pNext(pTheNext),
m_aAttribute(rTheAttribute),
m_aCharset(rTheCharset),
- m_aLanguage(rTheLanguage),
m_aValue(rTheValue),
m_nSection(nTheSection),
m_bExtended(bTheExtended)
@@ -2001,7 +1997,7 @@ sal_Unicode const * scanParameters(sal_Unicode const *
pBegin,
RTL_TEXTENCODING_UTF8);
}
- *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage, aValue,
+ *pPos = new Parameter(*pPos, aAttribute, aCharset, aValue,
nSection, bExtended);
}
return parseParameters(aList, pParameters) ? pParameterBegin : pBegin;
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx
b/ucb/source/ucp/ftp/ftpcontent.cxx
index 03685c7..54166da 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -254,7 +254,6 @@ public:
return new ResultSetI(m_xContext,
m_xProvider,
m_seq,
- m_seqSort,
m_dirvec);
}
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx
b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 424c05d..2456e8a 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -41,9 +41,8 @@ using namespace com::sun::star::sdbc;
ResultSetI::ResultSetI(const Reference<XComponentContext>& rxContext,
const Reference<XContentProvider>& xProvider,
const Sequence<Property>& seqProp,
- const Sequence< NumberedSortingInfo >& seqSort,
const std::vector<FTPDirentry>& dirvec)
- : ResultSetBase(rxContext,xProvider,seqProp,seqSort)
+ : ResultSetBase(rxContext,xProvider,seqProp)
{
for( size_t i = 0; i < dirvec.size(); ++i)
m_aPath.push_back(dirvec[i].m_aURL);
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx
b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index adf2906..3906e84 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
@@ -38,7 +38,6 @@ namespace ftp {
const css::uno::Reference< css::uno::XComponentContext>& rxContext,
const css::uno::Reference< css::ucb::XContentProvider>& xProvider,
const css::uno::Sequence< css::beans::Property >& seq,
- const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort,
const std::vector<FTPDirentry>& dirvec);
private:
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index bd09094..12acee9 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -33,15 +33,13 @@ using namespace com::sun::star;
ResultSetBase::ResultSetBase(
const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< ucb::XContentProvider >& xProvider,
- const uno::Sequence< beans::Property >& seq,
- const uno::Sequence< ucb::NumberedSortingInfo >& seqSort )
+ const uno::Sequence< beans::Property >& seq )
: m_xContext( rxContext ),
m_xProvider( xProvider ),
m_nRow( -1 ),
m_nWasNull( true ),
m_bRowCountFinal( true ),
m_sProperty( seq ),
- m_sSortingInfo( seqSort ),
m_pDisposeEventListeners( nullptr ),
m_pRowCountListeners( nullptr ),
m_pIsFinalListeners( nullptr )
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 1f15110..b98e7f8 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -52,8 +52,7 @@ namespace ftp {
ResultSetBase(const css::uno::Reference< css::uno::XComponentContext
>& rxContext,
const css::uno::Reference< css::ucb::XContentProvider >&
xProvider,
- const css::uno::Sequence< css::beans::Property >& seq,
- const css::uno::Sequence< css::ucb::NumberedSortingInfo
>& seqSort);
+ const css::uno::Sequence< css::beans::Property >& seq);
virtual ~ResultSetBase();
@@ -516,29 +515,26 @@ namespace ftp {
protected:
- css::uno::Reference<
- css::uno::XComponentContext > m_xContext;
- css::uno::Reference<
- css::ucb::XContentProvider > m_xProvider;
+ css::uno::Reference< css::uno::XComponentContext >
+ m_xContext;
+ css::uno::Reference< css::ucb::XContentProvider >
+ m_xProvider;
sal_Int32 m_nRow;
bool m_nWasNull;
bool m_bRowCountFinal;
- typedef std::vector< css::uno::Reference<
- css::ucb::XContentIdentifier > > IdentSet;
- typedef std::vector< css::uno::Reference<
- css::sdbc::XRow > > ItemSet;
- typedef std::vector< OUString >
- PathSet;
+ typedef std::vector< css::uno::Reference<css::ucb::XContentIdentifier
> >
+ IdentSet;
+ typedef std::vector< css::uno::Reference< css::sdbc::XRow > >
+ ItemSet;
+ typedef std::vector< OUString > PathSet;
IdentSet m_aIdents;
ItemSet m_aItems;
PathSet m_aPath;
- css::uno::Sequence<
- css::beans::Property > m_sProperty;
- css::uno::Sequence<
- css::ucb::NumberedSortingInfo > m_sSortingInfo;
+ css::uno::Sequence< css::beans::Property >
+ m_sProperty;
osl::Mutex m_aMutex;
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
diff --git a/ucbhelper/source/provider/contentidentifier.cxx
b/ucbhelper/source/provider/contentidentifier.cxx
index b40f28e..6312453 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -49,7 +49,6 @@ struct ContentIdentifier_Impl
{
OUString m_aContentId;
OUString m_aProviderScheme;
- osl::Mutex m_aMutex;
explicit ContentIdentifier_Impl( const OUString& rURL );
};
diff --git a/unotools/source/config/dynamicmenuoptions.cxx
b/unotools/source/config/dynamicmenuoptions.cxx
index 51baeca..507d4b6 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star::beans;
****************************************************************************************************************-*/
struct SvtDynMenuEntry
{
- OUString sName;
OUString sURL;
OUString sTitle;
OUString sImageIdentifier;
diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx
index f64e31b..9f2aca2 100644
--- a/unoxml/source/dom/notation.cxx
+++ b/unoxml/source/dom/notation.cxx
@@ -32,7 +32,6 @@ namespace DOM
xmlNotationPtr const pNotation)
: CNotation_Base(rDocument, rMutex,
NodeType_NOTATION_NODE, reinterpret_cast<xmlNodePtr>(pNotation))
- , m_aNotationPtr(pNotation)
{
}
diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx
index 323861f..434b1b8 100644
--- a/unoxml/source/dom/notation.hxx
+++ b/unoxml/source/dom/notation.hxx
@@ -38,9 +38,6 @@ namespace DOM
private:
friend class CDocument;
- private:
- xmlNotationPtr m_aNotationPtr;
-
protected:
CNotation(CDocument const& rDocument, ::osl::Mutex const& rMutex,
xmlNotationPtr const pNotation);
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 7aade5b..36a8fb4 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -80,7 +80,6 @@ typedef std::unordered_map< OUString, OUString, OUStringHash
> StringHashMap;
class UUIInteractionHelper
{
private:
- mutable osl::Mutex
m_aPropertyMutex;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::awt::XWindow >
m_xWindowParam;
const OUString
m_aContextParam;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx
b/xmlhelp/source/cxxhelp/provider/content.cxx
index a1411b1..fbffd7a 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -196,7 +196,6 @@ public:
return new ResultSetForRoot( m_xContext,
m_xProvider,
m_seq,
- m_seqSort,
m_aURLParameter,
m_pDatabases );
}
@@ -237,7 +236,6 @@ public:
return new ResultSetForQuery( m_xContext,
m_xProvider,
m_seq,
- m_seqSort,
m_aURLParameter,
m_pDatabases );
}
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index d014aa3..f4ef8fe 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -33,15 +33,13 @@ using namespace com::sun::star;
ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >&
rxContext,
const uno::Reference< ucb::XContentProvider >&
xProvider,
- const uno::Sequence< beans::Property >& seq,
- const uno::Sequence< ucb::NumberedSortingInfo >&
seqSort )
+ const uno::Sequence< beans::Property >& seq )
: m_xContext( rxContext ),
m_xProvider( xProvider ),
m_nRow( -1 ),
m_nWasNull( true ),
m_bRowCountFinal( true ),
m_sProperty( seq ),
- m_sSortingInfo( seqSort ),
m_pDisposeEventListeners( nullptr ),
m_pRowCountListeners( nullptr ),
m_pIsFinalListeners( nullptr )
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 072d18e..c9660f2 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -52,8 +52,7 @@ namespace chelp {
ResultSetBase( const css::uno::Reference< css::uno::XComponentContext
>& rxContext,
const css::uno::Reference< css::ucb::XContentProvider
>& xProvider,
- const css::uno::Sequence< css::beans::Property >& seq,
- const css::uno::Sequence< css::ucb::NumberedSortingInfo
>& seqSort );
+ const css::uno::Sequence< css::beans::Property >& seq );
virtual ~ResultSetBase();
@@ -547,7 +546,6 @@ namespace chelp {
PathSet m_aPath;
css::uno::Sequence< css::beans::Property > m_sProperty;
- css::uno::Sequence< css::ucb::NumberedSortingInfo > m_sSortingInfo;
osl::Mutex m_aMutex;
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 0999298..ea5b78f 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -82,10 +82,9 @@ struct HitItem
ResultSetForQuery::ResultSetForQuery( const uno::Reference<
uno::XComponentContext >& rxContext,
const uno::Reference< XContentProvider
>& xProvider,
const uno::Sequence< beans::Property >&
seq,
- const uno::Sequence< NumberedSortingInfo
>& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases )
- : ResultSetBase( rxContext,xProvider,seq,seqSort ),
+ : ResultSetBase( rxContext,xProvider,seq ),
m_aURLParameter( aURLParameter )
{
Reference< XExtendedTransliteration > xTrans = Transliteration::create(
rxContext );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index 0824613..41952ec 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -39,7 +39,6 @@ namespace chelp {
ResultSetForQuery( const
css::uno::Reference<css::uno::XComponentContext>& rxContext,
const
css::uno::Reference<css::ucb::XContentProvider>& xProvider,
const css::uno::Sequence< css::beans::Property >&
seq,
- const css::uno::Sequence<
css::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 15d568a..197b9de 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -33,10 +33,9 @@ using namespace com::sun::star::ucb;
ResultSetForRoot::ResultSetForRoot( const uno::Reference<
uno::XComponentContext >& rxContext,
const uno::Reference< XContentProvider >&
xProvider,
const uno::Sequence< beans::Property >&
seq,
- const uno::Sequence< NumberedSortingInfo
>& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases )
- : ResultSetBase( rxContext, xProvider,seq,seqSort ),
+ : ResultSetBase( rxContext, xProvider,seq ),
m_aURLParameter( aURLParameter ),
m_pDatabases( pDatabases )
{
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 2c7bb60..3bb96aa 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
@@ -39,7 +39,6 @@ namespace chelp {
ResultSetForRoot( const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
const css::uno::Reference<
css::ucb::XContentProvider >& xProvider,
const css::uno::Sequence< css::beans::Property >&
seq,
- const css::uno::Sequence<
css::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases );
diff --git a/xmloff/source/forms/attriblistmerge.hxx
b/xmloff/source/forms/attriblistmerge.hxx
index 03f6d0f..a0b333d 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -41,7 +41,6 @@ namespace xmloff
class OAttribListMerger : public OAttribListMerger_Base
{
protected:
- ::osl::Mutex m_aMutex;
typedef std::vector< css::uno::Reference<
css::xml::sax::XAttributeList > > AttributeListArray;
AttributeListArray m_aLists;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
