mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:write only fields

Browse Source 
Change-Id: Ia0fb487c5590e096659b81f76c4dc543e184c59c
This commit is contained in:
Noel Grandin 2016-03-07 14:19:22 +02:00
parent c89f73a603
commit b2fb84499e
31 changed files with 52 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/accessibility/AccessibleChartShape.cxx
View File

@ -53,7 +53,7 @@ AccessibleChartShape::AccessibleChartShape(
{
nIndex = rAccInfo.m_spObjectHierarchy->getIndexInParent( rAccInfo.m_aOID );
}
::accessibility::AccessibleShapeInfo aShapeInfo( xShape, xParent, nIndex );
::accessibility::AccessibleShapeInfo aShapeInfo( xShape, xParent );
m_aShapeTreeInfo.SetSdrView( rAccInfo.m_pSdrView );
m_aShapeTreeInfo.SetController( nullptr );

3
editeng/source/editeng/editeng.cxx
View File

@ -2408,7 +2408,7 @@ css::uno::Reference< css::datatransfer::XTransferable >
// ====================== Virtual Methods ========================
void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int32,
const long*, const SvxFont&, sal_Int32, sal_Int32, sal_uInt8,
const long*, const SvxFont&, sal_uInt8,
const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool,
const css::lang::Locale*, const Color&, const Color&)
@ -2417,7 +2417,6 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int3
void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
const OUString& /*rChar*/, const SvxFont& /*rFont*/,
sal_Int32 /*nPara*/, sal_Int32 /*nIndex*/,
sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/,
bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
const Color& /*rTextLineColor*/)

8
editeng/source/editeng/impedit3.cxx
View File

