summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-30 11:08:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-30 19:50:30 +0200
commit979d58c9a96884e36d1585df0c04c89b1f53fa99 (patch)
treebce40aad53ac5123a2864da59b8d889b8a51e577 /vcl/unx
parent3c1fc723ff622d8a541fa26a3397ca4258332e4a (diff)
loplugin:unusedfields in toolkit..xmloff
Change-Id: I4964ff97e0a1735dc08c6ad204cae0b08e9ffc2c Reviewed-on: https://gerrit.libreoffice.org/39406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx33
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx3
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.cxx25
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.hxx16
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx6
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx6
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx1
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx8
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx3
9 files changed, 37 insertions, 64 deletions
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 6f9e4de03856..019ca2959f97 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -51,8 +51,7 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
css::lang::XServiceInfo
>( rManager.getMutex() ),
- m_rSelectionManager( rManager ),
- m_xSelectionManager( & rManager ),
+ m_xSelectionManager( &rManager ),
m_aSelection( aSelection )
{
#if OSL_DEBUG_LEVEL > 1
@@ -81,23 +80,23 @@ X11Clipboard::~X11Clipboard()
MutexGuard aGuard( *Mutex::getGlobalMutex() );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "shutting down instance of X11Clipboard (this=%p, Selection=\"%s\")\n", this, OUStringToOString( m_rSelectionManager.getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+ fprintf( stderr, "shutting down instance of X11Clipboard (this=%p, Selection=\"%s\")\n", this, OUStringToOString( m_xSelectionManager->getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
#endif
if( m_aSelection != None )
- m_rSelectionManager.deregisterHandler( m_aSelection );
+ m_xSelectionManager->deregisterHandler( m_aSelection );
else
{
- m_rSelectionManager.deregisterHandler( XA_PRIMARY );
- m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( "CLIPBOARD" ) );
+ m_xSelectionManager->deregisterHandler( XA_PRIMARY );
+ m_xSelectionManager->deregisterHandler( m_xSelectionManager->getAtom( "CLIPBOARD" ) );
}
}
void X11Clipboard::fireChangedContentsEvent()
{
- ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() );
+ ClearableMutexGuard aGuard( m_xSelectionManager->getMutex() );
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "X11Clipboard::fireChangedContentsEvent for %s (%" SAL_PRI_SIZET "u listeners)\n",
- OUStringToOString( m_rSelectionManager.getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), m_aListeners.size() );
+ OUStringToOString( m_xSelectionManager->getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), m_aListeners.size() );
#endif
::std::list< Reference< XClipboardListener > > listeners( m_aListeners );
aGuard.clear();
@@ -113,7 +112,7 @@ void X11Clipboard::fireChangedContentsEvent()
void X11Clipboard::clearContents()
{
- ClearableMutexGuard aGuard(m_rSelectionManager.getMutex());
+ ClearableMutexGuard aGuard(m_xSelectionManager->getMutex());
// protect against deletion during outside call
Reference< XClipboard > xThis( static_cast<XClipboard*>(this));
// copy member references on stack so they can be called
@@ -134,7 +133,7 @@ void X11Clipboard::clearContents()
Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
{
- MutexGuard aGuard(m_rSelectionManager.getMutex());
+ MutexGuard aGuard(m_xSelectionManager->getMutex());
if( ! m_aContents.is() )
m_aContents = new X11Transferable( SelectionManager::get(), m_aSelection );
@@ -146,7 +145,7 @@ void SAL_CALL X11Clipboard::setContents(
const Reference< XClipboardOwner >& xClipboardOwner )
{
// remember old values for callbacks before setting the new ones.
- ClearableMutexGuard aGuard(m_rSelectionManager.getMutex());
+ ClearableMutexGuard aGuard(m_xSelectionManager->getMutex());
Reference< XClipboardOwner > oldOwner( m_aOwner );
m_aOwner = xClipboardOwner;
@@ -158,11 +157,11 @@ void SAL_CALL X11Clipboard::setContents(
// for now request ownership for both selections
if( m_aSelection != None )
- m_rSelectionManager.requestOwnership( m_aSelection );
+ m_xSelectionManager->requestOwnership( m_aSelection );
else
{
- m_rSelectionManager.requestOwnership( XA_PRIMARY );
- m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( "CLIPBOARD" ) );
+ m_xSelectionManager->requestOwnership( XA_PRIMARY );
+ m_xSelectionManager->requestOwnership( m_xSelectionManager->getAtom( "CLIPBOARD" ) );
}
// notify old owner on loss of ownership
@@ -175,7 +174,7 @@ void SAL_CALL X11Clipboard::setContents(
OUString SAL_CALL X11Clipboard::getName()
{
- return m_rSelectionManager.getString( m_aSelection );
+ return m_xSelectionManager->getString( m_aSelection );
}
sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
@@ -185,13 +184,13 @@ sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
{
- MutexGuard aGuard( m_rSelectionManager.getMutex() );
+ MutexGuard aGuard( m_xSelectionManager->getMutex() );
m_aListeners.push_back( listener );
}
void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
{
- MutexGuard aGuard( m_rSelectionManager.getMutex() );
+ MutexGuard aGuard( m_xSelectionManager->getMutex() );
m_aListeners.remove( listener );
}
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index c9a948cefd99..8c7773fd02e2 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -41,8 +41,7 @@ namespace x11 {
css::uno::Reference< css::datatransfer::XTransferable > m_aContents;
css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
- SelectionManager& m_rSelectionManager;
- css::uno::Reference< css::lang::XInitialization > m_xSelectionManager;
+ rtl::Reference<SelectionManager> m_xSelectionManager;
::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
Atom m_aSelection;
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index 82d3290a4469..4223b29f4c37 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
@@ -31,8 +31,7 @@ DropTargetDropContext::DropTargetDropContext(
::Window aDropWindow,
SelectionManager& rManager ) :
m_aDropWindow( aDropWindow ),
- m_rManager( rManager ),
- m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
+ m_xManager( &rManager )
{
}
@@ -42,17 +41,17 @@ DropTargetDropContext::~DropTargetDropContext()
void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation )
{
- m_rManager.accept( dragOperation, m_aDropWindow );
+ m_xManager->accept( dragOperation, m_aDropWindow );
}
void DropTargetDropContext::rejectDrop()
{
- m_rManager.reject( m_aDropWindow );
+ m_xManager->reject( m_aDropWindow );
}
void DropTargetDropContext::dropComplete( sal_Bool success )
{
- m_rManager.dropComplete( success, m_aDropWindow );
+ m_xManager->dropComplete( success, m_aDropWindow );
}
/*
@@ -63,8 +62,7 @@ DropTargetDragContext::DropTargetDragContext(
::Window aDropWindow,
SelectionManager& rManager ) :
m_aDropWindow( aDropWindow ),
- m_rManager( rManager ),
- m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
+ m_xManager( &rManager )
{
}
@@ -74,12 +72,12 @@ DropTargetDragContext::~DropTargetDragContext()
void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation )
{
- m_rManager.accept( dragOperation, m_aDropWindow );
+ m_xManager->accept( dragOperation, m_aDropWindow );
}
void DropTargetDragContext::rejectDrag()
{
- m_rManager.reject( m_aDropWindow );
+ m_xManager->reject( m_aDropWindow );
}
/*
@@ -90,8 +88,7 @@ DragSourceContext::DragSourceContext(
::Window aDropWindow,
SelectionManager& rManager ) :
m_aDropWindow( aDropWindow ),
- m_rManager( rManager ),
- m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
+ m_xManager( &rManager )
{
}
@@ -101,12 +98,12 @@ DragSourceContext::~DragSourceContext()
sal_Int32 DragSourceContext::getCurrentCursor()
{
- return m_rManager.getCurrentCursor();
+ return m_xManager->getCurrentCursor();
}
void DragSourceContext::setCursor( sal_Int32 cursorId )
{
- m_rManager.setCursor( cursorId, m_aDropWindow );
+ m_xManager->setCursor( cursorId, m_aDropWindow );
}
void DragSourceContext::setImage( sal_Int32 )
@@ -115,7 +112,7 @@ void DragSourceContext::setImage( sal_Int32 )
void DragSourceContext::transferablesFlavorsChanged()
{
- m_rManager.transferablesFlavorsChanged();
+ m_xManager->transferablesFlavorsChanged();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index e770c58686d1..276a21fe765f 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -35,9 +36,8 @@ namespace x11 {
class DropTargetDropContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDropContext>
{
- ::Window m_aDropWindow;
- SelectionManager& m_rManager;
- css::uno::Reference< XInterface > m_xManagerRef;
+ ::Window m_aDropWindow;
+ rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDropContext( ::Window, SelectionManager& );
virtual ~DropTargetDropContext() override;
@@ -51,9 +51,8 @@ namespace x11 {
class DropTargetDragContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDragContext>
{
- ::Window m_aDropWindow;
- SelectionManager& m_rManager;
- css::uno::Reference< XInterface > m_xManagerRef;
+ ::Window m_aDropWindow;
+ rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDragContext( ::Window, SelectionManager& );
virtual ~DropTargetDragContext() override;
@@ -66,9 +65,8 @@ namespace x11 {
class DragSourceContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDragSourceContext>
{
- ::Window m_aDropWindow;
- SelectionManager& m_rManager;
- css::uno::Reference< XInterface > m_xManagerRef;
+ ::Window m_aDropWindow;
+ rtl::Reference<SelectionManager> m_xManager;
public:
DragSourceContext( ::Window, SelectionManager& );
virtual ~DragSourceContext() override;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 10ae47012b8f..98babfee2491 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -649,9 +649,6 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
pFont->m_aEncoding = aInfo.symbolEncoded ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UCS2;
- pFont->m_aGlobalMetricY.width = pFont->m_aGlobalMetricX.width = aInfo.xMax - aInfo.xMin;
- pFont->m_aGlobalMetricY.height = pFont->m_aGlobalMetricX.height = aInfo.yMax - aInfo.yMin;
-
if( aInfo.ascender && aInfo.descender )
{
pFont->m_nLeading = aInfo.linegap;
@@ -679,9 +676,6 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
if( pFont->m_nLeading == 0 )
pFont->m_nLeading = 15 * (pFont->m_nAscend+pFont->m_nDescend) / 100;
- if( pFont->m_nAscend )
- pFont->m_aGlobalMetricX.height = pFont->m_aGlobalMetricY.height = pFont->m_nAscend + pFont->m_nDescend;
-
// get bounding box
pFont->m_nXMin = aInfo.xMin;
pFont->m_nYMin = aInfo.yMin;
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 5c6c68f275d5..421bab8dcc61 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -127,7 +127,6 @@ X11SalGraphicsImpl::X11SalGraphicsImpl(X11SalGraphics& rParent):
mnBrushPixel(0),
mbPenGC(false),
mbBrushGC(false),
- mbMonoGC(false),
mbCopyGC(false),
mbInvertGC(false),
mbInvert50GC(false),
@@ -269,7 +268,7 @@ void X11SalGraphicsImpl::freeResources()
freeGC( pDisplay, mpInvertGC );
freeGC( pDisplay, mpInvert50GC );
freeGC( pDisplay, mpStippleGC );
- mbTrackingGC = mbPenGC = mbBrushGC = mbMonoGC = mbCopyGC = mbInvertGC = mbInvert50GC = mbStippleGC = false;
+ mbTrackingGC = mbPenGC = mbBrushGC = mbCopyGC = mbInvertGC = mbInvert50GC = mbStippleGC = false;
}
GC X11SalGraphicsImpl::CreateGC( Drawable hDrawable, unsigned long nMask )
@@ -1001,7 +1000,6 @@ void X11SalGraphicsImpl::ResetClipRegion()
mbPenGC = false;
mrParent.bFontGC_ = false;
mbBrushGC = false;
- mbMonoGC = false;
mbCopyGC = false;
mbInvertGC = false;
mbInvert50GC = false;
@@ -1065,7 +1063,6 @@ bool X11SalGraphicsImpl::setClipRegion( const vcl::Region& i_rClip )
mbPenGC = false;
mrParent.bFontGC_ = false;
mbBrushGC = false;
- mbMonoGC = false;
mbCopyGC = false;
mbInvertGC = false;
mbInvert50GC = false;
@@ -1184,7 +1181,6 @@ void X11SalGraphicsImpl::SetXORMode( bool bSet )
mbPenGC = false;
mrParent.bFontGC_ = false;
mbBrushGC = false;
- mbMonoGC = false;
mbCopyGC = false;
mbInvertGC = false;
mbInvert50GC = false;
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 2ad9b96bc1ea..9f404d16acc0 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -52,7 +52,6 @@ private:
bool mbPenGC : 1; // is Pen GC valid
bool mbBrushGC : 1; // is Brush GC valid
- bool mbMonoGC : 1; // is Mono GC valid
bool mbCopyGC : 1; // is Copy GC valid
bool mbInvertGC : 1; // is Invert GC valid
bool mbInvert50GC : 1; // is Invert50 GC valid
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 8401fa8e3b24..d972ee56571c 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -1084,8 +1084,7 @@ struct ImplBmpObj
mpBmp( pBmp ), mnMemSize( nMemSize ) {}
};
-ImplSalBitmapCache::ImplSalBitmapCache() :
- mnTotalSize( 0UL )
+ImplSalBitmapCache::ImplSalBitmapCache()
{
}
@@ -1109,11 +1108,8 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize )
bFound = true;
}
- mnTotalSize += nMemSize;
-
if( bFound )
{
- mnTotalSize -= pObj->mnMemSize;
pObj->mnMemSize = nMemSize;
}
else
@@ -1130,7 +1126,6 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
if( (*it)->mpBmp == pBmp )
{
(*it)->mpBmp->ImplRemovedFromCache();
- mnTotalSize -= (*it)->mnMemSize;
delete *it;
maBmpList.erase( it );
break;
@@ -1149,7 +1144,6 @@ void ImplSalBitmapCache::ImplClear()
delete *it;
}
maBmpList.clear();
- mnTotalSize = 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 54d9746451f2..6290b8f46e37 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -595,7 +595,6 @@ PPDParser::PPDParser( const OUString& rFile ) :
m_pInputSlots( nullptr ),
m_pDefaultResolution( nullptr ),
m_pResolutions( nullptr ),
- m_pDuplexTypes( nullptr ),
m_pFontList( nullptr ),
m_pTranslator( new PPDTranslator() )
{
@@ -741,8 +740,6 @@ PPDParser::PPDParser( const OUString& rFile ) :
SAL_INFO_IF(!m_pInputSlots, "vcl.unx.print", "no InputSlot in " << m_aFile);
SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
- m_pDuplexTypes = getKey( OUString( "Duplex" ) );
-
m_pFontList = getKey( OUString( "Font" ) );
if (m_pFontList == nullptr) {
SAL_WARN( "vcl.unx.print", "no Font in " << m_aFile);