[Libreoffice-commits] core.git: 12 commits - chart2/source cppcanvas/source cui/source dbaccess/source extensions/source filter/source include/sfx2 sax/source sc/source sd/source sfx2/source svtools/source svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Thu Jan 23 08:02:49 PST 2014
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 2
chart2/source/view/main/VLegend.cxx | 15 +
cppcanvas/source/mtfrenderer/emfplus.cxx | 9 +
cui/source/customize/macropg.cxx | 2
cui/source/customize/selector.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/options/cuisrchdlg.cxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/tabpages/connect.cxx | 2
cui/source/tabpages/dstribut.cxx | 2
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/measure.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
filter/source/msfilter/escherex.cxx | 25 +--
include/sfx2/basedlgs.hxx | 53 +-----
sax/source/expatwrap/saxwriter.cxx | 82 +++++-----
sc/source/filter/oox/workbookfragment.cxx | 5
sc/source/ui/condformat/condformatdlg.cxx | 1
sc/source/ui/miscdlgs/inscodlg.cxx | 6
sc/source/ui/pagedlg/tphf.cxx | 8 -
sd/source/ui/dlg/sdtreelb.cxx | 6
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/inc/sdtreelb.hxx | 3
sfx2/source/dialog/basedlgs.cxx | 140 +-----------------
svtools/source/contnr/treelistentry.cxx | 13 -
svx/source/tbxctrls/grafctrl.cxx | 2
sw/source/core/text/itratr.cxx | 4
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optload.cxx | 4
sw/source/ui/dialog/addrdlg.cxx | 2
sw/source/ui/fldui/fldedt.cxx | 2
sw/source/ui/frmdlg/pattern.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 2
37 files changed, 137 insertions(+), 281 deletions(-)
New commits:
commit 917b6afecde47bdc282a5182e26c2421253fd804
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:55:37 2014 +0000
coverity#1158463 Uninitialized scalar field
Change-Id: Idcbbb3b05e8425616696a2508d05dc9dfd670aa5
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 1f7b46e..1eca2b2 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -782,13 +782,14 @@ VLegend::VLegend(
const std::vector< LegendEntryProvider* >& rLegendEntryProviderList,
const Reference< drawing::XShapes >& xTargetPage,
const Reference< lang::XMultiServiceFactory >& xFactory,
- ChartModel& rModel ) :
- m_xTarget(xTargetPage),
- m_xShapeFactory(xFactory),
- m_xLegend( xLegend ),
- mrModel(rModel),
- m_xContext( xContext ),
- m_aLegendEntryProviderList( rLegendEntryProviderList )
+ ChartModel& rModel )
+ : m_xTarget(xTargetPage)
+ , m_xShapeFactory(xFactory)
+ , m_xLegend(xLegend)
+ , mrModel(rModel)
+ , m_xContext(xContext)
+ , m_aLegendEntryProviderList(rLegendEntryProviderList)
+ , m_nDefaultWritingMode(text::WritingMode2::LR_TB)
{
}
commit 77e25e13babec17c8e442fd599ad71fc51aa98db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:51:57 2014 +0000
coverity#1158464 Uninitialized scalar field
Change-Id: I73fc73421ab1abcc801bb4372e9584fcbf381bcf
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index bf04b1e..60a960f 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -47,12 +47,13 @@ void SvTreeListEntry::InvalidateChildrensListPositions()
nListPos |= 0x80000000;
}
-SvTreeListEntry::SvTreeListEntry() :
- pParent(NULL),
- nAbsPos(0),
- nListPos(0),
- pUserData(NULL),
- nEntryFlags(0)
+SvTreeListEntry::SvTreeListEntry()
+ : pParent(NULL)
+ , nAbsPos(0)
+ , nListPos(0)
+ , bIsMarked(false)
+ , pUserData(NULL)
+ , nEntryFlags(0)
{
}
commit 0b500f6dab5ca1bea29630f43abb9a14be1d4e4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:49:54 2014 +0000
coverity#1158465 Uninitialized pointer field
Change-Id: Ic53e3f8165595ef2b8a6241003bce736f936db3a
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 87bed53..82df036 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -197,6 +197,8 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle |
WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP)
, m_bShowSlots(false)
+ , pFunctionListBox(NULL)
+ , m_pImageProvider(NULL)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
, m_libImage(CUI_RES(RID_CUIIMG_LIB))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO))
commit cf0acb943de74e165334b38fe58e001ce9a940f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:45:26 2014 +0000
coverity#1158466 Uninitialized pointer field
Change-Id: I9b2d678203e8025d132a43d9c8d76e15e2db4144
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8fc8c71..17b456b 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -233,6 +233,8 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) )
, mbLinkableSelected ( sal_False )
, mpDropNavWin ( NULL )
+, mpFrame ( NULL )
+, mbSaveTreeItemState ( false )
, mbShowAllShapes ( false )
, mbShowAllPages ( false )
{
@@ -252,6 +254,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle )
: SvTreeListBox ( pParentWin, nStyle )
+, bisInSdNavigatorWin ( false )
, mpParent ( pParentWin )
, mpDoc ( NULL )
, mpBookmarkDoc ( NULL )
@@ -261,9 +264,10 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle )
, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) )
, mbLinkableSelected ( sal_False )
, mpDropNavWin ( NULL )
+, mpFrame ( NULL )
+, mbSaveTreeItemState ( false )
, mbShowAllShapes ( false )
, mbShowAllPages ( false )
-
{
// add lines to Tree-ListBox
SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 4200282..99c78bd 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -130,10 +130,8 @@ protected:
Image maImgOle;
Image maImgGraphic;
sal_Bool mbLinkableSelected;
- sal_Bool mbDragEnabled;
OUString maDocName;
::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks
- ::sd::DrawDocShell* mpDropDocSh;
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
vector<OUString> maTreeItem;
@@ -226,7 +224,6 @@ public:
std::vector<OUString> GetSelectEntryList (const sal_uInt16 nDepth) const;
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
- ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
sal_Bool IsLinkableSelected() const { return mbLinkableSelected; }
commit 766a512a88e1f20a8d64337e4ecf15cb64e765fb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:39:24 2014 +0000
coverity#1158489 Uninitialized scalar field
Change-Id: Ibe8600f8ad38859cd79d52528f970d99f0b8f536
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 899e8c8..82a91b4 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -645,7 +645,14 @@ namespace cppcanvas
bool mbIsFilled;
public:
- EMFPCustomLineCap() : EMFPObject()
+ EMFPCustomLineCap()
+ : EMFPObject()
+ , type(0)
+ , strokeStartCap(0)
+ , strokeEndCap(0)
+ , strokeJoin(0)
+ , miterLimit(0.0)
+ , mbIsFilled(false)
{
}
commit 2c31a03f7cf54257696be3109f569cdf28d2853c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:37:11 2014 +0000
coverity#1158490 Uninitialized scalar field
Change-Id: I03fd7aeea00a1998f4e281a7561f5d43672e9ccf
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index d8ed47f..e4b152f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4950,19 +4950,18 @@ public:
virtual ~SvNullStream() {}
};
-EscherEx::EscherEx( const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool bOOXML ) :
- mxGlobal ( rxGlobal ),
- mpOutStrm ( pOutStrm ),
- mbOwnsStrm ( false ),
-
- mnCurrentDg ( 0 ),
-
- mnGroupLevel ( 0 ),
- mnHellLayerId ( USHRT_MAX ),
-
- mbEscherSpgr ( sal_False ),
- mbEscherDg ( sal_False ),
- mbOOXML(bOOXML)
+EscherEx::EscherEx(const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool bOOXML)
+ : mxGlobal(rxGlobal)
+ , mpOutStrm(pOutStrm)
+ , mbOwnsStrm(false)
+ , mnCurrentDg(0)
+ , mnCountOfs(0)
+ , mnGroupLevel(0)
+ , mnHellLayerId(USHRT_MAX)
+ , mbEscherSpgr(false)
+ , mbEscherDg(false)
+ , mbOleEmf(false)
+ , mbOOXML(bOOXML)
{
if (!mpOutStrm)
{
commit fb29c7787b59d31d9d1fbba742a35a841701117b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:34:10 2014 +0000
coverity#1158491 Uninitialized pointer field
Change-Id: I6a055ef3146f4934e08d8be9af63e88c317fbeef
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index f9b6f5a..940de73 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -37,6 +37,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, WinBits nStyle)
: Control(pParent, nStyle | WB_DIALOGCONTROL)
, mbHasScrollBar(false)
, mpScrollBar(new ScrollBar(this, WB_VERT ))
+ , mpDoc(NULL)
{
mpScrollBar->SetScrollHdl( LINK( this, ScCondFormatList, ScrollHdl ) );
mpScrollBar->EnableDrag();
commit a9ae25fd2960c5879236b6359384f909221a7804
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:32:53 2014 +0000
coverity#1158492 Uninitialized scalar field
Change-Id: Ia31521ecef3cc7ec49289de9583e50baf106b050
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 23c4552..625c5ff 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -257,8 +257,9 @@ class ProgressBarTimer : Timer
double mfPosition;
ISegmentProgressBarRef mxWrapped;
public:
- ProgressWrapper( const ISegmentProgressBarRef &xRef ) :
- mxWrapped( xRef )
+ ProgressWrapper(const ISegmentProgressBarRef &xRef)
+ : mfPosition(0.0)
+ , mxWrapped(xRef)
{
}
virtual ~ProgressWrapper() {}
commit db72a45a1bd4540bb957b033d6b2ce1bdeb1c5a7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:30:08 2014 +0000
coverity#1158493 Uninitialized scalar field
Change-Id: I26de8ab1fa4a20bc08e800f04716507469430612
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index b160141..c433859 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -874,15 +874,19 @@ class SAXWriter :
XServiceInfo >
{
public:
- SAXWriter( ) :
- m_seqStartElement(),
- mp_SaxWriterHelper( NULL ),
- m_bForceLineBreak(sal_False),
- m_bAllowLineBreak(sal_False)
- {}
+ SAXWriter()
+ : m_seqStartElement()
+ , m_pSaxWriterHelper(NULL)
+ , m_bDocStarted(false)
+ , m_bIsCDATA(false)
+ , m_bForceLineBreak(false)
+ , m_bAllowLineBreak(false)
+ , m_nLevel(0)
+ {
+ }
~SAXWriter()
{
- delete mp_SaxWriterHelper;
+ delete m_pSaxWriterHelper;
}
public: // XActiveDataSource
@@ -890,14 +894,14 @@ public: // XActiveDataSource
throw (RuntimeException)
{
// temporary: set same stream again to clear buffer
- if ( m_out == aStream && mp_SaxWriterHelper && m_bDocStarted )
- mp_SaxWriterHelper->clearBuffer();
+ if ( m_out == aStream && m_pSaxWriterHelper && m_bDocStarted )
+ m_pSaxWriterHelper->clearBuffer();
else
{
m_out = aStream;
- delete mp_SaxWriterHelper;
- mp_SaxWriterHelper = new SaxWriterHelper(m_out);
+ delete m_pSaxWriterHelper;
+ m_pSaxWriterHelper = new SaxWriterHelper(m_out);
m_bDocStarted = sal_False;
m_nLevel = 0;
m_bIsCDATA = sal_False;
@@ -955,7 +959,7 @@ private:
Reference< XOutputStream > m_out;
Sequence < sal_Int8 > m_seqStartElement;
- SaxWriterHelper* mp_SaxWriterHelper;
+ SaxWriterHelper* m_pSaxWriterHelper;
// Status information
sal_Bool m_bDocStarted : 1;
@@ -968,11 +972,11 @@ private:
sal_Int32 SAXWriter::getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurrence ) throw()
{
sal_Int32 nLength =-1;
- if (mp_SaxWriterHelper)
+ if (m_pSaxWriterHelper)
{
if ( m_bForceLineBreak ||
(m_bAllowLineBreak &&
- ((nFirstLineBreakOccurrence + mp_SaxWriterHelper->GetLastColumnCount()) > MAXCOLUMNCOUNT)) )
+ ((nFirstLineBreakOccurrence + m_pSaxWriterHelper->GetLastColumnCount()) > MAXCOLUMNCOUNT)) )
nLength = m_nLevel;
}
m_bForceLineBreak = sal_False;
@@ -1007,11 +1011,11 @@ Sequence< OUString > SAXWriter::getSupportedServiceNames(void) throw ()
void SAXWriter::startDocument() throw(SAXException, RuntimeException )
{
- if( m_bDocStarted || ! m_out.is() || !mp_SaxWriterHelper ) {
+ if( m_bDocStarted || ! m_out.is() || !m_pSaxWriterHelper ) {
throw SAXException();
}
m_bDocStarted = sal_True;
- mp_SaxWriterHelper->startDocument();
+ m_pSaxWriterHelper->startDocument();
}
@@ -1028,7 +1032,7 @@ void SAXWriter::endDocument(void) throw(SAXException, RuntimeE
OUString("unexpected end of document"),
Reference< XInterface >() , Any() );
}
- mp_SaxWriterHelper->endDocument();
+ m_pSaxWriterHelper->endDocument();
try
{
m_out->closeOutput();
@@ -1094,9 +1098,9 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL
// write into sequence
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- SaxInvalidCharacterError eRet(mp_SaxWriterHelper->startElement(aName, xAttribs));
+ SaxInvalidCharacterError eRet(m_pSaxWriterHelper->startElement(aName, xAttribs));
m_nLevel++;
@@ -1128,13 +1132,13 @@ void SAXWriter::endElement(const OUString& aName) throw (SAXException, Runtime
// check here because Helper's endElement is not always called
#ifdef DBG_UTIL
- assert(!mp_SaxWriterHelper->m_DebugStartedElements.empty());
+ assert(!m_pSaxWriterHelper->m_DebugStartedElements.empty());
// Well-formedness constraint: Element Type Match
- assert(aName == mp_SaxWriterHelper->m_DebugStartedElements.top());
- mp_SaxWriterHelper->m_DebugStartedElements.pop();
+ assert(aName == m_pSaxWriterHelper->m_DebugStartedElements.top());
+ m_pSaxWriterHelper->m_DebugStartedElements.pop();
#endif
- if( mp_SaxWriterHelper->FinishEmptyElement() )
+ if( m_pSaxWriterHelper->FinishEmptyElement() )
m_bForceLineBreak = sal_False;
else
{
@@ -1145,9 +1149,9 @@ void SAXWriter::endElement(const OUString& aName) throw (SAXException, Runtime
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- bRet = mp_SaxWriterHelper->endElement(aName);
+ bRet = m_pSaxWriterHelper->endElement(aName);
}
if (!bRet)
@@ -1171,7 +1175,7 @@ void SAXWriter::characters(const OUString& aChars) throw(SAXException, RuntimeE
if( !aChars.isEmpty() )
{
if( m_bIsCDATA )
- bThrowException = !mp_SaxWriterHelper->writeString( aChars, sal_False, sal_False );
+ bThrowException = !m_pSaxWriterHelper->writeString( aChars, sal_False, sal_False );
else
{
// Note : nFirstLineBreakOccurrence is not exact, because we don't know, how
@@ -1195,11 +1199,11 @@ void SAXWriter::characters(const OUString& aChars) throw(SAXException, RuntimeE
if( nIndentPrefix >= 0 )
{
if( isFirstCharWhitespace( aChars.getStr() ) )
- mp_SaxWriterHelper->insertIndentation( nIndentPrefix - 1 );
+ m_pSaxWriterHelper->insertIndentation( nIndentPrefix - 1 );
else
- mp_SaxWriterHelper->insertIndentation( nIndentPrefix );
+ m_pSaxWriterHelper->insertIndentation( nIndentPrefix );
}
- bThrowException = !mp_SaxWriterHelper->writeString(aChars, sal_True , sal_False);
+ bThrowException = !m_pSaxWriterHelper->writeString(aChars, sal_True , sal_False);
}
}
if (bThrowException)
@@ -1245,9 +1249,9 @@ void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& a
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- if (!mp_SaxWriterHelper->processingInstruction(aTarget, aData))
+ if (!m_pSaxWriterHelper->processingInstruction(aTarget, aData))
{
SAXException except;
except.Message = "Invalid character during XML-Export";
@@ -1272,9 +1276,9 @@ void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException)
sal_Int32 nLength = 9;
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- mp_SaxWriterHelper->startCDATA();
+ m_pSaxWriterHelper->startCDATA();
m_bIsCDATA = sal_True;
}
@@ -1291,9 +1295,9 @@ void SAXWriter::endCDATA(void) throw (RuntimeException)
sal_Int32 nLength = 3;
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- mp_SaxWriterHelper->endCDATA();
+ m_pSaxWriterHelper->endCDATA();
m_bIsCDATA = sal_False;
}
@@ -1317,9 +1321,9 @@ void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeExc
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- if (!mp_SaxWriterHelper->comment(sComment))
+ if (!m_pSaxWriterHelper->comment(sComment))
{
SAXException except;
except.Message = "Invalid character during XML-Export";
@@ -1358,9 +1362,9 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc
sal_Int32 nPrefix = getIndentPrefixLength( nLength );
if( nPrefix >= 0 )
- mp_SaxWriterHelper->insertIndentation( nPrefix );
+ m_pSaxWriterHelper->insertIndentation( nPrefix );
- if (!mp_SaxWriterHelper->writeString( sString, sal_False, sal_False))
+ if (!m_pSaxWriterHelper->writeString( sString, sal_False, sal_False))
{
SAXException except;
except.Message = "Invalid character during XML-Export";
commit 78ea0133f253961679c6ec7eb281c80c009f959b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 15:26:56 2014 +0000
coverity#1158514 Unused pointer value
Change-Id: I8eca4e262d374b78017b9e0037d7be70a7e2bd6f
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 739c882..2718692 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -236,8 +236,8 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
}
else // ueberlies die nicht geoeffneten Enden
{
- while ( ( nEndIndex < pHints->GetEndCount() ) &&
- (*(pTxtAttr=pHints->GetEnd(nEndIndex))->GetAnyEnd()<=nNewPos))
+ while ( (nEndIndex < pHints->GetEndCount()) &&
+ (*pHints->GetEnd(nEndIndex)->GetAnyEnd() <= nNewPos) )
{
nEndIndex++;
}
commit 65464fdf04cdadc602d53ef7fda81f0f0647ad46
Author: Tsutomu Uchino <hanya at apache.org>
Date: Thu Jan 23 11:28:01 2014 +0000
Resolves: #i123626# change default for paste special dialog of Calc...
to Text, Numbers and Date and time
(cherry picked from commit 6abcfea44da2811940578f248080951eb320420f)
Change-Id: I879f77ebbeb9486467e2a5740793d96d7a0600bb
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 3e7a8ce..5a442ec 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -31,10 +31,8 @@
//==================================================================
-sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_True;
-sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING |
- IDF_NOTE | IDF_FORMULA |
- IDF_ATTRIB | IDF_OBJECTS);
+sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_False;
+sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING);
sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd
commit ebf5e613a5bea74d6e9801224ab5c29a64b9b11c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 14:21:11 2014 +0000
SfxNoLayoutSingleTabDialog not needed anymore
all single tab dialogs are .ui enabled now.
So now we can remove SfxNoLayoutSingleTabDialog and merge SfxSingleTabDialog
and ~SfxNoLayoutSingleTabDialogBase together
Change-Id: If0acc792d85b7d399572257d7e9b0e12993ba3fe
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index e8884e0..5d22669 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -46,7 +46,7 @@ NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet)
{
SfxTabPage* pTabPage = (*fnCreatePage)( get_content_area(), rSet );
pTabPage->PageCreated(rSet);
- setTabPage(pTabPage);
+ SetTabPage(pTabPage);
}
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index fa2fbc9..80d1337 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -873,7 +873,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::X
const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex )
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
- setTabPage(new SvxMacroTabPage(get_content_area(), _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
+ SetTabPage(new SvxMacroTabPage(get_content_area(), _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
}
//===============================================
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 85c04d3..e11ed6b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -506,7 +506,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui");
SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), aSet );
( (SvxLinguTabPage*)pPage )->HideGroups( GROUP_MODULES );
- pDlg->setTabPage( pPage );
+ pDlg->SetTabPage( pPage );
if(RET_OK == pDlg->Execute())
{
InitUserDicts();
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 08ff0bf..9050f49 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -56,7 +56,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent,
// SfxSingleTabDialog destructor
pPage = (SvxJSearchOptionsPage *)
SvxJSearchOptionsPage::Create(get_content_area(), rOptionsSet );
- setTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
+ SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
pPage->EnableSaveOptions(false);
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e7a59a3..cc30952 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -79,7 +79,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const S
, SfxSingleTabDialog(pParent, getRegistrationItems())
{
SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), getRegistrationItems());
- setTabPage(page);
+ SetTabPage(page);
SetText(page->get<VclFrame>("frame1")->get_label());
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 9ceb12c..602e923 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -60,7 +60,7 @@ SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rIn
_pPage->SetView( pSdrView );
_pPage->Construct();
- setTabPage( _pPage );
+ SetTabPage( _pPage );
SetText(CUI_RESSTR( RID_SVXSTR_CONNECTOR ));
}
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 20dfb45..b35dcd4 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -46,7 +46,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
, mpPage(NULL)
{
mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
- setTabPage(mpPage);
+ SetTabPage(mpPage);
}
/*************************************************************************
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 6c99eab..b55e6c7 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -474,7 +474,7 @@ SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent,
{
SfxMacroTabPage* pPage = CreateSfxMacroTabPage(get_content_area(), rSet);
pPage->SetFrame( rxDocumentFrame );
- setTabPage( pPage );
+ SetTabPage( pPage );
pPage->LaunchFillGroup();
}
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 245b1f6..1a704fd 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -69,7 +69,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
_pPage->SetView( pSdrView );
_pPage->Construct();
- setTabPage(_pPage );
+ SetTabPage(_pPage );
SetText(CUI_RESSTR(RID_SVXSTR_DIMENSION_LINE));
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8fdc964..c0247fe 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1108,7 +1108,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
}
else
{
- SfxSingleTabDialogBase* pParent = dynamic_cast< SfxSingleTabDialogBase* >( GetParentDialog() );
+ SfxSingleTabDialog* pParent = dynamic_cast< SfxSingleTabDialog* >( GetParentDialog() );
OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL;
if ( pOKButton )
pOKButton->Click();
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index a57b753..33051d3 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -56,7 +56,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
OTableSubscriptionPage* pTabPage = new OTableSubscriptionPage(get_content_area(), *m_pOutSet, this);
pTabPage->SetServiceFactory(_rxORB);
- setTabPage(pTabPage);
+ SetTabPage(pTabPage);
}
OTableSubscriptionDialog::~OTableSubscriptionDialog()
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 850ebef..7260092 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2730,7 +2730,7 @@ namespace pcr
throw RuntimeException(); // caught below
SfxTabPage* pPage = (*fnCreatePage)( xDialog->get_content_area(), aCoreSet );
- xDialog->setTabPage( pPage );
+ xDialog->SetTabPage( pPage );
_rClearBeforeDialog.clear();
if ( RET_OK == xDialog->Execute() )
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index def7d09..33041fd 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -178,21 +178,20 @@ struct SingleTabDlgImpl
typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
-class SFX2_DLLPUBLIC SfxSingleTabDialogBase : public SfxModalDialog
+class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
{
public:
- //layout ctors
- SfxSingleTabDialogBase(Window *pParent, const SfxItemSet& rOptionsSet,
- const OString& rID, const OUString& rUIXMLDescription);
- SfxSingleTabDialogBase(Window *pParent, const SfxItemSet* pInSet,
- const OString& rID, const OUString& rUIXMLDescription);
+ SfxSingleTabDialog(Window *pParent, const SfxItemSet& rOptionsSet,
+ const OString& rID = OString("SingleTabDialog"),
+ const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
- //non-layout ctors
- SfxSingleTabDialogBase( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
- SfxSingleTabDialogBase( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 );
+ SfxSingleTabDialog(Window *pParent, const SfxItemSet* pInSet = 0,
+ const OString& rID = OString("SingleTabDialog"),
+ const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
- virtual ~SfxSingleTabDialogBase();
+ virtual ~SfxSingleTabDialog();
+ void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0);
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
OKButton* GetOKButton() const { return pOKBtn; }
@@ -210,40 +209,6 @@ protected:
DECL_DLLPRIVATE_LINK(OKHdl_Impl, void *);
};
-class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxSingleTabDialogBase
-{
-public:
- SfxSingleTabDialog(Window *pParent, const SfxItemSet& rOptionsSet,
- const OString& rID = OString("SingleTabDialog"),
- const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"))
- : SfxSingleTabDialogBase(pParent, rOptionsSet, rID, rUIXMLDescription)
- {
- }
- SfxSingleTabDialog(Window *pParent, const SfxItemSet* pInSet = 0,
- const OString& rID = OString("SingleTabDialog"),
- const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"))
- : SfxSingleTabDialogBase(pParent, pInSet, rID, rUIXMLDescription)
- {
- }
- void setTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0);
-};
-
-//Old school deprecated non-layout aware version
-class SFX2_DLLPUBLIC SfxNoLayoutSingleTabDialog : public SfxSingleTabDialogBase
-{
-public:
- SfxNoLayoutSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId)
- : SfxSingleTabDialogBase(pParent, rOptionsSet, nUniqueId)
- {
- }
- SfxNoLayoutSingleTabDialog(Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0)
- : SfxSingleTabDialogBase(pParent, nUniqueId, pInSet)
- {
- }
- ~SfxNoLayoutSingleTabDialog();
- void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0);
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 7c39776..46dfeaa 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -232,17 +232,17 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl)
{
aText = ScGlobal::GetRscString( STR_PAGEHEADER );
if ( bRightPage )
- pDlg->setTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
else
- pDlg->setTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
}
else
{
aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
if ( bRightPage )
- pDlg->setTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
else
- pDlg->setTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
}
SvxNumType eNumType = ((const SvxPageItem&)aDataSet.Get(ATTR_PAGE)).GetNumType();
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 64d34be..919b9db 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -89,7 +89,7 @@ SdActionDlg::SdActionDlg (
( (SdTPAction*) pNewPage )->SetView( pView );
( (SdTPAction*) pNewPage )->Construct();
- setTabPage( pNewPage );
+ SetTabPage( pNewPage );
}
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 6280864..4bba70f 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -648,9 +648,9 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
}
-// SfxSingleTabDialogBase ----------------------------------------------------
+// SfxSingleTabDialog ----------------------------------------------------
-IMPL_LINK_NOARG(SfxSingleTabDialogBase, OKHdl_Impl)
+IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
/* [Description]
@@ -698,76 +698,25 @@ IMPL_LINK_NOARG(SfxSingleTabDialogBase, OKHdl_Impl)
// -----------------------------------------------------------------------
-SfxSingleTabDialogBase::SfxSingleTabDialogBase
-(
- Window *pParent,
- const SfxItemSet& rSet,
- sal_uInt16 nUniqueId
-) :
-
-/* [Description]
-
- Constructor of the general base class for SingleTab-Dialoge;
- ID for the ini-file is handed over.
-*/
-
- SfxModalDialog( pParent, nUniqueId, WinBits( WB_STDMODAL | WB_3DLOOK ) ),
-
- pOKBtn ( 0 ),
- pCancelBtn ( 0 ),
- pHelpBtn ( 0 ),
- pImpl ( new SingleTabDlgImpl )
-{
- DBG_WARNING( "please use the constructor with ViewFrame" );
- SetInputSet( &rSet );
-}
-
-// -----------------------------------------------------------------------
-
-SfxSingleTabDialogBase::SfxSingleTabDialogBase
-(
- Window* pParent,
- sal_uInt16 nUniqueId,
- const SfxItemSet* pInSet
-)
-
-/* [Description]
-
- Constructor of the general base class for SingleTab-Dialoge;
- ID for the ini-file is handed over.
- Deprecated.
- */
-
-: SfxModalDialog( pParent, nUniqueId, WinBits( WB_STDMODAL | WB_3DLOOK ) ),
-
- pOKBtn ( 0 ),
- pCancelBtn ( 0 ),
- pHelpBtn ( 0 ),
- pImpl ( new SingleTabDlgImpl )
-{
- DBG_WARNING( "please use the constructor with ViewFrame" );
- SetInputSet( pInSet );
-}
-
-SfxSingleTabDialogBase::SfxSingleTabDialogBase(Window *pParent, const SfxItemSet& rSet,
+SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet,
const OString& rID, const OUString& rUIXMLDescription)
: SfxModalDialog(pParent, rID, rUIXMLDescription)
, pImpl(new SingleTabDlgImpl)
{
get(pOKBtn, "ok");
- pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialogBase, OKHdl_Impl ) );
+ pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) );
get(pCancelBtn, "cancel");
get(pHelpBtn, "help");
SetInputSet( &rSet );
}
-SfxSingleTabDialogBase::SfxSingleTabDialogBase(Window* pParent, const SfxItemSet* pInSet,
+SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet,
const OString& rID, const OUString& rUIXMLDescription)
: SfxModalDialog(pParent, rID, rUIXMLDescription)
, pImpl(new SingleTabDlgImpl)
{
get(pOKBtn, "ok");
- pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialogBase, OKHdl_Impl ) );
+ pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) );
get(pCancelBtn, "cancel");
get(pHelpBtn, "help");
SetInputSet( pInSet );
@@ -775,14 +724,14 @@ SfxSingleTabDialogBase::SfxSingleTabDialogBase(Window* pParent, const SfxItemSet
// -----------------------------------------------------------------------
-SfxSingleTabDialogBase::~SfxSingleTabDialogBase()
+SfxSingleTabDialog::~SfxSingleTabDialog()
{
delete pImpl->m_pSfxPage;
delete pImpl->m_pLine;
delete pImpl;
}
-void SfxSingleTabDialog::setTabPage(SfxTabPage* pTabPage,
+void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
GetTabPageRanges pRangesFunc, sal_uInt32 nSettingsId)
/* [Description]
@@ -825,77 +774,4 @@ void SfxSingleTabDialog::setTabPage(SfxTabPage* pTabPage,
}
}
-// -----------------------------------------------------------------------
-
-void SfxNoLayoutSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
- GetTabPageRanges pRangesFunc )
-/* [Description]
-
- Insert a (new) TabPage; an existing page is deleted.
- The passed on page is initialized with the initially given Itemset
- through calling Reset().
-*/
-
-{
- if ( !pOKBtn )
- {
- pOKBtn = new OKButton( this, WB_DEFBUTTON );
- pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialogBase, OKHdl_Impl ) );
- }
- if ( !pCancelBtn )
- pCancelBtn = new CancelButton( this );
- if ( !pHelpBtn )
- pHelpBtn = new HelpButton( this );
-
- delete pImpl->m_pSfxPage;
- pImpl->m_pSfxPage = pTabPage;
- fnGetRanges = pRangesFunc;
-
- if ( pImpl->m_pSfxPage )
- {
- // First obtain the user data, only then Reset()
- SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
- OUString sUserData;
- Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
- OUString aTemp;
- if ( aUserItem >>= aTemp )
- sUserData = aTemp;
- pImpl->m_pSfxPage->SetUserData( sUserData );
- pImpl->m_pSfxPage->Reset( *GetInputItemSet() );
- pImpl->m_pSfxPage->Show();
-
- // Adjust size and position
- pImpl->m_pSfxPage->SetPosPixel( Point() );
- Size aOutSz( pImpl->m_pSfxPage->GetSizePixel() );
- Size aBtnSiz = LogicToPixel( Size( 50, 14 ), MAP_APPFONT );
- Point aPnt( aOutSz.Width(), LogicToPixel( Point( 0, 6 ), MAP_APPFONT ).Y() );
- aOutSz.Width() += aBtnSiz.Width() + LogicToPixel( Size( 6, 0 ), MAP_APPFONT ).Width();
- SetOutputSizePixel( aOutSz );
- pOKBtn->SetPosSizePixel( aPnt, aBtnSiz );
- pOKBtn->Show();
- aPnt.Y() = LogicToPixel( Point( 0, 23 ), MAP_APPFONT ).Y();
- pCancelBtn->SetPosSizePixel( aPnt, aBtnSiz );
- pCancelBtn->Show();
- aPnt.Y() = LogicToPixel( Point( 0, 43 ), MAP_APPFONT ).Y();
- pHelpBtn->SetPosSizePixel( aPnt, aBtnSiz );
-
- if ( Help::IsContextHelpEnabled() )
- pHelpBtn->Show();
-
- // Set TabPage text in the Dialog
- SetText( pImpl->m_pSfxPage->GetText() );
-
- // Dialog receives the HelpId of TabPage
- SetHelpId( pImpl->m_pSfxPage->GetHelpId() );
- SetUniqueId( pImpl->m_pSfxPage->GetUniqueId() );
- }
-}
-
-SfxNoLayoutSingleTabDialog::~SfxNoLayoutSingleTabDialog()
-{
- delete pOKBtn;
- delete pCancelBtn;
- delete pHelpBtn;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index afd9b6a..bedc10d 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -748,7 +748,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog.get_content_area(), aCropDlgAttr );
pTabPage->SetText( aCropStr );
- aCropDialog.setTabPage( pTabPage );
+ aCropDialog.SetTabPage( pTabPage );
if( aCropDialog.Execute() == RET_OK )
{
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 038bb02..edb3171 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -526,7 +526,7 @@ SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet )
{
SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), rSet);
pNewPage->SetFormat(false);
- setTabPage(pNewPage);
+ SetTabPage(pNewPage);
}
SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index a77c08a..3d21e60 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -44,7 +44,7 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put ( SvxNumberInfoItem( (const SvxNumberInfoItem&)pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO )));
pNewPage->PageCreated(aSet);
- setTabPage(pNewPage);
+ SetTabPage(pNewPage);
}
}
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index ea6408c..705c689 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -357,7 +357,7 @@ SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet)
{
// create TabPage
- setTabPage(SwMailConfigPage::Create(get_content_area(), rSet));
+ SetTabPage(SwMailConfigPage::Create(get_content_area(), rSet));
}
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 9300385..57b03f3 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -317,7 +317,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet)
"modules/swriter/ui/captiondialog.ui")
{
// create TabPage
- setTabPage(SwCaptionOptPage::Create(get_content_area(), rSet));
+ SetTabPage(SwCaptionOptPage::Create(get_content_area(), rSet));
}
SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle )
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
{
OUString sFldTypeName = m_pCategoryBox->GetText();
- SfxSingleTabDialogBase *pDlg = dynamic_cast<SfxSingleTabDialogBase*>(GetParentDialog());
+ SfxSingleTabDialog *pDlg = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog());
PushButton *pBtn = pDlg ? pDlg->GetOKButton() : NULL;
if (pBtn)
pBtn->Enable(!sFldTypeName.isEmpty());
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index daf4a95..5b6a81a 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -30,7 +30,7 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet)
if ( fnCreatePage )
{
SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), rSet);
- setTabPage(pPage2);
+ SetTabPage(pPage2);
}
}
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 2315ce0..71491a8 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -186,7 +186,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh);
- setTabPage(pTabPage);
+ SetTabPage(pTabPage);
return pTabPage;
}
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index f329ba4..6aea64e 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -33,7 +33,7 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
if ( fnCreatePage )
{
- setTabPage((*fnCreatePage)(get_content_area(), rSet));
+ SetTabPage((*fnCreatePage)(get_content_area(), rSet));
}
}
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index c32f02b..98f0799 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -60,7 +60,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD
SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet);
pNewPage->SetFormatUsed(sal_False, bDrawMode);
pNewPage->SetShell(pWrtShell);
- setTabPage(pNewPage);
+ SetTabPage(pNewPage);
}
SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet)
More information about the Libreoffice-commits
mailing list