diff options
-rw-r--r-- | binaryurp/source/bridgefactory.cxx | 10 | ||||
-rw-r--r-- | binaryurp/source/bridgefactory.hxx | 6 | ||||
-rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 2 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | rsc/source/parser/rscdb.cxx | 1 | ||||
-rw-r--r-- | vcl/inc/image.h | 3 | ||||
-rw-r--r-- | vcl/source/image/ImplImage.cxx | 3 | ||||
-rw-r--r-- | vcl/source/image/ImplImageList.cxx | 2 |
8 files changed, 6 insertions, 22 deletions
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 3328d35593ef..6e7e756e2a12 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -42,9 +42,9 @@ namespace binaryurp { css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create( - css::uno::Reference< css::uno::XComponentContext > const & xContext) + css::uno::Reference< css::uno::XComponentContext > const & /*xContext*/) { - return static_cast< cppu::OWeakObject * >(new BridgeFactory(xContext)); + return static_cast< cppu::OWeakObject * >(new BridgeFactory); } OUString BridgeFactory::static_getImplementationName() { @@ -76,11 +76,9 @@ void BridgeFactory::removeBridge( } } -BridgeFactory::BridgeFactory( - css::uno::Reference< css::uno::XComponentContext > const & context): - BridgeFactoryBase(m_aMutex), context_(context) +BridgeFactory::BridgeFactory(): + BridgeFactoryBase(m_aMutex) { - assert(context.is()); } BridgeFactory::~BridgeFactory() {} diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index f1cc4bb88460..05e39b3dcfec 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -78,9 +78,7 @@ private: BridgeFactory(const BridgeFactory&) = delete; BridgeFactory& operator=(const BridgeFactory&) = delete; - explicit BridgeFactory( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context); + BridgeFactory(); virtual ~BridgeFactory() override; @@ -129,8 +127,6 @@ private: com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > BridgeMap; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - context_; BridgeList unnamed_; BridgeMap named_; }; diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index b0d45df09e54..ca99ec2ea2f2 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -50,8 +50,6 @@ struct MaterialParameters bool twoSidesLighting; float shininess; - float pad; - float pad1; }; struct LightSource diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index a60447fe2757..8e6024d1e600 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -123,7 +123,6 @@ public: RscString aStringLiteral; RscLangEnum aLangType; RscLangArray aLangString; - RscLangArray aLangShort; RscError* pEH; // error handler RscNameTable aNmTb; // name table diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 6f53e10c4f0d..3fdf4dc36048 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -58,7 +58,6 @@ RscTypCont::RscTypCont( RscError * pErrHdl, , aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ) , aLangType() , aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ) - , aLangShort( pHS->getID( "Lang_short" ), RSC_NOTYPE, &aShort, &aLangType ) , pEH(pErrHdl) , nFlags( nFlagsP ) { diff --git a/vcl/inc/image.h b/vcl/inc/image.h index f737a14a8d9b..5446dc7d322a 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -52,7 +52,6 @@ struct ImplImageList ImageAryDataNameHash maNameHash; OUString maPrefix; Size maImageSize; - sal_uIntPtr mnRefCount; ImplImageList(); ImplImageList( const ImplImageList &aSrc ); @@ -65,8 +64,6 @@ struct ImplImageList struct ImplImage { - sal_uIntPtr mnRefCount; - BitmapChecksum maBitmapChecksum; std::unique_ptr<BitmapEx> mpBitmapEx; diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx index 52e5083e8372..ad4312024f92 100644 --- a/vcl/source/image/ImplImage.cxx +++ b/vcl/source/image/ImplImage.cxx @@ -30,8 +30,7 @@ #include <memory> ImplImage::ImplImage() - : mnRefCount(1) - , maBitmapChecksum(0) + : maBitmapChecksum(0) , mpBitmapEx() , maDisabledBitmapEx() { diff --git a/vcl/source/image/ImplImageList.cxx b/vcl/source/image/ImplImageList.cxx index a089004c6c27..f1a0d94973c8 100644 --- a/vcl/source/image/ImplImageList.cxx +++ b/vcl/source/image/ImplImageList.cxx @@ -30,14 +30,12 @@ #include <memory> ImplImageList::ImplImageList() - : mnRefCount(1) { } ImplImageList::ImplImageList( const ImplImageList &aSrc ) : maPrefix(aSrc.maPrefix) , maImageSize(aSrc.maImageSize) - , mnRefCount(1) { maImages.reserve( aSrc.maImages.size() ); for ( std::vector<ImageAryData *>::const_iterator aIt = aSrc.maImages.begin(), aEnd = aSrc.maImages.end(); aIt != aEnd; ++aIt ) |