summaryrefslogtreecommitdiff
path: root/sw/source/uibase/table
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/table')
-rw-r--r--sw/source/uibase/table/chartins.cxx16
-rw-r--r--sw/source/uibase/table/swtablerep.cxx4
-rw-r--r--sw/source/uibase/table/tablemgr.cxx36
-rw-r--r--sw/source/uibase/table/tablepg.hxx8
4 files changed, 32 insertions, 32 deletions
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 68d521d789cd..3b7a3e2fb389 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -144,7 +144,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
uno::Reference< frame::XModel > xChartModel;
OUString aRangeString;
- if( rWrtShell.IsCrsrInTbl())
+ if( rWrtShell.IsCrsrInTable())
{
if (!rWrtShell.IsTableMode())
{
@@ -152,18 +152,18 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
rWrtShell.GetView().GetViewFrame()->GetDispatcher()->
Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON);
}
- if( ! rWrtShell.IsTblComplexForChart())
+ if( ! rWrtShell.IsTableComplexForChart())
{
- SwFrmFmt* pTblFmt = rWrtShell.GetTableFmt();
- aRangeString = pTblFmt->GetName() + "." + rWrtShell.GetBoxNms();
+ SwFrameFormat* pTableFormat = rWrtShell.GetTableFormat();
+ aRangeString = pTableFormat->GetName() + "." + rWrtShell.GetBoxNms();
// get table data provider
xDataProvider.set( pView->GetDocShell()->getIDocumentChartDataProviderAccess()->GetChartDataProvider( true ) );
}
}
- SwFlyFrmFmt *pFlyFrmFmt = 0;
- xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
+ SwFlyFrameFormat *pFlyFrameFormat = 0;
+ xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat ));
//open wizard
//@todo get context from writer if that has one
@@ -211,8 +211,8 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
{
//calculate and set new position
SwRect aSwRect;
- if (pFlyFrmFmt)
- aSwRect = pFlyFrmFmt->GetAnchoredObj()->GetObjRectWithSpaces();
+ if (pFlyFrameFormat)
+ aSwRect = pFlyFrameFormat->GetAnchoredObj()->GetObjRectWithSpaces();
Rectangle aRect( aSwRect.SVRect() );
Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect );
xDialogProps->setPropertyValue("Position",
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index 49fe7168c219..07cbad16a25c 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -55,7 +55,7 @@
SwTableRep::SwTableRep( const SwTabCols& rTabCol )
:
- nTblWidth(0),
+ nTableWidth(0),
nSpace(0),
nLeftSpace(0),
nRightSpace(0),
@@ -152,7 +152,7 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
rTabCols[i] = nPos + nLeft;
rTabCols.SetHidden( i, bOld );
}
- rTabCols.SetRight(nLeft + nTblWidth);
+ rTabCols.SetRight(nLeft + nTableWidth);
}
else
{
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 3f48722aeac5..a21b1687de17 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -161,35 +161,35 @@ void SwTableFUNC::InitTabCols()
{
OSL_ENSURE(pSh, "no Shell");
- if( pFmt && pSh)
+ if( pFormat && pSh)
pSh->GetTabCols( aCols );
}
-SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt)
- : pFmt(pShell->GetTableFmt()),
+SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat)
+ : pFormat(pShell->GetTableFormat()),
pSh(pShell),
- bCopy(bCopyFmt)
+ bCopy(bCopyFormat)
{
// if applicable copy the format for edit
- if( pFmt && bCopy )
- pFmt = new SwFrmFmt( *pFmt );
+ if( pFormat && bCopy )
+ pFormat = new SwFrameFormat( *pFormat );
}
SwTableFUNC::~SwTableFUNC()
{
if(bCopy)
- delete pFmt;
+ delete pFormat;
}
void SwTableFUNC::UpdateChart()
{
//Update of the fields triggered by the user, all Charts of
//the table will be brought up to date
- SwFrmFmt *pFmt2 = pSh->GetTableFmt();
- if ( pFmt2 && pSh->HasOLEObj( pFmt2->GetName() ) )
+ SwFrameFormat *pFormat2 = pSh->GetTableFormat();
+ if ( pFormat2 && pSh->HasOLEObj( pFormat2->GetName() ) )
{
pSh->StartAllAction();
- pSh->UpdateCharts( pFmt2->GetName() );
+ pSh->UpdateCharts( pFormat2->GetName() );
pSh->EndAllAction();
}
}
@@ -198,22 +198,22 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
uno::Reference< chart2::data::XDataProvider > &rxDataProvider,
bool bFillWithData,
const OUString &rCellRange,
- SwFlyFrmFmt** ppFlyFrmFmt )
+ SwFlyFrameFormat** ppFlyFrameFormat )
{
uno::Reference< frame::XModel > xChartModel;
pSh->StartUndo( UNDO_UI_INSERT_CHART );
pSh->StartAllAction();
OUString aName;
- if (pSh->IsCrsrInTbl())
+ if (pSh->IsCrsrInTable())
{
- aName = pSh->GetTableFmt()->GetName();
+ aName = pSh->GetTableFormat()->GetName();
// insert node before table
pSh->MoveTable( fnTableCurr, fnTableStart );
pSh->Up( false, 1, false );
- if ( pSh->IsCrsrInTbl() )
+ if ( pSh->IsCrsrInTable() )
{
- if ( aName != pSh->GetTableFmt()->GetName() )
+ if ( aName != pSh->GetTableFormat()->GetName() )
pSh->Down( false, 1, false ); // two adjacent tables
}
pSh->SplitNode();
@@ -229,10 +229,10 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
if ( xObj.is() )
{
- SwFlyFrmFmt* pTmp = 0;
+ SwFlyFrameFormat* pTmp = 0;
pSh->InsertOleObject( aEmbObjRef, &pTmp );
- if (ppFlyFrmFmt)
- *ppFlyFrmFmt = pTmp;
+ if (ppFlyFrameFormat)
+ *ppFlyFrameFormat = pTmp;
uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY );
if( xCompSupp.is())
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 6d8a7670fcde..2a01c57a714b 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -61,7 +61,7 @@ class SwFormatTablePage : public SfxTabPage
VclPtr<ListBox> m_pTextDirectionLB;
- SwTableRep* pTblData;
+ SwTableRep* pTableData;
SwTwips nSaveWidth;
SwTwips nMinTableWidth;
bool bModified;
@@ -103,7 +103,7 @@ class SwTableColumnPage : public SfxTabPage
VclPtr<PushButton> m_pUpBtn;
VclPtr<PushButton> m_pDownBtn;
- SwTableRep* pTblData;
+ SwTableRep* pTableData;
PercentField m_aFieldArr[MET_FIELDS];
VclPtr<FixedText> m_pTextArr[MET_FIELDS];
SwTwips nTableWidth;
@@ -111,9 +111,9 @@ class SwTableColumnPage : public SfxTabPage
sal_uInt16 nNoOfCols;
sal_uInt16 nNoOfVisibleCols;
// Remember the width, when switching to autoalign
- sal_uInt16 aValueTbl[MET_FIELDS];// primary assignment of the MetricFields
+ sal_uInt16 aValueTable[MET_FIELDS];// primary assignment of the MetricFields
bool bModified:1;
- bool bModifyTbl:1;
+ bool bModifyTable:1;
bool bPercentMode:1;
void Init(bool bWeb);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 14:35:44 +0000