@ -3344,7 +3344,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
// StripPortions() data callback
GetEditEnginePtr()->DrawingText( aOutPos, aText, nTextStart, nTextLen, pDXArray,
aTmpFont, n, nIndex, rTextPortion.GetRightToLeft(),
aTmpFont, rTextPortion.GetRightToLeft(),
aWrongSpellVector.size() ? &aWrongSpellVector : nullptr,
pFieldData,
bEndOfLine, bEndOfParagraph, false, // support for EOL/EOP TEXT comments
@ -3574,7 +3574,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
GetEditEnginePtr()->DrawingTab( aTmpPos,
rTextPortion.GetSize().Width(),
OUString(rTextPortion.GetExtraValue()),
aTmpFont, n, nIndex, rTextPortion.GetRightToLeft(),
aTmpFont, rTextPortion.GetRightToLeft(),
bEndOfLine, bEndOfParagraph,
aOverlineColor, aTextLineColor);
}
@ -3592,7 +3592,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
GetEditEnginePtr()->DrawingText(
aTmpPos, OUString(), 0, 0, nullptr,
aTmpFont, n, nIndex, 0,
aTmpFont, 0,
nullptr,
nullptr,
bEndOfLine, bEndOfParagraph, false,
@ -3649,7 +3649,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
GetEditEnginePtr()->DrawingText(
aTmpPos, OUString(), 0, 0, nullptr,
aTmpFont, n, nIndex, 0,
aTmpFont, 0,
nullptr,
nullptr,
false, true, false, // support for EOL/EOP TEXT comments

8
editeng/source/outliner/outleeng.cxx
View File

@ -147,7 +147,7 @@ OUString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
}
void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen,
const long* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 /*nIndex*/, sal_uInt8 nRightToLeft,
const long* pDXArray, const SvxFont& rFont, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@ -157,16 +157,16 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText
const Color& rOverlineColor,
const Color& rTextLineColor)
{
pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nPara,nRightToLeft,
pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nRightToLeft,
pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor);
}
void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, sal_Int32 /*nIndex*/, sal_uInt8 nRightToLeft,
const SvxFont& rFont, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor)
{
pOwner->DrawingTab(rStartPos, nWidth, rChar, rFont, nPara, nRightToLeft,
pOwner->DrawingTab(rStartPos, nWidth, rChar, rFont, nRightToLeft,
bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor );
}

16
editeng/source/outliner/outleeng.hxx
View File

@ -46,19 +46,19 @@ public:
virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart,
sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont,
sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
bool bEndOfParagraph,
bool bEndOfBullet,
const css::lang::Locale* pLocale,
const Color& rOverlineColor,
const Color& rTextLineColor) override;
bool bEndOfLine,
bool bEndOfParagraph,
bool bEndOfBullet,
const css::lang::Locale* pLocale,
const Color& rOverlineColor,
const Color& rTextLineColor) override;
virtual void DrawingTab(
const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
const SvxFont& rFont, sal_uInt8 nRightToLeft,
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,

10
editeng/source/outliner/outliner.cxx
View File

@ -983,7 +983,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
}
DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().getLength(), pBuf.get(),
aSvxFont, nPara, bRightToLeftPara ? 1 : 0, nullptr, nullptr, false, false, true, nullptr, Color(), Color());
aSvxFont, bRightToLeftPara ? 1 : 0, nullptr, nullptr, false, false, true, nullptr, Color(), Color());
}
else
{
@ -1702,7 +1702,7 @@ void Outliner::StripPortions()
void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart,
sal_Int32 nTextLen, const long* pDXArray,const SvxFont& rFont,
sal_Int32 nPara, sal_uInt8 nRightToLeft,
sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@ -1714,7 +1714,7 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_I
{
if(aDrawPortionHdl.IsSet())
{
DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, nPara, pDXArray, pWrongSpellVector,
DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, pDXArray, pWrongSpellVector,
pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
aDrawPortionHdl.Call( &aInfo );
@ -1722,12 +1722,12 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_I
}
void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, const SvxFont& rFont,
sal_Int32 nPara, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor)
{
if(aDrawPortionHdl.IsSet())
{
DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nullptr, nullptr,
DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nullptr, nullptr,
nullptr, nullptr, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false);
aDrawPortionHdl.Call( &aInfo );

1
editeng/source/rtf/svxrtf.cxx
View File

@ -68,7 +68,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
, pAttrPool( &rPool )
, m_xDocProps( i_xDocProps )
, pRTFDefaults( nullptr )
, nVersionNo( 0 )
, nDfltFont( 0)
, bNewDoc( bReadNewDoc )
, bNewGroup( false)

6
filter/source/graphicfilter/icgm/chart.cxx
View File

@ -48,12 +48,6 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
if ( pTextEntry )
{
delete pTextEntry->pText;
for ( TextAttribute* pTAttr = pTextEntry->pAttribute; pTAttr != nullptr ; )
{
TextAttribute* pTempTAttr = pTAttr;
pTAttr = pTAttr->pNextAttribute;
delete pTempTAttr;
}
::std::vector< TextEntry* >::iterator it;
for ( it = maTextEntryList.begin(); it != maTextEntryList.end(); ++it )
{

136
filter/source/graphicfilter/icgm/chart.hxx
View File

@ -28,27 +28,6 @@
#define AUTOBULCHT 96 /* Autobuild BUL CHT */
#define AUTOTABCHT 97 /* Autobuild TAB CHT */
typedef struct TextAttribute
{
sal_uInt16 nTextAttribCount;
sal_Int8 nTextColorIndex;
sal_Int8 nTextColorRed;
sal_Int8 nTextColorGreen;
sal_Int8 nTextColorBlue;
sal_Int8 nShadowColorIndex;
sal_Int8 nShadowColorRed;
sal_Int8 nShadowColorGreen;
sal_Int8 nShadowColorBlue;
float nTextAttribSize;
sal_uInt16 nTextAttribBits;
sal_Int8 nTextFontType; // font identifiers
sal_Int8 nTextCharPage;
sal_uInt16 nTextFontFamily;
sal_Int8 nTextFontMemberID;
sal_Int8 nTextFontVendorID;
TextAttribute* pNextAttribute; // zero or pointer to next TextAttribute
} TextAttribute;
typedef struct TextEntry
{
sal_uInt16 nTypeOfText;
@ -58,99 +37,8 @@ typedef struct TextEntry
sal_uInt16 nLineType;
sal_uInt16 nAttributes;
char* pText; // null terminated text
TextAttribute* pAttribute;
} TextEntry;
struct ZoneOption
{
char nOverTitle;
char nOverBody;
char nOverFoot;
char nFStyle_Title;
char nFStyle_Body;
char nFStyle_Foot;
char nFOutc_Title;
char nFOutc_Body;
char nFOutc_Foot;
char nFFillc_Title;
char nFFillc_Body;
char nFFillc_Foot;
ZoneOption()
: nOverTitle(0)
, nOverBody(0)
, nOverFoot(0)
, nFStyle_Title(0)
, nFStyle_Body(0)
, nFStyle_Foot(0)
, nFOutc_Title(0)
, nFOutc_Body(0)
, nFOutc_Foot(0)
, nFFillc_Title(0)
, nFFillc_Body(0)
, nFFillc_Foot(0)
{
}
};
struct BulletOption
{
char nBType;
char nBSize;
char nBColor;
sal_Int16 nBStart;
double nTMargin;
double nBSpace;
char nCPlace;
BulletOption()
: nBType(0)
, nBSize(0)
, nBColor(0)
, nBStart(0)
, nTMargin(0)
, nBSpace(0)
, nCPlace(0)
{
}
};
struct IntSettings
{
sal_uInt16 nCountry;
sal_uInt16 nDateFormat;
sal_uInt16 nDateSep;
sal_uInt16 nTimeFormat;
sal_uInt16 nTimeSep;
sal_uInt16 nNumSeps;
sal_uInt16 nCurrencyFormat;
char nCurrencySymbol[ 5 ];
IntSettings()
: nCountry(0)
, nDateFormat(0)
, nDateSep(0)
, nTimeFormat(0)
, nTimeSep(0)
, nNumSeps(0)
, nCurrencyFormat(0)
{
memset (nCurrencySymbol, 0, sizeof(nCurrencySymbol));
}
};
struct PageOrientDim
{
char nOrientation;
char nDimension;
float nPageX;
float nPageY;
PageOrientDim()
: nOrientation(0)
, nDimension(0)
, nPageX(0.0)
, nPageY(0.0)
{
}
};
struct DataNode
{
sal_Int16 nBoxX1;
@ -168,25 +56,6 @@ struct DataNode
}
};
struct ChartZone
{
sal_Int16 nMinX;
sal_Int16 nMinY;
sal_Int16 nMaxX;
sal_Int16 nMaxY;
char nUserDef;
char nPad1;
ChartZone()
: nMinX(0)
, nMinY(0)
, nMaxX(0)
, nMaxY(0)
, nUserDef(0)
, nPad1(0)
{
}
};
class CGM;
class CGMImpressOutAct;
class CGMChart
@ -198,11 +67,6 @@ class CGMChart
sal_Int8 mnCurrentFileType;
::std::vector< TextEntry* > maTextEntryList;
DataNode mDataNode[ 7 ];
ChartZone mChartZone;
PageOrientDim mPageOrientDim;
BulletOption mBulletOption;
ZoneOption mZoneOption;
IntSettings mIntSettings;
public:
CGMChart();

31
filter/source/graphicfilter/icgm/class7.cxx
View File

@ -119,48 +119,20 @@ void CGM::ImplDoClass7()
memcpy( pTextEntry->pText, pAppData, nLen );
pAppData += nLen;
TextAttribute* pTextOld = nullptr;
for ( sal_uInt16 i = 0; i < nAttributes; i++ )
{
TextAttribute* pTextAttr = new TextAttribute;
*pTextAttr = *reinterpret_cast<TextAttribute*>( pAppData );
pTextAttr->pNextAttribute = nullptr;
if ( i == 0 )
pTextEntry->pAttribute = pTextAttr;
else
pTextOld->pNextAttribute = pTextAttr;
pAppData += sizeof( TextAttribute ) - 4;
pTextOld = pTextAttr;
}
mpChart->InsertTextEntry( pTextEntry );
}
break;
case 0x321 : /*AppData - IOC_TABS */break;
case 0x322 : /*AppData - CHARTZONE*/
{
mpChart->mChartZone = *reinterpret_cast<ChartZone*>( pAppData );
}
break;
case 0x324 : /*AppData - TITLEZONE */break;
case 0x328 : /*AppData - FOOTNOTEZONE */break;
case 0x32A : /*AppData - LEGENDZONE */break;
case 0x330 : /*AppData - PAGEORIENTDIM*/
{
mpChart->mPageOrientDim = *reinterpret_cast<PageOrientDim*>( pAppData );
}
break;
case 0x334 : /*AppData - CHTZONEOPTN*/
{
mpChart->mZoneOption = *reinterpret_cast<ZoneOption*>( pAppData );
}
break;
case 0x336 : /*AppData - CHTINTL*/
{
mpChart->mIntSettings = *reinterpret_cast<IntSettings*>( pAppData );
}
break;
case 0x338 : /*AppData - CHTLINESPC */break;
case 0x384 : /*AppData - ORGGRIDSTATE */break;
@ -174,9 +146,6 @@ void CGM::ImplDoClass7()
case 0x3EE : /*AppData - TTLAUTOBUILD */break;
case 0x44E : /*AppData - BULTEXTOPTN */break;
case 0x452 : /*AppData - BULLETOPTN*/
{
mpChart->mBulletOption = *reinterpret_cast<BulletOption*>( pAppData );
}
break;
case 0x454 : /*AppData - BULLETLINES*/break;
case 0x456 : /*AppData - BULAUTOBUILD */break;

5
idl/inc/lex.hxx
View File

@ -110,7 +110,6 @@ class SvTokenStream
sal_uLong nMaxPos;
SvFileStream * pInStream;
SvStream & rInStream;
OUString aFileName;
std::vector<std::unique_ptr<SvToken> > aTokList;
std::vector<std::unique_ptr<SvToken> >::iterator pCurToken;
@ -130,7 +129,7 @@ class SvTokenStream
void FillTokenList();
sal_uLong GetNumber();
bool MakeToken( SvToken & );
bool IsEof() const { return rInStream.IsEof(); }
bool IsEof() const { return pInStream->IsEof(); }
void SetMax()
{
sal_uLong n = Tell();
@ -153,7 +152,7 @@ public:
~SvTokenStream();
const OUString & GetFileName() const { return aFileName; }
SvStream & GetStream() { return rInStream; }
SvStream & GetStream() { return *pInStream; }
SvToken& GetToken_PrevAll()
{

13
idl/source/cmptools/lex.cxx
View File

@ -85,7 +85,6 @@ void SvTokenStream::InitCtor()
SvTokenStream::SvTokenStream( const OUString & rFileName )
: pInStream( new SvFileStream( rFileName, STREAM_STD_READ | StreamMode::NOCREATE ) )
, rInStream( *pInStream )
, aFileName( rFileName )
{
InitCtor();
@ -133,7 +132,7 @@ int SvTokenStream::GetNextChar()
int nChar;
while (aBufStr.getLength() <= nBufPos)
{
if (rInStream.ReadLine(aBufStr))
if (pInStream->ReadLine(aBufStr))
{
nLine++;
nColumn = 0;
@ -203,7 +202,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
nColumn += c == '\t' ? nTabSize : 1;
}
}
while( 0 == c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
while( 0 == c && !IsEof() && ( SVSTREAM_OK == pInStream->GetError() ) );
sal_uLong nLastLine = nLine;
sal_uLong nLastColumn = nColumn;
@ -240,8 +239,8 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
}
c = GetFastNextChar();
}
while( '/' != c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
while( '/' != c && !IsEof() && ( SVSTREAM_OK == pInStream->GetError() ) );
if( IsEof() || ( SVSTREAM_OK != pInStream->GetError() ) )
return false;
c = GetNextChar();
rToken.nType = SVTOKENTYPE::Comment;
@ -276,7 +275,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
else
aStr.append(static_cast<char>(c));
}
if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
if( IsEof() || ( SVSTREAM_OK != pInStream->GetError() ) )
return false;
rToken.nType = SVTOKENTYPE::String;
rToken.aString = aStr.makeStringAndClear();
@ -330,7 +329,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
}
rToken.SetLine( nLastLine );
rToken.SetColumn( nLastColumn );
return rInStream.GetError() == SVSTREAM_OK;
return pInStream->GetError() == SVSTREAM_OK;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
include/editeng/editeng.hxx
View File

@ -481,7 +481,7 @@ public:
virtual void DrawingText( const Point& rStartPos, const OUString& rText,
sal_Int32 nTextStart, sal_Int32 nTextLen,
const long* pDXArray, const SvxFont& rFont,
sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@ -492,7 +492,7 @@ public:
const Color& rTextLineColor);
virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
const SvxFont& rFont, sal_uInt8 nRightToLeft,
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,

7
include/editeng/outliner.hxx
View File

@ -396,7 +396,6 @@ public:
const OUString maText;
sal_Int32 mnTextStart;
sal_Int32 mnTextLen;
sal_Int32 mnPara;
const SvxFont& mrFont;
const long* mpDXArray;
@ -424,7 +423,6 @@ public:
sal_Int32 nTxtStart,
sal_Int32 nTxtLen,
const SvxFont& rFnt,
sal_Int32 nPar,
const long* pDXArr,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
@ -441,7 +439,6 @@ public:
maText(rTxt),
mnTextStart(nTxtStart),
mnTextLen(nTxtLen),
mnPara(nPar),
mrFont(rFnt),
mpDXArray(pDXArr),
mpWrongSpellVector(pWrongSpellVector),
@ -835,7 +832,7 @@ public:
void DrawingText( const Point& rStartPos, const OUString& rText,
sal_Int32 nTextStart, sal_Int32 nTextLen,
const long* pDXArray, const SvxFont& rFont,
sal_Int32 nPara, sal_uInt8 nRightToLeft,
sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@ -846,7 +843,7 @@ public:
const Color& rTextLineColor);
void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
const SvxFont& rFont, sal_uInt8 nRightToLeft,
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,

1
include/editeng/svxrtf.hxx
View File

@ -202,7 +202,6 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
css::uno::Reference< css::document::XDocumentProperties> m_xDocProps;
SfxItemSet *pRTFDefaults;
long nVersionNo;
int nDfltFont;
bool bNewDoc : 1; // sal_False - Reading in an existing

3
include/svtools/wizardmachine.hxx
View File

@ -93,12 +93,9 @@ namespace svt
//= OWizardPage
class OWizardMachine;
struct WizardPageImplData;
class SVT_DLLPUBLIC OWizardPage : public TabPage, public IWizardPageController
{
private:
WizardPageImplData* m_pImpl;
public:
/** @param _pParent

13
include/svx/AccessibleShapeInfo.hxx
View File

@ -60,13 +60,6 @@ public:
*/
IAccessibleParent* mpChildrenManager;
/** This index is used to disambiguate names of accessible objects. A
value of (the default) -1 leads to the use of the object's z-order
instead. Because that is not a good substitute, better pass an ever
increasing counter.
*/
sal_Int32 mnIndex;
/** Copy the given values into the members described above.
*/
AccessibleShapeInfo (
@ -74,8 +67,7 @@ public:
css::drawing::XShape>& rxShape,
const css::uno::Reference<
css::accessibility::XAccessible>& rxParent,
IAccessibleParent* pChildrenManager,
sal_Int32 nIndex = -1);
IAccessibleParent* pChildrenManager);
/** Copy the given values into the members described above.
The accessible parent implementation object is set to NULL.
@ -84,8 +76,7 @@ public:
const css::uno::Reference<
css::drawing::XShape>& rxShape,
const css::uno::Reference<
css::accessibility::XAccessible>& rxParent,
sal_Int32 nIndex = -1);
css::accessibility::XAccessible>& rxParent);
~AccessibleShapeInfo();

11
include/vcl/print.hxx
View File

@ -59,17 +59,6 @@ enum PrinterSupport
};
class VCL_DLLPUBLIC PrinterPage
{
GDIMetaFile* mpMtf;
public:
PrinterPage( GDIMetaFile* pMtf ) : mpMtf( pMtf ) {}
~PrinterPage() { delete mpMtf; }
};
class VCL_DLLPUBLIC QueueInfo
{
friend class Printer;

4
sc/source/ui/Accessibility/AccessibleDocument.cxx
View File

@ -448,12 +448,12 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint)
bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild,
const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo)
const long /*_nIndex*/, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo)
throw (uno::RuntimeException)
{
// create the new child
rtl::Reference< ::accessibility::AccessibleShape > pReplacement(::accessibility::ShapeTypeHandler::Instance().CreateAccessibleObject (
::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ),
::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this ),
_rShapeTreeInfo
));
if ( pReplacement.is() )

2
sc/source/ui/app/inputwin.cxx
View File

@ -1886,7 +1886,6 @@ void ScTextWnd::TextGrabFocus()
ScPosWnd::ScPosWnd( vcl::Window* pParent ) :
ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ),
pAccel ( nullptr ),
nTipVisible ( 0 ),
bFormulaMode( false )
{
@ -1912,7 +1911,6 @@ void ScPosWnd::dispose()
HideTip();
delete pAccel;
ComboBox::dispose();
}

