summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/accpara.cxx4
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/layout/ssfrm.cxx2
-rw-r--r--sw/source/core/text/txtfrm.cxx2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx2
-rw-r--r--sw/source/core/unocore/unoframe.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx8
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx4
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx12
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
13 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 3d650b111979..dee3966db56b 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -162,7 +162,7 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
if(!GetPortionData().IsValidCorePosition( nIndex ) ||
( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
{
- SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
+ const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
bool bFormat = (pTxtFrm && pTxtFrm->HasPara());
if(bFormat)
{
@@ -946,7 +946,7 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void)
{
SolarMutexGuard aGuard;
- SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
+ const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
if( !pTxtFrm )
{
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" );
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 01d13de00c32..0289c2ce7243 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -155,7 +155,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
if( 0 != (pDesc = (SwFmtPageDesc*)rPool.GetItem2( RES_PAGEDESC, n ) )
&& pDesc->GetNumOffset() && pDesc->GetDefinedIn() )
{
- SwCntntNode* pNd = PTR_CAST( SwCntntNode, pDesc->GetDefinedIn() );
+ const SwCntntNode* pNd = PTR_CAST( SwCntntNode, pDesc->GetDefinedIn() );
if( pNd )
{
if ( SwIterator<SwFrm,SwCntntNode>::FirstElement(*pNd) )
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 714ef7ae25cd..3d94b59ee347 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -423,7 +423,7 @@ SwCntntFrm::SwCntntFrm( SwCntntNode * const pCntnt, SwFrm* pSib ) :
SwCntntFrm::~SwCntntFrm()
{
- SwCntntNode* pCNd;
+ const SwCntntNode* pCNd;
if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() )) &&
!pCNd->GetDoc()->IsInDtor() )
{
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index d2951ff0958f..389127d565f2 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -371,7 +371,7 @@ SwTxtFrm::~SwTxtFrm()
// Remove associated SwParaPortion from pTxtCache
ClearPara();
- SwCntntNode* pCNd;
+ const SwCntntNode* pCNd;
if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() )) &&
!pCNd->GetDoc()->IsInDtor() && HasFtn() )
{
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index b4ef13186791..2207df9411cf 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -191,7 +191,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
::sw::UnoTunnelGetImplementation<SwXFrame>(xTunnel));
if (pFrame)
{
- SwFrmFmt *const pFrmFmt(pFrame->GetFrmFmt());
+ const SwFrmFmt *const pFrmFmt(pFrame->GetFrmFmt());
if (pFrmFmt && pFrmFmt->GetDoc() == &rTargetDoc)
{
o_rFrame = std::make_pair(pFrmFmt->GetName(), pFrame->GetFlyCntType());
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index d3e0fbe1ec87..31e00cf5c340 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3183,7 +3183,7 @@ const SwStartNode *SwXTextFrame::GetStartNode() const
{
const SwStartNode *pSttNd = 0;
- SwFrmFmt* pFmt = GetFrmFmt();
+ const SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
const SwFmtCntnt& rFlyCntnt = pFmt->GetCntnt();
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index e198c739bbf6..b4353db683bb 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -687,7 +687,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
- SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
+ const SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
uno::Reference< awt::XControl > xControl;
if ( pDrawView && pVSh->GetWin() && pFormObj )
xControl = pFormObj->GetUnoControl( *pDrawView, *pVSh->GetWin() );
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 47d6f1793c62..4fc3adf8620b 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -642,7 +642,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
if( !pObj || FmFormInventor != pObj->GetObjInventor() )
return 0;
- SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
+ const SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
assert(pFormObj);
if (!pFormObj)
return 0;
@@ -676,7 +676,7 @@ static void GetControlSize( const SdrObject& rSdrObj, Size& rSz,
if( !pVSh )
return;
- SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObj );
+ const SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObj );
assert(pFormObj);
if (!pFormObj)
return;
@@ -703,7 +703,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
- SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObject );
+ const SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObject );
assert(pFormObj);
if (!pFormObj)
return rWrt;
@@ -1292,7 +1292,7 @@ static void AddControl( HTMLControls& rControls,
const SdrObject *pSdrObj,
sal_uInt32 nNodeIdx )
{
- SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pSdrObj );
+ const SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pSdrObj );
assert(pFormObj); //Doch kein FormObj
if (!pFormObj)
return;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4bdb9db2e003..25554fb9be61 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4429,7 +4429,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
{
if (pObject && pObject->GetObjInventor() == FmFormInventor)
{
- if (SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject))
+ if (SdrUnoObj *pFormObj = const_cast<SdrUnoObj*>(PTR_CAST(SdrUnoObj,pObject)))
{
uno::Reference<awt::XControlModel> xControlModel = pFormObj->GetUnoControlModel();
uno::Reference<lang::XServiceInfo> xInfo(xControlModel, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 653c5adf5167..7beef00019af 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1752,7 +1752,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
if (pObject && pObject->GetObjInventor() == FmFormInventor)
{
- if (SdrUnoObj* pFormObj = PTR_CAST(SdrUnoObj,pObject))
+ if (const SdrUnoObj* pFormObj = PTR_CAST(SdrUnoObj,pObject))
{
uno::Reference< awt::XControlModel > xControlModel =
pFormObj->GetUnoControlModel();
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 79a32b00b58a..fd009dfd4e4a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -370,7 +370,7 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
const SdrObject *pObject = rFrmFmt.FindRealSdrObject();
if (pObject && pObject->GetObjInventor() == FmFormInventor)
{
- if (SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject))
+ if (const SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject))
{
uno::Reference< awt::XControlModel > xControlModel =
pFormObj->GetUnoControlModel();
@@ -3112,7 +3112,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
if (!rWW8Wrt.bWrtWW8)
return false;
- SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObj);
+ const SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObj);
assert(pFormObj);
if (!pFormObj)
return false;
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index cdd9cd0d0f19..40253feaeaf5 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -536,7 +536,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_BOX:
{
- SvxBoxItem* pBox = PTR_CAST(SvxBoxItem, &rItem);
+ const SvxBoxItem* pBox = PTR_CAST(SvxBoxItem, &rItem);
assert(pBox && "Wrong Which-ID");
if (pBox)
{
@@ -874,7 +874,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_KEEP:
{
- SvxFmtKeepItem* pFmtKeep = PTR_CAST(SvxFmtKeepItem, &rItem);
+ const SvxFmtKeepItem* pFmtKeep = PTR_CAST(SvxFmtKeepItem, &rItem);
assert(pFmtKeep && "Wrong Which-ID");
if (pFmtKeep)
{
@@ -888,7 +888,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_BACKGROUND:
{
- SvxBrushItem* pBrush = PTR_CAST(SvxBrushItem, &rItem);
+ const SvxBrushItem* pBrush = PTR_CAST(SvxBrushItem, &rItem);
OSL_ENSURE( pBrush != NULL, "Wrong Which-ID" );
// note: the graphic is only exported if nMemberId equals
@@ -1038,7 +1038,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_HORI_ORIENT:
{
- SwFmtHoriOrient* pHoriOrient = PTR_CAST(SwFmtHoriOrient, &rItem);
+ const SwFmtHoriOrient* pHoriOrient = PTR_CAST(SwFmtHoriOrient, &rItem);
assert(pHoriOrient && "Wrong Which-ID");
if (pHoriOrient)
{
@@ -1051,7 +1051,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_VERT_ORIENT:
{
- SwFmtVertOrient* pVertOrient = PTR_CAST(SwFmtVertOrient, &rItem);
+ const SwFmtVertOrient* pVertOrient = PTR_CAST(SwFmtVertOrient, &rItem);
assert(pVertOrient && "Wrong Which-ID");
SvXMLUnitConverter::convertEnum( aOut, pVertOrient->GetVertOrient(),
@@ -1062,7 +1062,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_FRM_SIZE:
{
- SwFmtFrmSize* pFrmSize = PTR_CAST(SwFmtFrmSize, &rItem);
+ const SwFmtFrmSize* pFrmSize = PTR_CAST(SwFmtFrmSize, &rItem);
OSL_ENSURE( pFrmSize != NULL, "Wrong Which-ID" );
bool bOutHeight = false;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index a23576148b86..8b359b62a940 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -1044,10 +1044,10 @@ bool SwXMLImport::FindAutomaticStyle(
SwXMLItemSetStyleContext_Impl *pStyle = 0;
if( GetAutoStyles() )
{
- pStyle = PTR_CAST( SwXMLItemSetStyleContext_Impl,
+ pStyle = const_cast<SwXMLItemSetStyleContext_Impl*>(PTR_CAST( SwXMLItemSetStyleContext_Impl,
GetAutoStyles()->
FindStyleChildContext( nFamily, rName,
- true ) );
+ true ) ) );
if( pStyle )
{
if( ppItemSet )
generated by cgit (git 2.34.1) at 2024-06-12 18:54:09 +0000