[Libreoffice-commits] core.git: connectivity/source extensions/source i18npool/inc i18npool/source sw/source ucb/source vcl/inc vcl/opengl
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 18 12:11:53 UTC 2016
connectivity/source/drivers/mork/MCatalog.cxx | 1
connectivity/source/drivers/mork/MCatalog.hxx | 1
extensions/source/propctrlr/submissionhandler.hxx | 1
i18npool/inc/breakiterator_unicode.hxx | 1
i18npool/source/breakiterator/breakiterator_unicode.cxx | 67 ++++++++--------
sw/source/core/inc/SwUndoFmt.hxx | 2
sw/source/core/undo/SwUndoFmt.cxx | 5 -
ucb/source/ucp/ftp/ftpcontentprovider.hxx | 2
vcl/inc/opengl/x11/gdiimpl.hxx | 2
vcl/opengl/x11/gdiimpl.cxx | 18 ++--
10 files changed, 47 insertions(+), 53 deletions(-)
New commits:
commit b495eb4dbaf9165414b2082572d96d14dbf38d1f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Nov 18 07:54:04 2016 +0200
loplugin:datamembershadow
Change-Id: I8a737a2f22c7be9630a1f7562b4309e687bb85f9
Reviewed-on: https://gerrit.libreoffice.org/30948
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index 27bd345..d8b81ef 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star::container;
OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
- ,m_xMetaData(m_pConnection->getMetaData( ))
{
// osl_atomic_increment( &m_refCount );
// refreshTables();
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx
index 7598d7f..5f4b824 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -31,7 +31,6 @@ namespace connectivity
class OCatalog : public connectivity::sdbcx::OCatalog
{
OConnection* m_pConnection; // used to get the metadata
- css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier
public:
// implementation of the pure virtual methods
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 45d29bb..3a43f23 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -68,7 +68,6 @@ namespace pcr
class SubmissionPropertyHandler : public EditPropertyHandler_Base, public ::comphelper::OPropertyChangeListener
{
private:
- ::osl::Mutex m_aMutex;
::std::unique_ptr< SubmissionHelper > m_pHelper;
::comphelper::OPropertyChangeMultiplexer* m_pPropChangeMultiplexer;
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index ffcb4fe..969f90e 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -73,7 +73,6 @@ public:
protected:
const sal_Char *cBreakIterator, *lineRule;
- Boundary result; // for word break iterator
struct BI_Data
{
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 76ae209..8c19096 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -258,20 +258,21 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
{
loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
- result.startPos = icuBI->aBreakIterator->following(nStartPos);
- if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
- result.endPos = result.startPos;
+ Boundary rv;
+ rv.startPos = icuBI->aBreakIterator->following(nStartPos);
+ if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE )
+ rv.endPos = result.startPos;
else {
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
rWordType == WordType::DICTIONARY_WORD ) &&
- u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
- result.startPos = icuBI->aBreakIterator->following(result.startPos);
+ u_isWhitespace(Text.iterateCodePoints(&rv.startPos, 0)) )
+ rv.startPos = icuBI->aBreakIterator->following(rv.startPos);
- result.endPos = icuBI->aBreakIterator->following(result.startPos);
- if(result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
+ rv.endPos = icuBI->aBreakIterator->following(rv.startPos);
+ if(rv.endPos == BreakIterator::DONE)
+ rv.endPos = rv.startPos;
}
- return result;
+ return rv;
}
@@ -280,20 +281,21 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
{
loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
- result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
- if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
- result.endPos = result.startPos;
+ Boundary rv;
+ rv.startPos = icuBI->aBreakIterator->preceding(nStartPos);
+ if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE)
+ rv.endPos = rv.startPos;
else {
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
rWordType == WordType::DICTIONARY_WORD) &&
- u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
- result.startPos = icuBI->aBreakIterator->preceding(result.startPos);
+ u_isWhitespace(Text.iterateCodePoints(&rv.startPos, 0)) )
+ rv.startPos = icuBI->aBreakIterator->preceding(rv.startPos);
- result.endPos = icuBI->aBreakIterator->following(result.startPos);
- if(result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
+ rv.endPos = icuBI->aBreakIterator->following(rv.startPos);
+ if(rv.endPos == BreakIterator::DONE)
+ rv.endPos = rv.startPos;
}
- return result;
+ return rv;
}
@@ -303,30 +305,31 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
sal_Int32 len = Text.getLength();
+ Boundary rv;
if(icuBI->aBreakIterator->isBoundary(nPos)) {
- result.startPos = result.endPos = nPos;
+ rv.startPos = rv.endPos = nPos;
if((bDirection || nPos == 0) && nPos < len) //forward
- result.endPos = icuBI->aBreakIterator->following(nPos);
+ rv.endPos = icuBI->aBreakIterator->following(nPos);
else
- result.startPos = icuBI->aBreakIterator->preceding(nPos);
+ rv.startPos = icuBI->aBreakIterator->preceding(nPos);
} else {
if(nPos <= 0) {
- result.startPos = 0;
- result.endPos = len ? icuBI->aBreakIterator->following((sal_Int32)0) : 0;
+ rv.startPos = 0;
+ rv.endPos = len ? icuBI->aBreakIterator->following((sal_Int32)0) : 0;
} else if(nPos >= len) {
- result.startPos = icuBI->aBreakIterator->preceding(len);
- result.endPos = len;
+ rv.startPos = icuBI->aBreakIterator->preceding(len);
+ rv.endPos = len;
} else {
- result.startPos = icuBI->aBreakIterator->preceding(nPos);
- result.endPos = icuBI->aBreakIterator->following(nPos);
+ rv.startPos = icuBI->aBreakIterator->preceding(nPos);
+ rv.endPos = icuBI->aBreakIterator->following(nPos);
}
}
- if (result.startPos == BreakIterator::DONE)
- result.startPos = result.endPos;
- else if (result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
+ if (rv.startPos == BreakIterator::DONE)
+ rv.startPos = rv.endPos;
+ else if (rv.endPos == BreakIterator::DONE)
+ rv.endPos = rv.startPos;
- return result;
+ return rv;
}
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index c034829..ec25edb 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -178,8 +178,6 @@ public:
class SwUndoFrameFormatCreate : public SwUndoFormatCreate
{
- bool bAuto;
-
public:
SwUndoFrameFormatCreate(SwFrameFormat * pNew, SwFrameFormat * pDerivedFrom,
SwDoc * pDoc);
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index ffa0531..5682cc0 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -323,14 +323,13 @@ SwFormat * SwUndoRenameCharFormat::Find(const OUString & rName) const
SwUndoFrameFormatCreate::SwUndoFrameFormatCreate(SwFrameFormat * pNewFormat,
SwFrameFormat * pDerivedFrom,
SwDoc * pDocument)
- : SwUndoFormatCreate(UNDO_FRMFMT_CREATE, pNewFormat, pDerivedFrom, pDocument),
- bAuto(pNewFormat->IsAuto())
+ : SwUndoFormatCreate(UNDO_FRMFMT_CREATE, pNewFormat, pDerivedFrom, pDocument)
{
}
SwFormat * SwUndoFrameFormatCreate::Create(SwFormat * pDerivedFrom)
{
- return pDoc->MakeFrameFormat(sNewName, static_cast<SwFrameFormat *>(pDerivedFrom), true, bAuto);
+ return pDoc->MakeFrameFormat(sNewName, static_cast<SwFrameFormat *>(pDerivedFrom), true, pNew->IsAuto());
}
void SwUndoFrameFormatCreate::Delete()
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 1bba004..1c93e7f 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -118,8 +118,6 @@ namespace ftp
};
private:
-
- osl::Mutex m_aMutex;
FTPLoaderThread *m_ftpLoaderThread;
ucbhelper::InternetProxyDecider *m_pProxyDecider;
std::vector<ServerInfo> m_ServerInfo;
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index 79d278c..646b7a6 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -21,7 +21,7 @@ struct TextureCombo;
class VCL_PLUGIN_PUBLIC X11OpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl, public X11GraphicsImpl
{
private:
- X11SalGraphics& mrParent;
+ X11SalGraphics& mrX11Parent;
public:
X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent );
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 00ab62d..b4f87a3 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -600,7 +600,7 @@ OpenGLContext* X11SalInstance::CreateOpenGLContext()
X11OpenGLSalGraphicsImpl::X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent ):
OpenGLSalGraphicsImpl(rParent,rParent.GetGeometryProvider()),
- mrParent(rParent)
+ mrX11Parent(rParent)
{
}
@@ -611,13 +611,13 @@ X11OpenGLSalGraphicsImpl::~X11OpenGLSalGraphicsImpl()
void X11OpenGLSalGraphicsImpl::Init()
{
// The m_pFrame and m_pVDev pointers are updated late in X11
- mpProvider = mrParent.GetGeometryProvider();
+ mpProvider = mrX11Parent.GetGeometryProvider();
OpenGLSalGraphicsImpl::Init();
}
rtl::Reference<OpenGLContext> X11OpenGLSalGraphicsImpl::CreateWinContext()
{
- NativeWindowHandleProvider *pProvider = dynamic_cast<NativeWindowHandleProvider*>(mrParent.m_pFrame);
+ NativeWindowHandleProvider *pProvider = dynamic_cast<NativeWindowHandleProvider*>(mrX11Parent.m_pFrame);
if( !pProvider )
return nullptr;
@@ -625,21 +625,21 @@ rtl::Reference<OpenGLContext> X11OpenGLSalGraphicsImpl::CreateWinContext()
sal_uIntPtr aWin = pProvider->GetNativeWindowHandle();
rtl::Reference<X11OpenGLContext> xContext = new X11OpenGLContext;
xContext->setVCLOnly();
- xContext->init( mrParent.GetXDisplay(), aWin,
- mrParent.m_nXScreen.getXScreen() );
+ xContext->init( mrX11Parent.GetXDisplay(), aWin,
+ mrX11Parent.m_nXScreen.getXScreen() );
return rtl::Reference<OpenGLContext>(xContext.get());
}
void X11OpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
{
- OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? static_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl());
+ OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? static_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrX11Parent.GetImpl());
OpenGLSalGraphicsImpl::DoCopyBits( rPosAry, *pImpl );
}
bool X11OpenGLSalGraphicsImpl::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
{
- Display* pDisplay = mrParent.GetXDisplay();
- SalX11Screen nScreen = mrParent.GetScreenNumber();
+ Display* pDisplay = mrX11Parent.GetXDisplay();
+ SalX11Screen nScreen = mrX11Parent.GetScreenNumber();
XVisualInfo aVisualInfo;
XImage* pImage;
char* pData;
@@ -747,7 +747,7 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* pMask
None
};
- Display* pDisplay = mrParent.GetXDisplay();
+ Display* pDisplay = mrX11Parent.GetXDisplay();
bool bInverted = false;
const long nWidth = pPixmap->GetWidth();
More information about the Libreoffice-commits
mailing list