[Libreoffice-commits] core.git: 6 commits - lotuswordpro/source vcl/headless vcl/source vcl/unx xmloff/source
Caolán McNamara
caolanm at redhat.com
Thu Jan 21 03:47:48 PST 2016
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2
lotuswordpro/source/filter/lwpcelllayout.cxx | 6 -
lotuswordpro/source/filter/lwpdrawobj.cxx | 60 +++++++++---------
lotuswordpro/source/filter/lwpgrfobj.cxx | 20 +++---
lotuswordpro/source/filter/lwppagelayout.cxx | 16 ++--
lotuswordpro/source/filter/lwppara.cxx | 14 ++--
lotuswordpro/source/filter/lwppara1.cxx | 8 +-
lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx | 6 -
lotuswordpro/source/filter/lwpsilverbullet.cxx | 14 ++--
lotuswordpro/source/filter/lwpstory.cxx | 2
lotuswordpro/source/filter/lwptablelayout.cxx | 4 -
lotuswordpro/source/filter/xfilter/xfpagemaster.hxx | 2
vcl/headless/svpvd.cxx | 1
vcl/source/filter/igif/gifread.cxx | 29 +++-----
vcl/source/filter/wmf/enhwmf.cxx | 6 -
vcl/source/filter/wmf/winmtf.cxx | 10 +--
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/filter/wmf/winwmf.cxx | 4 -
vcl/source/outdev/transparent.cxx | 6 -
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2
vcl/unx/gtk3/gtk3gtkinst.cxx | 25 ++++++-
xmloff/source/chart/SchXMLExport.cxx | 4 -
22 files changed, 129 insertions(+), 114 deletions(-)
New commits:
commit f1358edf469e70df1fb044bb58cd888fea15173c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 21 11:28:50 2016 +0000
Resolves: rhbz#1240591 gtk3: store clipboard when LibreOffice is closed
now contents copied to clipboard persist after LibreOffice exits
Change-Id: I4433543944fb9664f87ade43da1198dcdd4e2a7c
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f1a9ddc..a3f3068 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13,12 +13,12 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/lang/XSingleServiceFactory.hpp"
#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/DisposedException.hpp"
#include "com/sun/star/datatransfer/XTransferable.hpp"
#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
#include "com/sun/star/datatransfer/clipboard/XClipboardEx.hpp"
#include "com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp"
#include "com/sun/star/datatransfer/clipboard/XClipboardListener.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
#include "com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp"
#include "com/sun/star/datatransfer/dnd/XDragSource.hpp"
#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
@@ -275,6 +275,7 @@ static void clipboard_owner_init(ClipboardOwner *)
class VclGtkClipboard :
public cppu::WeakComponentImplHelper<
datatransfer::clipboard::XSystemClipboard,
+ datatransfer::clipboard::XFlushableClipboard,
XServiceInfo>
{
GdkAtom m_nSelection;
@@ -326,6 +327,12 @@ public:
throw(RuntimeException, std::exception) override;
/*
+ * XFlushableClipboard
+ */
+ virtual void SAL_CALL flushClipboard()
+ throw(RuntimeException, std::exception) override;
+
+ /*
* XClipboardNotifier
*/
virtual void SAL_CALL addClipboardListener(
@@ -502,7 +509,8 @@ namespace
}
VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
- : cppu::WeakComponentImplHelper<datatransfer::clipboard::XSystemClipboard, XServiceInfo>
+ : cppu::WeakComponentImplHelper<datatransfer::clipboard::XSystemClipboard,
+ datatransfer::clipboard::XFlushableClipboard, XServiceInfo>
(m_aMutex)
, m_nSelection(nSelection)
{
@@ -513,6 +521,16 @@ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
m_pOwner->m_pThis = this;
}
+void VclGtkClipboard::flushClipboard()
+ throw (RuntimeException, std::exception)
+{
+ if (GDK_SELECTION_CLIPBOARD != m_nSelection)
+ return;
+
+ GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
+ gtk_clipboard_store(clipboard);
+}
+
VclGtkClipboard::~VclGtkClipboard()
{
GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
@@ -524,7 +542,7 @@ VclGtkClipboard::~VclGtkClipboard()
void VclGtkClipboard::setContents(
const Reference< css::datatransfer::XTransferable >& xTrans,
const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
- throw( RuntimeException, std::exception )
+ throw(RuntimeException, std::exception)
{
osl::ClearableMutexGuard aGuard( m_aMutex );
Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner );
@@ -584,6 +602,7 @@ void VclGtkClipboard::setContents(
//if we have gained or lost ownership of the clipboard
gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), aGtkTargets.size(),
ClipboardGetFunc, ClipboardClearFunc, G_OBJECT(m_pOwner));
+ gtk_clipboard_set_can_store(clipboard, aGtkTargets.data(), aGtkTargets.size());
}
m_aGtkTargets = aGtkTargets;
}
commit 15b1080e624447ca1af1396023bb1fbfdb44fb26
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 21 09:54:29 2016 +0000
valgrind: memleak on thrown exception
Change-Id: If562dc69290021f898feff9f8e3983b867075172
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 7322ed2..6c1825d 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -802,33 +802,30 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic )
VCL_DLLPUBLIC bool ImportGIF( SvStream & rStm, Graphic& rGraphic )
{
- GIFReader* pGIFReader = static_cast<GIFReader*>(rGraphic.GetContext());
- SvStreamEndian nOldFormat = rStm.GetEndian();
- ReadState eReadState;
- bool bRet = true;
+ std::unique_ptr<GIFReader> xGIFReader(static_cast<GIFReader*>(rGraphic.GetContext()));
+ rGraphic.SetContext(nullptr);
+ SvStreamEndian nOldFormat = rStm.GetEndian();
rStm.SetEndian( SvStreamEndian::LITTLE );
- if( !pGIFReader )
- pGIFReader = new GIFReader( rStm );
+ if (!xGIFReader)
+ xGIFReader.reset(new GIFReader(rStm));
- rGraphic.SetContext( nullptr );
- eReadState = pGIFReader->ReadGIF( rGraphic );
+ bool bRet = true;
- if( eReadState == GIFREAD_ERROR )
+ ReadState eReadState = xGIFReader->ReadGIF(rGraphic);
+
+ if (eReadState == GIFREAD_ERROR)
{
bRet = false;
- delete pGIFReader;
}
- else if( eReadState == GIFREAD_OK )
- delete pGIFReader;
- else
+ else if (eReadState == GIFREAD_NEED_MORE)
{
- rGraphic = pGIFReader->GetIntermediateGraphic();
- rGraphic.SetContext( pGIFReader );
+ rGraphic = xGIFReader->GetIntermediateGraphic();
+ rGraphic.SetContext(xGIFReader.release());
}
- rStm.SetEndian( nOldFormat );
+ rStm.SetEndian(nOldFormat);
return bRet;
}
commit 52107dddb460d1305a8cf66c15ec70571938bc70
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 21 09:34:50 2016 +0000
valgrind: memleak
Change-Id: Icdbec08e158c83045529ef3b59231bbc310782cd
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 626ca1f..c2dbbb7 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -32,6 +32,7 @@ using namespace basegfx;
SvpSalVirtualDevice::~SvpSalVirtualDevice()
{
+ cairo_surface_destroy(m_pSurface);
}
SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
commit f5aefab2a62a90c631e05ec29022a2f7e19f00c3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 21 09:28:12 2016 +0000
valgrind: memleak on thrown exception
Change-Id: I2788c5fe04a984d6534adbd3186cc652685152e8
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 90ed0bd..3becfbe 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1244,7 +1244,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
- aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) );
+ aBmpSaveList.emplace_back(new BSaveStruct(aBitmap, aRect, dwRop));
}
}
}
@@ -1305,7 +1305,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
- aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) );
+ aBmpSaveList.emplace_back(new BSaveStruct(aBitmap, aRect, dwRop));
}
}
}
@@ -1372,7 +1372,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
- aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) );
+ aBmpSaveList.emplace_back(new BSaveStruct(aBitmap, aRect, dwRop));
}
}
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index acad54e..03135e0 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1575,7 +1575,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
size_t nObjectsOfSameSize = 0;
size_t nObjectStartIndex = nObjects - nObjectsLeft;
- BSaveStruct* pSave = rSaveList[ nObjectStartIndex ];
+ BSaveStruct* pSave = rSaveList[nObjectStartIndex].get();
Rectangle aRect( pSave->aOutRect );
for ( i = nObjectStartIndex; i < nObjects; )
@@ -1583,7 +1583,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
nObjectsOfSameSize++;
if ( ++i < nObjects )
{
- pSave = rSaveList[ i ];
+ pSave = rSaveList[i].get();
if ( pSave->aOutRect != aRect )
break;
}
@@ -1593,7 +1593,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
for ( i = nObjectStartIndex; i < ( nObjectStartIndex + nObjectsOfSameSize ); i++ )
{
- pSave = rSaveList[ i ];
+ pSave = rSaveList[i].get();
sal_uInt32 nWinRop = pSave->nWinRop;
sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
@@ -1621,7 +1621,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
{
if ( nObjectsOfSameSize == 2 )
{
- BSaveStruct* pSave2 = rSaveList[ i + 1 ];
+ BSaveStruct* pSave2 = rSaveList[i + 1].get();
if ( ( pSave->aBmp.GetPrefSize() == pSave2->aBmp.GetPrefSize() ) &&
( pSave->aBmp.GetPrefMapMode() == pSave2->aBmp.GetPrefMapMode() ) )
{
@@ -1790,8 +1790,6 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
nObjectsLeft -= nObjectsOfSameSize;
}
- for( size_t i = 0, n = rSaveList.size(); i < n; ++i )
- delete rSaveList[ i ];
rSaveList.clear();
}
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 3e84183..5e07885 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -455,7 +455,7 @@ struct BSaveStruct
{}
};
-typedef ::std::vector< BSaveStruct* > BSaveStructList_impl;
+typedef std::vector<std::unique_ptr<BSaveStruct>> BSaveStructList_impl;
enum GDIObjectType
{
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 3184a43..3ebcadb 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -680,7 +680,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
aBmp.Crop( aCropRect );
}
Rectangle aDestRect( aPoint, Size( nSxe, nSye ) );
- aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP ) );
+ aBmpSaveList.emplace_back(new BSaveStruct(aBmp, aDestRect, nWinROP));
}
}
}
@@ -730,7 +730,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
Rectangle aCropRect( Point( nSx, nSy ), Size( nSxe, nSye ) );
aBmp.Crop( aCropRect );
}
- aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP ) );
+ aBmpSaveList.emplace_back(new BSaveStruct(aBmp, aDestRect, nWinROP));
}
}
}
commit 57057732676135c1c671d3af717e147abbbb40d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 20 20:54:04 2016 +0000
cppcheck: variableScope
Change-Id: Id7cf5887c1ef0e0c0aad72ea5ac49f4d3db5065e
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 86b0fe5..6d60524 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -366,9 +366,6 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly
void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
sal_uInt16 nTransparencePercent )
{
- // debug helper:
- static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA" );
-
// #110958# Disable alpha VDev, we perform the necessary
VirtualDevice* pOldAlphaVDev = mpAlphaVDev;
@@ -392,6 +389,9 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
{
bool bDrawn = false;
+ // debug helper:
+ static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA" );
+
// #i66849# Added fast path for exactly rectangular
// polygons
// #i83087# Naturally, system alpha blending cannot
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 8135164..06fdc50 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -234,9 +234,9 @@ static bool is_tde_desktop( Display* pDisplay )
static bool is_kde3_desktop( Display* pDisplay )
{
static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
- static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
if ( pFullVersion )
{
+ static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
if ( !pSessionVersion || pSessionVersion[0] == '0' )
{
return true; // does not exist => KDE3
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 0c7ca7d..44f59ef 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1832,8 +1832,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
Reference< beans::XPropertySet > xPropSet;
std::vector< XMLPropertyState > aPropertyStates;
- bool bIs3DChart = false;
-
msStringBuffer.setLength( 0 );
// plot-area element
@@ -1902,6 +1900,8 @@ void SchXMLExportHelper_Impl::exportPlotArea(
addSize( xShape );
}
+ bool bIs3DChart = false;
+
if( xPropSet.is())
{
Any aAny;
commit 68f519f5d3f90a9f7ae7c91dc1d6653440a9c6d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 20 20:46:05 2016 +0000
cppcheck: silence unusedPrivateFunction
somewhat odd this-> syntax here
Change-Id: Ic69e72e15a9f90741e9422e14eb9a6d4784c7aa9
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index d54dfc4..9df07b1 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -104,7 +104,7 @@ LwpColor* LwpBackgroundStuff::GetFillColor()
XFBGImage* LwpBackgroundStuff::GetFillPattern()
{
// not pattern fill?
- if (!this->IsPatternFill())
+ if (!IsPatternFill())
{
return nullptr;
}
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 9db1307..eb3d0cd 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -222,7 +222,7 @@ void LwpCellLayout::ApplyWatermark(XFCellStyle *pCellStyle)
*/
void LwpCellLayout::ApplyPatternFill(XFCellStyle* pCellStyle)
{
- XFBGImage* pXFBGImage = this->GetFillPattern();
+ XFBGImage* pXFBGImage = GetFillPattern();
if (pXFBGImage)
{
pCellStyle->SetBackImage(pXFBGImage);
@@ -236,7 +236,7 @@ void LwpCellLayout::ApplyPatternFill(XFCellStyle* pCellStyle)
*/
void LwpCellLayout::ApplyBackGround(XFCellStyle* pCellStyle)
{
- if (this->IsPatternFill())
+ if (IsPatternFill())
{
ApplyPatternFill(pCellStyle);
}
@@ -344,7 +344,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uI
LwpPara* LwpCellLayout::GetLastParaOfPreviousStory()
{
- LwpObjectID* pPreStoryID = this->GetPreviousCellStory();
+ LwpObjectID* pPreStoryID = GetPreviousCellStory();
if (pPreStoryID && !(pPreStoryID->IsNull()))
{
LwpStory* pPreStory = dynamic_cast<LwpStory*>(pPreStoryID->obj(VO_STORY).get());
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index ef99e24..d964ae6 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -94,7 +94,7 @@ LwpDrawObj::LwpDrawObj(SvStream * pStream, DrawingOffsetAndScale* pTransData)
, m_pStream(pStream)
, m_pTransData(pTransData)
{
- this->ReadObjHeaderRecord();
+ ReadObjHeaderRecord();
}
/**
@@ -378,10 +378,10 @@ OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle)
XFFrame* LwpDrawObj::CreateXFDrawObject()
{
// read records
- this->Read();
+ Read();
// register style
- OUString aStyleName = this->RegisterStyle();
+ OUString aStyleName = RegisterStyle();
// create XF-Objects
XFFrame* pXFObj = nullptr;
@@ -391,11 +391,11 @@ XFFrame* LwpDrawObj::CreateXFDrawObject()
&& FABS(m_pTransData->fScaleX - 1.0) < THRESHOLD
&& FABS(m_pTransData->fScaleY - 1.0) < THRESHOLD)
{
- pXFObj = this->CreateStandardDrawObj(aStyleName);
+ pXFObj = CreateStandardDrawObj(aStyleName);
}
else
{
- pXFObj = this->CreateDrawObj(aStyleName);
+ pXFObj = CreateDrawObj(aStyleName);
}
// set anchor type
@@ -457,7 +457,7 @@ XFFrame* LwpDrawLine::CreateDrawObj(const OUString& rStyleName )
(double)(m_aLineRec.nStartY)/TWIPS_PER_CM * m_pTransData->fScaleY));
pLine->LineTo(XFPoint((double)(m_aLineRec.nEndX)/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)(m_aLineRec.nEndY)/TWIPS_PER_CM * m_pTransData->fScaleY));
- this->SetPosition(pLine);
+ SetPosition(pLine);
pLine->SetStyleName(rStyleName);
@@ -542,7 +542,7 @@ XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName )
pPolyline->LineTo(XFPoint((double)m_pVector[nC].x/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)m_pVector[nC].y/TWIPS_PER_CM * m_pTransData->fScaleY));
}
- this->SetPosition(pPolyline);
+ SetPosition(pPolyline);
pPolyline->SetStyleName(rStyleName);
@@ -588,7 +588,7 @@ LwpDrawPolygon::~LwpDrawPolygon()
*/
void LwpDrawPolygon::Read()
{
- this->ReadClosedObjStyle();
+ ReadClosedObjStyle();
m_pStream->ReadUInt16( m_nNumPoints );
if (m_nNumPoints > m_pStream->remainingSize() / 4)
@@ -612,7 +612,7 @@ OUString LwpDrawPolygon::RegisterStyle()
m_aClosedObjStyleRec.aPenColor);
// set fill style
- this->SetFillStyle(pStyle);
+ SetFillStyle(pStyle);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName();
@@ -629,7 +629,7 @@ XFFrame* LwpDrawPolygon::CreateDrawObj(const OUString& rStyleName)
(double)m_pVector[nC].y/TWIPS_PER_CM * m_pTransData->fScaleY));
}
pPolygon->ClosePath();
- this->SetPosition(pPolygon);
+ SetPosition(pPolygon);
pPolygon->SetStyleName(rStyleName);
return pPolygon;
@@ -663,7 +663,7 @@ LwpDrawRectangle::LwpDrawRectangle(SvStream * pStream, DrawingOffsetAndScale* pT
*/
void LwpDrawRectangle::Read()
{
- this->ReadClosedObjStyle();
+ ReadClosedObjStyle();
sal_uInt8 nPointsCount;
if (m_eType == OT_RNDRECT)
@@ -692,7 +692,7 @@ OUString LwpDrawRectangle::RegisterStyle()
m_aClosedObjStyleRec.aPenColor);
// set fill style
- this->SetFillStyle(pStyle);
+ SetFillStyle(pStyle);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName();
@@ -702,7 +702,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName)
{
if (m_eType == OT_RNDRECT)
{
- return this->CreateRoundedRect(rStyleName);
+ return CreateRoundedRect(rStyleName);
}
else
{
@@ -717,7 +717,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName)
pRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY));
pRect->ClosePath();
- this->SetPosition(pRect);
+ SetPosition(pRect);
pRect->SetStyleName(rStyleName);
@@ -761,7 +761,7 @@ XFFrame* LwpDrawRectangle::CreateRoundedRect(const OUString& rStyleName)
pRoundedRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY));
pRoundedRect->ClosePath();
- this->SetPosition(pRoundedRect);
+ SetPosition(pRoundedRect);
pRoundedRect->SetStyleName(rStyleName);
@@ -772,7 +772,7 @@ XFFrame* LwpDrawRectangle::CreateStandardDrawObj(const OUString& rStyleName)
{
if (m_eType == OT_RNDRECT)
{
- return this->CreateRoundedRect(rStyleName);
+ return CreateRoundedRect(rStyleName);
}
else
{
@@ -833,7 +833,7 @@ LwpDrawEllipse::LwpDrawEllipse(SvStream * pStream, DrawingOffsetAndScale* pTrans
*/
void LwpDrawEllipse::Read()
{
- this->ReadClosedObjStyle();
+ ReadClosedObjStyle();
for (sal_uInt8 nC = 0; nC < 13; nC++)
{
@@ -851,7 +851,7 @@ OUString LwpDrawEllipse::RegisterStyle()
m_aClosedObjStyleRec.aPenColor);
// set fill style
- this->SetFillStyle(pStyle);
+ SetFillStyle(pStyle);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName();
@@ -878,7 +878,7 @@ XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName )
pEllipse->CurveTo(aDest, aCtrl1, aCtrl2);
}
pEllipse->ClosePath();
- this->SetPosition(pEllipse);
+ SetPosition(pEllipse);
pEllipse->SetStyleName(rStyleName);
@@ -887,7 +887,7 @@ XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName )
XFFrame* LwpDrawEllipse::CreateStandardDrawObj(const OUString& rStyleName)
{
- return this->CreateDrawObj(rStyleName);
+ return CreateDrawObj(rStyleName);
}
/**
@@ -949,7 +949,7 @@ XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName )
(double)m_aVector[2].y/TWIPS_PER_CM * m_pTransData->fScaleY);
pArc->CurveTo(aDest, aCtl1, aCtl2);
- this->SetPosition(pArc);
+ SetPosition(pArc);
pArc->SetStyleName(rStyleName);
@@ -958,7 +958,7 @@ XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName )
XFFrame* LwpDrawArc::CreateStandardDrawObj(const OUString& rStyleName)
{
- return this->CreateDrawObj(rStyleName);
+ return CreateDrawObj(rStyleName);
}
/**
@@ -1107,7 +1107,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName )
pXFPara->SetStyleName(rStyleName);
pTextBox->Add(pXFPara);
- this->SetPosition(pTextBox);
+ SetPosition(pTextBox);
XFTextBoxStyle* pBoxStyle = new XFTextBoxStyle();
@@ -1127,7 +1127,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName )
XFFrame* LwpDrawTextBox::CreateStandardDrawObj(const OUString& rStyleName)
{
- return this->CreateDrawObj(rStyleName);
+ return CreateDrawObj(rStyleName);
}
/**
@@ -1200,7 +1200,7 @@ void LwpDrawTextArt::Read()
m_pStream->ReadInt16( m_aVector[nC].y );
}
- this->ReadClosedObjStyle();
+ ReadClosedObjStyle();
m_aTextArtRec.aTextColor = m_aClosedObjStyleRec.aForeColor;
m_pStream->ReadUChar( m_aTextArtRec.nIndex );
@@ -1298,10 +1298,10 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName)
pRetObj = new XFDrawPath();
XFDrawPath* pFWPath = static_cast<XFDrawPath*>(pRetObj);
- this->CreateFWPath(pFWPath);
+ CreateFWPath(pFWPath);
pStyle->SetFontWorkStyle(0, enumXFFWSlantY, enumXFFWAdjustAutosize);
- this->SetPosition(pRetObj);
+ SetPosition(pRetObj);
rtl_TextEncoding aEncoding;
if (!m_aTextArtRec.nTextCharacterSet)
@@ -1327,7 +1327,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName)
XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const OUString& rStyleName )
{
- return this->CreateDrawObj(rStyleName);
+ return CreateDrawObj(rStyleName);
}
/**
@@ -1493,7 +1493,7 @@ XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName)
{
XFImage* pImage = new XFImage();
pImage->SetImageData(m_pImageData, m_aBmpRec.nFileSize);
- this->SetPosition(pImage);
+ SetPosition(pImage);
pImage->SetStyleName(rStyleName);
@@ -1502,7 +1502,7 @@ XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName)
XFFrame* LwpDrawBitmap::CreateStandardDrawObj(const OUString& rStyleName)
{
- return this->CreateDrawObj(rStyleName);
+ return CreateDrawObj(rStyleName);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 6383d5d..bf04563 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -199,7 +199,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
pCont->Add(iter->get());
}
}
- else if (this->IsGrafFormatValid() && !m_vXFDrawObjects.empty())
+ else if (IsGrafFormatValid() && !m_vXFDrawObjects.empty())
{
XFImage* pImage = static_cast<XFImage*>(m_vXFDrawObjects.front().get());
@@ -211,7 +211,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
else
{
sal_uInt8* pGrafData = nullptr;
- sal_uInt32 nDataLen = this->GetRawGrafData(pGrafData);
+ sal_uInt32 nDataLen = GetRawGrafData(pGrafData);
if (pGrafData)
{
@@ -263,12 +263,12 @@ void LwpGraphicObject::RegisterStyle()
{
if (m_sServerContextFormat[1]=='s'&&m_sServerContextFormat[2]=='d'&&m_sServerContextFormat[3]=='w')
{
- this->CreateDrawObjects();
+ CreateDrawObjects();
}
// test codes for importing pictures
- else if(this->IsGrafFormatValid())
+ else if(IsGrafFormatValid())
{
- this->CreateGrafObject();
+ CreateGrafObject();
}
if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h')
@@ -302,7 +302,7 @@ void LwpGraphicObject::CreateDrawObjects()
SvStream* pDrawObjStream = nullptr;
// get graphic object's bento objet name
- LwpObjectID& rMyID = this->GetObjectID();
+ LwpObjectID& rMyID = GetObjectID();
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
@@ -354,7 +354,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
SvStream* pGrafStream = nullptr;
// get graphic object's bento objet name
- LwpObjectID& rMyID = this->GetObjectID();
+ LwpObjectID& rMyID = GetObjectID();
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
@@ -397,7 +397,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData)
SvStream* pGrafStream = nullptr;
// get graphic object's bento objet name
- LwpObjectID& rMyID = this->GetObjectID();
+ LwpObjectID& rMyID = GetObjectID();
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
@@ -649,7 +649,7 @@ void LwpGraphicObject::CreateGrafObject()
pImage->SetAnchorType(enumXFAnchorFrame);
// set object name
- LwpAtomHolder& rHolder = this->GetName();
+ LwpAtomHolder& rHolder = GetName();
if ( !rHolder.str().isEmpty() )
{
pImage->SetName(rHolder.str());
@@ -666,7 +666,7 @@ void LwpGraphicObject::CreateGrafObject()
void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont)
{
sal_uInt8* pGrafData = nullptr;
- sal_uInt32 nDataLen = this->GetGrafData(pGrafData);
+ sal_uInt32 nDataLen = GetGrafData(pGrafData);
if(pGrafData)
{
//convert equation
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 5bddd8c..3b10d2c 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -222,7 +222,7 @@ void LwpPageLayout::ParseShadow(XFPageMaster *pm1)
*/
void LwpPageLayout::ParsePatternFill(XFPageMaster* pm1)
{
- XFBGImage* pXFBGImage = this->GetFillPattern();
+ XFBGImage* pXFBGImage = GetFillPattern();
if (pXFBGImage)
{
pm1->SetBackImage(pXFBGImage);
@@ -234,7 +234,7 @@ void LwpPageLayout::ParsePatternFill(XFPageMaster* pm1)
*/
void LwpPageLayout::ParseBackGround(XFPageMaster* pm1)
{
- if (this->IsPatternFill())
+ if (IsPatternFill())
{
ParsePatternFill(pm1);
}
@@ -575,7 +575,7 @@ double LwpPageLayout::GetMarginWidth()
sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 nLayoutNumber)
{
sal_Int16 nPageNumber = -1;
- LwpFoundry* pFoundry = this->GetFoundry();
+ LwpFoundry* pFoundry = GetFoundry();
if (!pFoundry)
return nPageNumber;
LwpDocument* pDoc = pFoundry->GetDocument();
@@ -586,7 +586,7 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 nLayoutNumber)
LwpPageHint* pPageHint = dynamic_cast<LwpPageHint*>(pHeadTail->GetHead().obj().get());
while(pPageHint)
{
- if(this->GetObjectID() == pPageHint->GetPageLayoutID())
+ if(GetObjectID() == pPageHint->GetPageLayoutID())
{
sal_uInt16 nNumber = pPageHint->GetPageNumber();
if(nLayoutNumber==FIRST_LAYOUTPAGENO && pPageHint->GetLayoutPageNumber()==1)
@@ -830,7 +830,7 @@ void LwpHeaderLayout::ParseShadow(XFHeaderStyle* pHeaderStyle)
*/
void LwpHeaderLayout::ParsePatternFill(XFHeaderStyle* pHeaderStyle)
{
- XFBGImage* pXFBGImage = this->GetFillPattern();
+ XFBGImage* pXFBGImage = GetFillPattern();
if (pXFBGImage)
{
pHeaderStyle->SetBackImage(pXFBGImage);
@@ -842,7 +842,7 @@ void LwpHeaderLayout::ParsePatternFill(XFHeaderStyle* pHeaderStyle)
*/
void LwpHeaderLayout::ParseBackGround(XFHeaderStyle* pHeaderStyle)
{
- if (this->IsPatternFill())
+ if (IsPatternFill())
{
ParsePatternFill(pHeaderStyle);
}
@@ -993,7 +993,7 @@ void LwpFooterLayout::ParseShadow(XFFooterStyle* pFooterStyle)
*/
void LwpFooterLayout::ParsePatternFill(XFFooterStyle* pFooterStyle)
{
- XFBGImage* pXFBGImage = this->GetFillPattern();
+ XFBGImage* pXFBGImage = GetFillPattern();
if (pXFBGImage)
{
pFooterStyle->SetBackImage(pXFBGImage);
@@ -1005,7 +1005,7 @@ void LwpFooterLayout::ParsePatternFill(XFFooterStyle* pFooterStyle)
*/
void LwpFooterLayout::ParseBackGround(XFFooterStyle* pFooterStyle)
{
- if (this->IsPatternFill())
+ if (IsPatternFill())
{
ParsePatternFill(pFooterStyle);
}
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 6211871..f27b684 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -295,7 +295,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
}
else if (m_pXFContainer)
{
- LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr();
+ LwpBulletStyleMgr* pBulletStyleMgr = GetBulletStyleMgr();
if (pBulletStyleMgr)
{
pBulletStyleMgr->SetCurrentSilverBullet(LwpObjectID());
@@ -530,7 +530,7 @@ void LwpPara::RegisterStyle()
OverrideParaNumbering(pNumberingProps);
//register bullet style
- LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr();
+ LwpBulletStyleMgr* pBulletStyleMgr = GetBulletStyleMgr();
if (pBulletStyleMgr)
{
// if has bullet or numbering
@@ -552,7 +552,7 @@ void LwpPara::RegisterStyle()
if (m_pSilverBullet->IsBulletOrdered())
{
OUString aPreBullStyleName;
- LwpNumberingOverride* pNumbering = this->GetParaNumbering();
+ LwpNumberingOverride* pNumbering = GetParaNumbering();
sal_uInt16 nPosition = pNumbering->GetPosition();
bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition);
LwpPara* pPara = this;
@@ -579,7 +579,7 @@ void LwpPara::RegisterStyle()
LwpSilverBullet* pParaSilverBullet = pPara->GetSilverBullet();
pNumbering = pPara->GetParaNumbering();
- if (pPara->GetObjectID() != this->GetObjectID())
+ if (pPara->GetObjectID() != GetObjectID())
{
if (!pParaSilverBullet)
{
@@ -688,7 +688,7 @@ void LwpPara::RegisterStyle()
else
{
m_bBullContinue = false;
- if (this->IsInCell())
+ if (IsInCell())
{
XFListStyle* pOldStyle = static_cast<XFListStyle*>(pXFStyleManager->FindStyle(m_aBulletStyleName));
if (pOldStyle)
@@ -699,7 +699,7 @@ void LwpPara::RegisterStyle()
}
}
- LwpStory* pMyStory = this->GetStory();
+ LwpStory* pMyStory = GetStory();
if (pMyStory)
{
if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_pParaNumbering->GetPosition()))
@@ -739,7 +739,7 @@ void LwpPara::RegisterStyle()
XFParaStyle* pNewParaStyle = new XFParaStyle;
*pNewParaStyle = *GetXFParaStyle();
//pOverStyle->SetStyleName("");
- this->RegisterTabStyle(pNewParaStyle);
+ RegisterTabStyle(pNewParaStyle);
if (!m_ParentStyleName.isEmpty())
pNewParaStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName();
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 2ad9036..a8b4e7a 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -343,7 +343,7 @@ LwpParaStyle* LwpPara::GetParaStyle()
void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyle)
{
// get paraborder in parastyle
- LwpParaStyle* pParaStyle = this->GetParaStyle();
+ LwpParaStyle* pParaStyle = GetParaStyle();
if (!pParaStyle)
{
return;
@@ -375,7 +375,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl
void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyle)
{
// get breaks in parastyle
- LwpParaStyle* pParaStyle = this->GetParaStyle();
+ LwpParaStyle* pParaStyle = GetParaStyle();
if (!pParaStyle)
{
return;
@@ -441,7 +441,7 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
{
// get bulletoverride in parastyle
- LwpParaStyle* pParaStyle = this->GetParaStyle();
+ LwpParaStyle* pParaStyle = GetParaStyle();
if (!pParaStyle)
{
return;
@@ -518,7 +518,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
{
// get numbering override in parastyle
- LwpParaStyle* pParaStyle = this->GetParaStyle();
+ LwpParaStyle* pParaStyle = GetParaStyle();
if (!pParaStyle)
{
return;
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index fc2c7b4..de653c5 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -225,7 +225,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram
//load draw object
for (unsigned short i = 0; i < nRecCount; i++)
{
- XFFrame* pXFDrawObj = this->CreateDrawObject();
+ XFFrame* pXFDrawObj = CreateDrawObject();
if (pXFDrawObj)
{
@@ -278,7 +278,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
//load draw object
for (unsigned short i = 0; i < nRecCount; i++)
{
- XFFrame* pXFDrawObj = this->CreateDrawObject();
+ XFFrame* pXFDrawObj = CreateDrawObject();
if (pXFDrawObj)
{
@@ -369,7 +369,7 @@ XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject()
// read out the object header
pDrawObj = new LwpDrawGroup(m_pStream);
- pRetObjct = this->CreateDrawGroupObject();
+ pRetObjct = CreateDrawGroupObject();
// set anchor type
pRetObjct->SetAnchorType(enumXFAnchorFrame);
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 01a9253..4bfd7b6 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -115,9 +115,9 @@ void LwpSilverBullet::RegisterStyle()
XFListStyle* pListStyle = new XFListStyle();
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
- this->GetBulletPara();
+ GetBulletPara();
- if (this->IsBulletOrdered() && this->HasName())
+ if (IsBulletOrdered() && HasName())
{
//todo: find the flag in the file
bool bCumulative = false;
@@ -133,9 +133,9 @@ void LwpSilverBullet::RegisterStyle()
if (pParaNumber->GetStyleID() != NUMCHAR_other)
{
m_pHideLevels[nPos] = aParaNumbering.nNumLevel;
- sal_uInt16 nDisplayLevel = this->GetDisplayLevel(nPos);
+ sal_uInt16 nDisplayLevel = GetDisplayLevel(nPos);
bCumulative = (nDisplayLevel > 1);
- OUString aPrefix = this->GetAdditionalName(nPos);
+ OUString aPrefix = GetAdditionalName(nPos);
XFNumFmt aFmt;
if (!bCumulative && aParaNumbering.pPrefix)
@@ -398,11 +398,11 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
if (bDivisionName)
{
- aRet += this->GetDivisionName();
+ aRet += GetDivisionName();
}
if (bSectionName)
{
- aRet += this->GetSectionName();
+ aRet += GetSectionName();
}
return aRet;
@@ -445,7 +445,7 @@ OUString LwpSilverBullet::GetSectionName()
bool LwpSilverBullet::HasName()
{
- LwpAtomHolder& rName = this->GetName();
+ LwpAtomHolder& rName = GetName();
return (!rName.str().isEmpty());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 64d15c0..6abdba4 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -407,7 +407,7 @@ XFContentContainer* LwpStory::GetXFContent()
LwpPara* LwpStory::GetLastParaOfPreviousStory()
{
- rtl::Reference<LwpVirtualLayout> xVLayout(this->GetLayout(nullptr));
+ rtl::Reference<LwpVirtualLayout> xVLayout(GetLayout(nullptr));
if (xVLayout.is())
{
return xVLayout->GetLastParaOfPreviousStory();
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 0faf772..fa65944 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -276,7 +276,7 @@ void LwpSuperTableLayout::ApplyShadow(XFTableStyle *pTableStyle)
*/
void LwpSuperTableLayout::ApplyPatternFill(XFTableStyle* pTableStyle)
{
- XFBGImage* pXFBGImage = this->GetFillPattern();
+ XFBGImage* pXFBGImage = GetFillPattern();
if (pXFBGImage)
{
pTableStyle->SetBackImage(pXFBGImage);
@@ -290,7 +290,7 @@ void LwpSuperTableLayout::ApplyPatternFill(XFTableStyle* pTableStyle)
*/
void LwpSuperTableLayout::ApplyBackGround(XFTableStyle* pTableStyle)
{
- if (this->IsPatternFill())
+ if (IsPatternFill())
{
ApplyPatternFill(pTableStyle);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
index 32b5b12..a0c6cea 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
@@ -147,7 +147,7 @@ private:
inline void XFPageMaster::SetPageUsage(enumXFPageUsage usage)
{
- this->m_eUsage = usage;
+ m_eUsage = usage;
}
inline void XFPageMaster::SetTextDir(enumXFTextDir dir)
More information about the Libreoffice-commits
mailing list