1
sc/source/ui/inc/inputwin.hxx
View File

@ -154,7 +154,6 @@ class ScPosWnd : public ComboBox, public SfxListener // Display position
{
private:
OUString aPosStr;
Accelerator* pAccel;
sal_uLong nTipVisible;
bool bFormulaMode;

5
sd/source/ui/accessibility/AccessiblePageShape.cxx
View File

@ -41,9 +41,8 @@ namespace accessibility {
AccessiblePageShape::AccessiblePageShape (
const uno::Reference<drawing::XDrawPage>& rxPage,
const uno::Reference<XAccessible>& rxParent,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
long nIndex)
: AccessibleShape (AccessibleShapeInfo (nullptr, rxParent, nIndex), rShapeTreeInfo),
const AccessibleShapeTreeInfo& rShapeTreeInfo)
: AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo),
mxPage (rxPage)
{
// The main part of the initialization is done in the init method which

8
sd/source/ui/inc/AccessiblePageShape.hxx
View File

@ -47,11 +47,6 @@ public:
the <member>getIndexInParent</member> method is called.
@param rShapeTreeInfo
Bundel of information passed to this shape and all of its desendants.
@param nIndex
Index used to disambiguate between objects that have the same
name. Passing a value of -1 leads to the use of the object's
z-order instead. Because that is not a good substitute, better
pass an ever increasing counter.
@attention
Always call the <member>init</member> method after creating a
new accessible shape. This is one way to overcome the potential
@ -62,8 +57,7 @@ public:
AccessiblePageShape (
const css::uno::Reference<css::drawing::XDrawPage>& rxPage,
const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
long nIndex = -1);
const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessiblePageShape();

6
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx vendored
View File

@ -60,15 +60,13 @@ public:
class RecentlyUsedCacheDescriptor
{
public:
::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument;
Size maPreviewSize;
std::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache> mpCache;
RecentlyUsedCacheDescriptor(
::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument,
const Size& rPreviewSize,
const std::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache>& rpCache)
:mpDocument(pDocument),maPreviewSize(rPreviewSize),mpCache(rpCache)
:maPreviewSize(rPreviewSize),mpCache(rpCache)
{}
};
@ -425,7 +423,7 @@ void PageCacheManager::PutRecentlyUsedCache(
if (iQueue != mpRecentlyUsedPageCaches->end())
{
iQueue->second.push_front(RecentlyUsedCacheDescriptor(pDocument,rPreviewSize,rpCache));
iQueue->second.push_front(RecentlyUsedCacheDescriptor(rPreviewSize,rpCache));
// Shorten the list of recently used caches to the allowed maximal length.
while (iQueue->second.size() > mnMaximalRecentlyCacheCount)
iQueue->second.pop_back();

9
svtools/source/dialogs/wizardmachine.cxx
View File

@ -32,17 +32,9 @@ namespace svt
//= WizardPageImplData
struct WizardPageImplData
{
WizardPageImplData()
{
}
};
OWizardPage::OWizardPage(vcl::Window *pParent, const OString& rID,
const OUString& rUIXMLDescription)
: TabPage(pParent, rID, rUIXMLDescription)
, m_pImpl(new WizardPageImplData)
{
}
@ -53,7 +45,6 @@ namespace svt
void OWizardPage::dispose()
{
delete m_pImpl;
TabPage::dispose();
}

1
svx/source/accessibility/AccessibleShape.cxx
View File

@ -105,7 +105,6 @@ AccessibleShape::AccessibleShape (
mpChildrenManager(nullptr),
mxShape (rShapeInfo.mxShape),
maShapeTreeInfo (rShapeTreeInfo),
mnIndex (rShapeInfo.mnIndex),
m_nIndexInParent(-1),
mpText (nullptr),
mpParent (rShapeInfo.mpChildrenManager)

15
svx/source/accessibility/AccessibleShapeInfo.cxx
View File

@ -25,12 +25,10 @@ namespace accessibility {
AccessibleShapeInfo::AccessibleShapeInfo (
const css::uno::Reference<css::drawing::XShape>& rxShape,
const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
IAccessibleParent* pChildrenManager,
sal_Int32 nIndex)
IAccessibleParent* pChildrenManager)
: mxShape (rxShape),
mxParent (rxParent),
mpChildrenManager (pChildrenManager),
mnIndex (nIndex)
mpChildrenManager (pChildrenManager)
{
// empty.
}
@ -38,12 +36,10 @@ AccessibleShapeInfo::AccessibleShapeInfo (
AccessibleShapeInfo::AccessibleShapeInfo (
const css::uno::Reference<css::drawing::XShape>& rxShape,
const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
sal_Int32 nIndex)
const css::uno::Reference<css::accessibility::XAccessible>& rxParent)
: mxShape (rxShape),
mxParent (rxParent),
mpChildrenManager (nullptr),
mnIndex (nIndex)
mpChildrenManager (nullptr)
{
// empty.
}
@ -51,8 +47,7 @@ AccessibleShapeInfo::AccessibleShapeInfo (
AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther)
: mxShape (rOther.mxShape),
mxParent (rOther.mxParent),
mpChildrenManager (rOther.mpChildrenManager),
mnIndex (rOther.mnIndex)
mpChildrenManager (rOther.mpChildrenManager)
{
// empty.
}

7
svx/source/accessibility/ChildrenManagerImpl.cxx
View File

@ -155,8 +155,7 @@ uno::Reference<XAccessible>
AccessibleShapeInfo aShapeInfo(
rChildDescriptor.mxShape,
mxParent,
this,
mnNewNameIndex++);
this);
// Create accessible object that corresponds to the descriptor's
// shape.
rtl::Reference<AccessibleShape> pShape(
@ -756,11 +755,11 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
bool ChildrenManagerImpl::ReplaceChild (
AccessibleShape* pCurrentChild,
const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex,
const long /*_nIndex*/,
const AccessibleShapeTreeInfo& _rShapeTreeInfo)
throw (uno::RuntimeException)
{
AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex );
AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this );
// create the new child
rtl::Reference<AccessibleShape> pNewChild(ShapeTypeHandler::Instance().CreateAccessibleObject (
aShapeInfo,

1
svx/source/svdraw/svdotextpathdecomposition.cxx
View File

@ -87,7 +87,6 @@ namespace
maText(rInfo.maText),
mnTextStart(rInfo.mnTextStart),
mnTextLength(rInfo.mnTextLen),
mnParagraph(rInfo.mnPara),
maFont(rInfo.mrFont),
maDblDXArray(),
maLocale(rInfo.mpLocale ? *rInfo.mpLocale : css::lang::Locale()),

2
sw/source/ui/fldui/changedb.cxx
View File

@ -56,7 +56,6 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
"modules/swriter/ui/exchangedatabases.ui")
, aImageList(SW_RES(ILIST_DB_DLG))
, pSh(rVw.GetWrtShellPtr())
, pMgr( new SwFieldMgr() )
{
get(m_pUsedDBTLB, "inuselb");
get(m_pAvailDBTLB, "availablelb");
@ -169,7 +168,6 @@ SwChangeDBDlg::~SwChangeDBDlg()
void SwChangeDBDlg::dispose()
{
delete pMgr;
m_pUsedDBTLB.clear();
m_pAvailDBTLB.clear();
m_pAddDBPB.clear();

1
sw/source/uibase/inc/changedb.hxx
View File

@ -44,7 +44,6 @@ class SwChangeDBDlg: public SvxStandardDialog
ImageList aImageList;
SwWrtShell *pSh;
SwFieldMgr *pMgr;
DECL_LINK_TYPED(TreeSelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(ButtonHdl, Button*, void);