[Libreoffice-commits] core.git: 4 commits - sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Nov 11 23:36:34 PST 2015
sw/inc/viewopt.hxx | 48 ++--
sw/source/core/inc/layact.hxx | 114 +++++------
sw/source/core/layout/layact.cxx | 284 ++++++++++++++---------------
sw/source/filter/xml/xmlimp.cxx | 136 ++++++-------
sw/source/filter/xml/xmlimp.hxx | 66 +++---
sw/source/filter/xml/xmlitemi.cxx | 26 +-
sw/source/filter/xml/xmltbli.cxx | 12 -
sw/source/ui/frmdlg/frmpage.cxx | 352 ++++++++++++++++++------------------
sw/source/uibase/config/viewopt.cxx | 154 +++++++--------
sw/source/uibase/inc/frmpage.hxx | 50 ++---
10 files changed, 621 insertions(+), 621 deletions(-)
New commits:
commit 1ea8188fa1669bcbc9e04803216fd9227adf6b11
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 12 08:35:21 2015 +0100
sw: prefix members of SwViewOption
Change-Id: Ia86aac05e67990bd47400dc7aabbedde278e4fd1
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 5055992..a3cf5b3 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -103,29 +103,29 @@ namespace svtools{ class ColorConfig;}
class SW_DLLPUBLIC SwViewOption
{
- static Color aDocColor; // color of document boundaries
- static Color aDocBoundColor; // color of document boundaries
- static Color aObjectBoundColor; // color of object boundaries
- static Color aAppBackgroundColor; // application background
- static Color aTableBoundColor; // color of table boundaries
- static Color aFontColor;
- static Color aIndexShadingsColor; // background color of indexes
- static Color aLinksColor;
- static Color aVisitedLinksColor;
- static Color aDirectCursorColor;
- static Color aTextGridColor;
- static Color aSpellColor; // mark color of online spell checking
- static Color aSmarttagColor;
- static Color aFieldShadingsColor;
- static Color aSectionBoundColor;
- static Color aPageBreakColor;
- static Color aScriptIndicatorColor;
- static Color aShadowColor;
- static Color aHeaderFooterMarkColor;
-
- static sal_Int32 nAppearanceFlags;
+ static Color m_aDocColor; // color of document boundaries
+ static Color m_aDocBoundColor; // color of document boundaries
+ static Color m_aObjectBoundColor; // color of object boundaries
+ static Color m_aAppBackgroundColor; // application background
+ static Color m_aTableBoundColor; // color of table boundaries
+ static Color m_aFontColor;
+ static Color m_aIndexShadingsColor; // background color of indexes
+ static Color m_aLinksColor;
+ static Color m_aVisitedLinksColor;
+ static Color m_aDirectCursorColor;
+ static Color m_aTextGridColor;
+ static Color m_aSpellColor; // mark color of online spell checking
+ static Color m_aSmarttagColor;
+ static Color m_aFieldShadingsColor;
+ static Color m_aSectionBoundColor;
+ static Color m_aPageBreakColor;
+ static Color m_aScriptIndicatorColor;
+ static Color m_aShadowColor;
+ static Color m_aHeaderFooterMarkColor;
+
+ static sal_Int32 m_nAppearanceFlags;
protected:
- static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips
+ static sal_uInt16 m_nPixelTwips;// 1 Pixel == ? Twips
OUString m_sSymbolFont; // Symbolfont.
sal_uInt32 m_nCoreOptions; // Bits for SwViewShell.
@@ -167,7 +167,7 @@ protected:
bool m_bTest6 :1; // Test-flag "No screen adj"
bool m_bTest7 :1; // Test-flag "win format"
bool m_bTest8 :1; // Test-flag ""
- static bool s_bTest9; // Test-Flag "DrawingLayerNotLoading"
+ static bool m_bTest9; // Test-Flag "DrawingLayerNotLoading"
bool m_bTest10 :1; // Test-Flag "Format by Input"
#endif
@@ -178,7 +178,7 @@ public:
static void Init( vcl::Window *pWin ); // Initializing of static data.
- static sal_uInt16 GetPixelTwips() { return nPixelTwips; }
+ static sal_uInt16 GetPixelTwips() { return m_nPixelTwips; }
inline sal_uInt32 GetCoreOptions() const {return m_nCoreOptions;}
inline void SetUIOptions( const SwViewOption& );
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 2f354fa..6c89081 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -42,30 +42,30 @@
#include <comphelper/lok.hxx>
#ifdef DBG_UTIL
-bool SwViewOption::s_bTest9 = false; //DrawingLayerNotLoading
+bool SwViewOption::m_bTest9 = false; //DrawingLayerNotLoading
#endif
-Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aDocColor(COL_LIGHTGRAY);
-Color SwViewOption::aAppBackgroundColor(COL_LIGHTGRAY);
-Color SwViewOption::aTableBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aIndexShadingsColor(COL_LIGHTGRAY);
-Color SwViewOption::aLinksColor(COL_BLUE);
-Color SwViewOption::aVisitedLinksColor(COL_RED);
-Color SwViewOption::aDirectCursorColor(COL_BLUE);
-Color SwViewOption::aTextGridColor(COL_LIGHTGRAY);
-Color SwViewOption::aSpellColor(COL_LIGHTRED);
-Color SwViewOption::aSmarttagColor(COL_LIGHTMAGENTA);
-Color SwViewOption::aFontColor(COL_BLACK);
-Color SwViewOption::aFieldShadingsColor(COL_LIGHTGRAY);
-Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aPageBreakColor(COL_BLUE);
-Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
-Color SwViewOption::aShadowColor(COL_GRAY);
-Color SwViewOption::aHeaderFooterMarkColor(COL_BLUE);
-
-sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
-sal_uInt16 SwViewOption::nPixelTwips = 0; // one pixel on the screen
+Color SwViewOption::m_aDocBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aObjectBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aDocColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aAppBackgroundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aTableBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aIndexShadingsColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aLinksColor(COL_BLUE);
+Color SwViewOption::m_aVisitedLinksColor(COL_RED);
+Color SwViewOption::m_aDirectCursorColor(COL_BLUE);
+Color SwViewOption::m_aTextGridColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aSpellColor(COL_LIGHTRED);
+Color SwViewOption::m_aSmarttagColor(COL_LIGHTMAGENTA);
+Color SwViewOption::m_aFontColor(COL_BLACK);
+Color SwViewOption::m_aFieldShadingsColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aSectionBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aPageBreakColor(COL_BLUE);
+Color SwViewOption::m_aScriptIndicatorColor(COL_GREEN);
+Color SwViewOption::m_aShadowColor(COL_GRAY);
+Color SwViewOption::m_aHeaderFooterMarkColor(COL_BLUE);
+
+sal_Int32 SwViewOption::m_nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
+sal_uInt16 SwViewOption::m_nPixelTwips = 0; // one pixel on the screen
static const char aPostItStr[] = " ";
@@ -147,7 +147,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b
const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix );
const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix );
const SwRect aRect( aTopLeft, aBotRight );
- DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() );
+ DrawRect( pOut, aRect, m_aScriptIndicatorColor.GetColor() );
pOut->SetLineColor( aOldLineColor );
}
}
@@ -211,7 +211,7 @@ SwViewOption::SwViewOption() :
m_bTest5 = m_bTest6 = m_bTest7 = m_bTest8 = m_bTest10 = false;
#endif
if (comphelper::LibreOfficeKit::isActive())
- aAppBackgroundColor = COL_TRANSPARENT;
+ m_aAppBackgroundColor = COL_TRANSPARENT;
}
SwViewOption::SwViewOption(const SwViewOption& rVOpt)
@@ -305,9 +305,9 @@ SwViewOption::~SwViewOption()
void SwViewOption::Init( vcl::Window *pWin )
{
- if( !nPixelTwips && pWin )
+ if( !m_nPixelTwips && pWin )
{
- nPixelTwips = (sal_uInt16)pWin->PixelToLogic( Size(1,1) ).Height();
+ m_nPixelTwips = (sal_uInt16)pWin->PixelToLogic( Size(1,1) ).Height();
}
}
@@ -357,171 +357,171 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell)
Color& SwViewOption::GetDocColor()
{
- return aDocColor;
+ return m_aDocColor;
}
Color& SwViewOption::GetDocBoundariesColor()
{
- return aDocBoundColor;
+ return m_aDocBoundColor;
}
Color& SwViewOption::GetObjectBoundariesColor()
{
- return aObjectBoundColor;
+ return m_aObjectBoundColor;
}
Color& SwViewOption::GetAppBackgroundColor()
{
- return aAppBackgroundColor;
+ return m_aAppBackgroundColor;
}
Color& SwViewOption::GetTableBoundariesColor()
{
- return aTableBoundColor;
+ return m_aTableBoundColor;
}
Color& SwViewOption::GetIndexShadingsColor()
{
- return aIndexShadingsColor;
+ return m_aIndexShadingsColor;
}
Color& SwViewOption::GetLinksColor()
{
- return aLinksColor;
+ return m_aLinksColor;
}
Color& SwViewOption::GetVisitedLinksColor()
{
- return aVisitedLinksColor;
+ return m_aVisitedLinksColor;
}
Color& SwViewOption::GetDirectCursorColor()
{
- return aDirectCursorColor;
+ return m_aDirectCursorColor;
}
Color& SwViewOption::GetTextGridColor()
{
- return aTextGridColor;
+ return m_aTextGridColor;
}
Color& SwViewOption::GetSpellColor()
{
- return aSpellColor;
+ return m_aSpellColor;
}
Color& SwViewOption::GetSmarttagColor()
{
- return aSmarttagColor;
+ return m_aSmarttagColor;
}
Color& SwViewOption::GetShadowColor()
{
- return aShadowColor;
+ return m_aShadowColor;
}
Color& SwViewOption::GetFontColor()
{
- return aFontColor;
+ return m_aFontColor;
}
Color& SwViewOption::GetFieldShadingsColor()
{
- return aFieldShadingsColor;
+ return m_aFieldShadingsColor;
}
Color& SwViewOption::GetSectionBoundColor()
{
- return aSectionBoundColor;
+ return m_aSectionBoundColor;
}
Color& SwViewOption::GetPageBreakColor()
{
- return aPageBreakColor;
+ return m_aPageBreakColor;
}
Color& SwViewOption::GetHeaderFooterMarkColor()
{
- return aHeaderFooterMarkColor;
+ return m_aHeaderFooterMarkColor;
}
void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig )
{
- aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor);
+ m_aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor);
svtools::ColorConfigValue aValue = rConfig.GetColorValue(svtools::DOCBOUNDARIES);
- aDocBoundColor.SetColor(aValue.nColor);
- nAppearanceFlags = 0;
+ m_aDocBoundColor.SetColor(aValue.nColor);
+ m_nAppearanceFlags = 0;
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES;
+ m_nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES;
- aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor);
+ m_aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor);
aValue = rConfig.GetColorValue(svtools::OBJECTBOUNDARIES);
- aObjectBoundColor.SetColor(aValue.nColor);
+ m_aObjectBoundColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES;
+ m_nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES;
aValue = rConfig.GetColorValue(svtools::TABLEBOUNDARIES);
- aTableBoundColor.SetColor(aValue.nColor);
+ m_aTableBoundColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES;
+ m_nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES;
aValue = rConfig.GetColorValue(svtools::WRITERIDXSHADINGS);
- aIndexShadingsColor.SetColor(aValue.nColor);
+ m_aIndexShadingsColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS;
+ m_nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS;
aValue = rConfig.GetColorValue(svtools::LINKS);
- aLinksColor.SetColor(aValue.nColor);
+ m_aLinksColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_LINKS;
+ m_nAppearanceFlags |= VIEWOPT_LINKS;
aValue = rConfig.GetColorValue(svtools::LINKSVISITED);
- aVisitedLinksColor.SetColor(aValue.nColor);
+ m_aVisitedLinksColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_VISITED_LINKS;
+ m_nAppearanceFlags |= VIEWOPT_VISITED_LINKS;
aValue = rConfig.GetColorValue(svtools::SHADOWCOLOR);
- aShadowColor.SetColor(aValue.nColor);
+ m_aShadowColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_SHADOW;
+ m_nAppearanceFlags |= VIEWOPT_SHADOW;
- aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor);
+ m_aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor);
- aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor);
+ m_aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor);
- aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor);
+ m_aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor);
- aSmarttagColor.SetColor(rConfig.GetColorValue(svtools::SMARTTAGS).nColor);
+ m_aSmarttagColor.SetColor(rConfig.GetColorValue(svtools::SMARTTAGS).nColor);
- aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor);
+ m_aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor);
aValue = rConfig.GetColorValue(svtools::WRITERFIELDSHADINGS);
- aFieldShadingsColor.SetColor(aValue.nColor);
+ m_aFieldShadingsColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS;
+ m_nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS;
aValue = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES);
- aSectionBoundColor.SetColor(aValue.nColor);
+ m_aSectionBoundColor.SetColor(aValue.nColor);
if(aValue.bIsVisible)
- nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES;
+ m_nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES;
aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS);
- aPageBreakColor.SetColor(aValue.nColor);
+ m_aPageBreakColor.SetColor(aValue.nColor);
aValue = rConfig.GetColorValue(svtools::WRITERHEADERFOOTERMARK);
- aHeaderFooterMarkColor.SetColor(aValue.nColor);
+ m_aHeaderFooterMarkColor.SetColor(aValue.nColor);
- aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
+ m_aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
}
void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig )
{
if(bSet)
- nAppearanceFlags |= nFlag;
+ m_nAppearanceFlags |= nFlag;
else
- nAppearanceFlags &= ~nFlag;
+ m_nAppearanceFlags &= ~nFlag;
if(bSaveInConfig)
{
//create an editable svtools::ColorConfig and store the change
@@ -560,7 +560,7 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInCon
bool SwViewOption::IsAppearanceFlag(sal_Int32 nFlag)
{
- return 0 != (nAppearanceFlags & nFlag);
+ return 0 != (m_nAppearanceFlags & nFlag);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9f19d2425bd0b07f384967f4e2aec0a83e45ab88
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 12 08:34:39 2015 +0100
sw: prefix members of SwFrmPage
Change-Id: I09a62466ea6b779c7589667f379e67d51890e7b4
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 514be1b..0bf1e50 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -601,27 +601,27 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "FrmTypePage",
"modules/swriter/ui/frmtypepage.ui", &rSet)
,
- bAtHorzPosModified( false ),
- bAtVertPosModified( false ),
- bFormat(false),
- bNew(true),
- bNoModifyHdl(true),
- bIsVerticalFrame(false),
- bIsVerticalL2R(false),
- bIsInRightToLeft(false),
- bHtmlMode(false),
- nHtmlMode(0),
- nUpperBorder(0),
- nLowerBorder(0),
- fWidthHeightRatio(1.0),
+ m_bAtHorzPosModified( false ),
+ m_bAtVertPosModified( false ),
+ m_bFormat(false),
+ m_bNew(true),
+ m_bNoModifyHdl(true),
+ m_bIsVerticalFrame(false),
+ m_bIsVerticalL2R(false),
+ m_bIsInRightToLeft(false),
+ m_bHtmlMode(false),
+ m_nHtmlMode(0),
+ m_nUpperBorder(0),
+ m_nLowerBorder(0),
+ m_fWidthHeightRatio(1.0),
mpToCharContentPos( nullptr ),
- nOldH(text::HoriOrientation::CENTER),
- nOldHRel(text::RelOrientation::FRAME),
- nOldV(text::VertOrientation::TOP),
- nOldVRel(text::RelOrientation::PRINT_AREA),
- pVMap( nullptr ),
- pHMap( nullptr ),
+ m_nOldH(text::HoriOrientation::CENTER),
+ m_nOldHRel(text::RelOrientation::FRAME),
+ m_nOldV(text::VertOrientation::TOP),
+ m_nOldVRel(text::RelOrientation::PRINT_AREA),
+ m_pVMap( nullptr ),
+ m_pHMap( nullptr ),
m_bAllowVertPositioning( true ),
m_bIsMathOLE( false ),
m_bIsMathBaselineAlignment( true )
@@ -807,7 +807,7 @@ void SwFrmPage::setOptimalFrmWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
aI != aEnd; ++aI)
{
- m_pHorizontalDLB->InsertEntry(aFramePosString.GetString(*aI));
+ m_pHorizontalDLB->InsertEntry(m_aFramePosString.GetString(*aI));
}
Size aBiggest(m_pHorizontalDLB->GetOptimalSize());
@@ -848,7 +848,7 @@ void SwFrmPage::setOptimalRelWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
aI != aEnd; ++aI)
{
- m_pHoriRelationLB->InsertEntry(aFramePosString.GetString(*aI));
+ m_pHoriRelationLB->InsertEntry(m_aFramePosString.GetString(*aI));
}
Size aBiggest(m_pHoriRelationLB->GetOptimalSize());
@@ -888,13 +888,13 @@ SwWrtShell *SwFrmPage::getFrmDlgParentShell()
void SwFrmPage::Reset( const SfxItemSet *rSet )
{
- SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() :
+ SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell() :
getFrmDlgParentShell();
- nHtmlMode = ::GetHtmlMode(pSh->GetView().GetDocShell());
- bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
+ m_nHtmlMode = ::GetHtmlMode(pSh->GetView().GetDocShell());
+ m_bHtmlMode = (m_nHtmlMode & HTMLMODE_ON) != 0;
- FieldUnit aMetric = ::GetDfltMetric(bHtmlMode);
+ FieldUnit aMetric = ::GetDfltMetric(m_bHtmlMode);
m_aWidthED.SetMetric(aMetric);
m_aHeightED.SetMetric(aMetric);
SetMetric( *m_pAtHorzPosED, aMetric );
@@ -910,7 +910,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment
&& FLY_AS_CHAR == rAnchor.GetAnchorId()) );
- if (bFormat)
+ if (m_bFormat)
{
// at formats no anchor editing
m_pAnchorFrame->Enable(false);
@@ -920,35 +920,35 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
{
if (rAnchor.GetAnchorId() != FLY_AT_FLY && !pSh->IsFlyInFly())
m_pAnchorAtFrameRB->Hide();
- if ( pSh->IsFrmVertical( true, bIsInRightToLeft, bIsVerticalL2R ) )
+ if ( pSh->IsFrmVertical( true, m_bIsInRightToLeft, m_bIsVerticalL2R ) )
{
OUString sHLabel = m_pHorizontalFT->GetText();
m_pHorizontalFT->SetText(m_pVerticalFT->GetText());
m_pVerticalFT->SetText(sHLabel);
- bIsVerticalFrame = true;
+ m_bIsVerticalFrame = true;
}
}
- if ( sDlgType == "PictureDialog" || sDlgType == "ObjectDialog" )
+ if ( m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog" )
{
OSL_ENSURE(pSh , "shell not found");
//OS: only for the variant Insert/Graphic/Properties
if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_GRF_REALSIZE, false, &pItem))
- aGrfSize = static_cast<const SvxSizeItem*>(pItem)->GetSize();
+ m_aGrfSize = static_cast<const SvxSizeItem*>(pItem)->GetSize();
else
- pSh->GetGrfSize( aGrfSize );
+ pSh->GetGrfSize( m_aGrfSize );
- if ( !bNew )
+ if ( !m_bNew )
{
m_pRealSizeBT->SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl));
EnableGraficMode();
}
- if ( sDlgType == "PictureDialog" )
+ if ( m_sDlgType == "PictureDialog" )
m_pFixedRatioCB->Check( false );
else
{
- if ( bNew )
+ if ( m_bNew )
SetText( SW_RESSTR(STR_OLE_INSERT));
else
SetText( SW_RESSTR(STR_OLE_EDIT));
@@ -956,19 +956,19 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
}
else
{
- aGrfSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE)).GetSize();
+ m_aGrfSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE)).GetSize();
}
// entering procent value made possible
- m_aWidthED.SetBaseValue( m_aWidthED.Normalize(aGrfSize.Width()), FUNIT_TWIP );
- m_aHeightED.SetBaseValue( m_aHeightED.Normalize(aGrfSize.Height()), FUNIT_TWIP );
+ m_aWidthED.SetBaseValue( m_aWidthED.Normalize(m_aGrfSize.Width()), FUNIT_TWIP );
+ m_aHeightED.SetBaseValue( m_aHeightED.Normalize(m_aGrfSize.Height()), FUNIT_TWIP );
//the available space is not yet known so the RefValue has to be calculated from size and relative size values
//this is needed only if relative values are already set
const SwFormatFrmSize& rFrmSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE));
- m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
- m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
+ m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
if (rFrmSize.GetWidthPercent() != SwFormatFrmSize::SYNCED && rFrmSize.GetWidthPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -980,8 +980,8 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
else
m_pRelWidthRelationLB->Disable();
- m_pRelHeightRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
- m_pRelHeightRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
+ m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
if (rFrmSize.GetHeightPercent() != SwFormatFrmSize::SYNCED && rFrmSize.GetHeightPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -1015,12 +1015,12 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
m_pFollowTextFlowCB->Check( bFollowTextFlow );
}
- if(bHtmlMode)
+ if(m_bHtmlMode)
{
m_pAutoHeightCB->Enable(false);
m_pAutoWidthCB->Enable(false);
m_pMirrorPagesCB->Show(false);
- if (sDlgType == "FrameDialog")
+ if (m_sDlgType == "FrameDialog")
m_pFixedRatioCB->Enable(false);
// i#18732 hide checkbox in HTML mode
m_pFollowTextFlowCB->Show(false);
@@ -1043,7 +1043,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
m_pAtHorzPosED->SaveValue();
m_pFollowTextFlowCB->SaveValue();
- bNoModifyHdl = false;
+ m_bNoModifyHdl = false;
//lock PercentFields
m_aWidthED.LockAutoCalculation(true);
m_aHeightED.LockAutoCalculation(true);
@@ -1056,14 +1056,14 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP)));
SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP)));
- fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
+ m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
}
// stuff attributes into the set when OK
bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
{
bool bRet = false;
- SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
+ SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
: getFrmDlgParentShell();
OSL_ENSURE( pSh , "shell not found");
const SfxItemSet& rOldSet = GetItemSet();
@@ -1071,24 +1071,24 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
RndStdIds eAnchorId = (RndStdIds)GetAnchor();
- if ( !bFormat )
+ if ( !m_bFormat )
{
pOldItem = GetOldItem(*rSet, RES_ANCHOR);
- if (bNew || !pOldItem || eAnchorId != static_cast<const SwFormatAnchor*>(pOldItem)->GetAnchorId())
+ if (m_bNew || !pOldItem || eAnchorId != static_cast<const SwFormatAnchor*>(pOldItem)->GetAnchorId())
{
SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
bRet = nullptr != rSet->Put( aAnc );
}
}
- if ( pHMap )
+ if ( m_pHMap )
{
SwFormatHoriOrient aHoriOrient( static_cast<const SwFormatHoriOrient&>(
rOldSet.Get(RES_HORI_ORIENT)) );
- const sal_Int32 nMapPos = GetMapPos(pHMap, *m_pHorizontalDLB);
- const sal_Int16 eHOri = GetAlignment(pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
- const sal_Int16 eRel = GetRelation(pHMap, *m_pHoriRelationLB);
+ const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
+ const sal_Int16 eHOri = GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
+ const sal_Int16 eRel = GetRelation(m_pHMap, *m_pHoriRelationLB);
aHoriOrient.SetHoriOrient( eHOri );
aHoriOrient.SetRelationOrient( eRel );
@@ -1098,7 +1098,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
bMod |= m_pMirrorPagesCB->IsValueChangedFromSaved();
if ( eHOri == text::HoriOrientation::NONE &&
- (bNew || (bAtHorzPosModified || bMod) || nOldH != eHOri ) )
+ (m_bNew || (m_bAtHorzPosModified || bMod) || m_nOldH != eHOri ) )
{
SwTwips nX = static_cast< SwTwips >(m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FUNIT_TWIP)));
aHoriOrient.SetPos( nX );
@@ -1106,25 +1106,25 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
pOldItem = GetOldItem(*rSet, FN_HORI_ORIENT);
bool bSame = false;
- if ((bNew == bFormat) && pOldItem)
+ if ((m_bNew == m_bFormat) && pOldItem)
{
bSame = aHoriOrient == static_cast<const SwFormatHoriOrient&>(*pOldItem);
}
- if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame))
+ if ((m_bNew && !m_bFormat) || ((m_bAtHorzPosModified || bMod) && !bSame))
{
bRet |= nullptr != rSet->Put( aHoriOrient );
}
}
- if ( pVMap )
+ if ( m_pVMap )
{
// alignment vertical
SwFormatVertOrient aVertOrient( static_cast<const SwFormatVertOrient&>(
rOldSet.Get(RES_VERT_ORIENT)) );
- const sal_Int32 nMapPos = GetMapPos(pVMap, *m_pVerticalDLB);
- const sal_Int16 eVOri = GetAlignment(pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
- const sal_Int16 eRel = GetRelation(pVMap, *m_pVertRelationLB);
+ const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
+ const sal_Int16 eVOri = GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
+ const sal_Int16 eRel = GetRelation(m_pVMap, *m_pVertRelationLB);
aVertOrient.SetVertOrient ( eVOri);
aVertOrient.SetRelationOrient( eRel );
@@ -1132,7 +1132,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
bool bMod = m_pAtVertPosED->IsValueChangedFromSaved();
if ( eVOri == text::VertOrientation::NONE &&
- ( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) )
+ ( m_bNew || (m_bAtVertPosModified || bMod) || m_nOldV != eVOri) )
{
// vertical position
// recalculate offset for character bound frames
@@ -1145,15 +1145,15 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
}
pOldItem = GetOldItem(*rSet, FN_VERT_ORIENT);
bool bSame = false;
- if((bNew == bFormat) && pOldItem)
+ if((m_bNew == m_bFormat) && pOldItem)
{
- bSame = bFormat ?
+ bSame = m_bFormat ?
aVertOrient.GetVertOrient() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetVertOrient() &&
aVertOrient.GetRelationOrient() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetRelationOrient() &&
aVertOrient.GetPos() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetPos()
: aVertOrient == static_cast<const SwFormatVertOrient&>(*pOldItem);
}
- if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame ))
+ if( ( m_bNew && !m_bFormat ) || ((m_bAtVertPosModified || bMod) && !bSame ))
{
bRet |= nullptr != rSet->Put( aVertOrient );
}
@@ -1192,7 +1192,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
m_aWidthED .GetValue() == m_aWidthED .GetMin() &&
m_aHeightED.GetValue() == m_aHeightED.GetMin());
- if ((bNew && !bFormat) || ((bValueModified || bCheckChanged) && bLegalValue))
+ if ((m_bNew && !m_bFormat) || ((bValueModified || bCheckChanged) && bLegalValue))
{
sal_Int64 nNewWidth = m_aWidthED.DenormalizePercent(m_aWidthED.GetRealValue(FUNIT_TWIP));
sal_Int64 nNewHeight = m_aHeightED.DenormalizePercent(m_aHeightED.GetRealValue(FUNIT_TWIP));
@@ -1233,13 +1233,13 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
aSz.SetWidthSizeType( eFrmSize );
}
}
- if( !bFormat && m_pFixedRatioCB->IsValueChangedFromSaved() )
+ if( !m_bFormat && m_pFixedRatioCB->IsValueChangedFromSaved() )
bRet |= nullptr != rSet->Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked()));
pOldItem = GetOldItem(*rSet, RES_FRM_SIZE);
- if ((pOldItem && aSz != *pOldItem) || (!pOldItem && !bFormat) ||
- (bFormat &&
+ if ((pOldItem && aSz != *pOldItem) || (!pOldItem && !m_bFormat) ||
+ (m_bFormat &&
(aSz.GetWidth() > 0 || aSz.GetWidthPercent() > 0) &&
(aSz.GetHeight() > 0 || aSz.GetHeightPercent() > 0)))
{
@@ -1265,68 +1265,68 @@ void SwFrmPage::InitPos(RndStdIds eId,
long nY)
{
sal_Int32 nPos = m_pVerticalDLB->GetSelectEntryPos();
- if ( nPos != LISTBOX_ENTRY_NOTFOUND && pVMap )
+ if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pVMap )
{
- nOldV = pVMap[nPos].nAlign;
+ m_nOldV = m_pVMap[nPos].nAlign;
nPos = m_pVertRelationLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
- nOldVRel = static_cast<RelationMap *>(m_pVertRelationLB->GetEntryData(nPos))->nRelation;
+ m_nOldVRel = static_cast<RelationMap *>(m_pVertRelationLB->GetEntryData(nPos))->nRelation;
}
nPos = m_pHorizontalDLB->GetSelectEntryPos();
- if ( nPos != LISTBOX_ENTRY_NOTFOUND && pHMap )
+ if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pHMap )
{
- nOldH = pHMap[nPos].nAlign;
+ m_nOldH = m_pHMap[nPos].nAlign;
nPos = m_pHoriRelationLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
- nOldHRel = static_cast<RelationMap *>(m_pHoriRelationLB->GetEntryData(nPos))->nRelation;
+ m_nOldHRel = static_cast<RelationMap *>(m_pHoriRelationLB->GetEntryData(nPos))->nRelation;
}
bool bEnable = true;
if ( eId == FLY_AT_PAGE )
{
- pVMap = bHtmlMode ? aVPageHtmlMap : aVPageMap;
- pHMap = bHtmlMode ? aHPageHtmlMap : aHPageMap;
+ m_pVMap = m_bHtmlMode ? aVPageHtmlMap : aVPageMap;
+ m_pHMap = m_bHtmlMode ? aHPageHtmlMap : aHPageMap;
}
else if ( eId == FLY_AT_FLY )
{
// own vertical alignment map for to frame
// anchored objects.
- pVMap = bHtmlMode ? aVFlyHtmlMap : aVFrameMap;
- pHMap = bHtmlMode ? aHFlyHtmlMap : aHFrameMap;
+ m_pVMap = m_bHtmlMode ? aVFlyHtmlMap : aVFrameMap;
+ m_pHMap = m_bHtmlMode ? aHFlyHtmlMap : aHFrameMap;
}
else if ( eId == FLY_AT_PARA )
{
- if(bHtmlMode)
+ if(m_bHtmlMode)
{
- pVMap = aVParaHtmlMap;
- pHMap = aHParaHtmlAbsMap;
+ m_pVMap = aVParaHtmlMap;
+ m_pHMap = aHParaHtmlAbsMap;
}
else
{
- pVMap = aVParaMap;
- pHMap = aHParaMap;
+ m_pVMap = aVParaMap;
+ m_pHMap = aHParaMap;
}
}
else if ( eId == FLY_AT_CHAR )
{
- if(bHtmlMode)
+ if(m_bHtmlMode)
{
- pVMap = aVCharHtmlAbsMap;
- pHMap = aHCharHtmlAbsMap;
+ m_pVMap = aVCharHtmlAbsMap;
+ m_pHMap = aHCharHtmlAbsMap;
}
else
{
- pVMap = aVCharMap;
- pHMap = aHCharMap;
+ m_pVMap = aVCharMap;
+ m_pHMap = aHCharMap;
}
}
else if ( eId == FLY_AS_CHAR )
{
- pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
- pHMap = nullptr;
+ m_pVMap = m_bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
+ m_pHMap = nullptr;
bEnable = false;
}
m_pHorizontalDLB->Enable( bEnable );
@@ -1336,26 +1336,26 @@ void SwFrmPage::InitPos(RndStdIds eId,
// horizontal
if ( nH < 0 )
{
- nH = nOldH;
- nHRel = nOldHRel;
+ nH = m_nOldH;
+ nHRel = m_nOldHRel;
}
- sal_Int32 nMapPos = FillPosLB(pHMap, nH, nHRel, *m_pHorizontalDLB);
- FillRelLB(pHMap, nMapPos, nH, nHRel, *m_pHoriRelationLB, *m_pHoriRelationFT);
+ sal_Int32 nMapPos = FillPosLB(m_pHMap, nH, nHRel, *m_pHorizontalDLB);
+ FillRelLB(m_pHMap, nMapPos, nH, nHRel, *m_pHoriRelationLB, *m_pHoriRelationFT);
// vertical
if ( nV < 0 )
{
- nV = nOldV;
- nVRel = nOldVRel;
+ nV = m_nOldV;
+ nVRel = m_nOldVRel;
}
- nMapPos = FillPosLB(pVMap, nV, nVRel, *m_pVerticalDLB);
- FillRelLB(pVMap, nMapPos, nV, nVRel, *m_pVertRelationLB, *m_pVertRelationFT);
+ nMapPos = FillPosLB(m_pVMap, nV, nVRel, *m_pVerticalDLB);
+ FillRelLB(m_pVMap, nMapPos, nV, nVRel, *m_pVertRelationLB, *m_pVertRelationFT);
bEnable = nH == text::HoriOrientation::NONE && eId != FLY_AS_CHAR;
if (!bEnable)
{
m_pAtHorzPosED->SetValue( 0, FUNIT_TWIP );
- if (nX != LONG_MAX && bHtmlMode)
+ if (nX != LONG_MAX && m_bHtmlMode)
m_pAtHorzPosED->SetModifyFlag();
}
else
@@ -1370,7 +1370,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
if ( !bEnable )
{
m_pAtVertPosED->SetValue( 0, FUNIT_TWIP );
- if(nY != LONG_MAX && bHtmlMode)
+ if(nY != LONG_MAX && m_bHtmlMode)
m_pAtVertPosED->SetModifyFlag();
}
else
@@ -1415,10 +1415,10 @@ sal_Int32 SwFrmPage::FillPosLB(const FrmMap* _pMap,
SvxSwFramePosString::StringId eStrId = m_pMirrorPagesCB->IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
// --> OD 2009-08-31 #mongolianlayout#
eStrId = lcl_ChangeResIdToVerticalOrRTL( eStrId,
- bIsVerticalFrame,
- bIsVerticalL2R,
- bIsInRightToLeft);
- OUString sEntry(aFramePosString.GetString(eStrId));
+ m_bIsVerticalFrame,
+ m_bIsVerticalL2R,
+ m_bIsInRightToLeft);
+ OUString sEntry(m_aFramePosString.GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
// don't insert entries when frames are character bound
@@ -1481,10 +1481,10 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap,
// --> OD 2009-08-31 #mongolianlayout#
sStrId1 =
lcl_ChangeResIdToVerticalOrRTL( sStrId1,
- bIsVerticalFrame,
- bIsVerticalL2R,
- bIsInRightToLeft);
- const OUString sEntry = aFramePosString.GetString(sStrId1);
+ m_bIsVerticalFrame,
+ m_bIsVerticalL2R,
+ m_bIsInRightToLeft);
+ const OUString sEntry = m_aFramePosString.GetString(sStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]);
if (_pMap[nMapPos].nAlign == _nAlign)
@@ -1546,10 +1546,10 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap,
// --> OD 2009-08-31 #mongolianlayout#
eStrId1 =
lcl_ChangeResIdToVerticalOrRTL( eStrId1,
- bIsVerticalFrame,
- bIsVerticalL2R,
- bIsInRightToLeft);
- const OUString sEntry = aFramePosString.GetString(eStrId1);
+ m_bIsVerticalFrame,
+ m_bIsVerticalL2R,
+ m_bIsInRightToLeft);
+ const OUString sEntry = m_aFramePosString.GetString(eStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &aRelationMap[nRelPos]);
if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == _nRel)
@@ -1688,7 +1688,7 @@ sal_Int32 SwFrmPage::GetMapPos( const FrmMap *pMap, ListBox &rAlignLB )
{
SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
- OUString sEntry = aFramePosString.GetString(eResId);
+ OUString sEntry = m_aFramePosString.GetString(eResId);
sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry );
if (sEntry == sSelEntry)
@@ -1730,9 +1730,9 @@ RndStdIds SwFrmPage::GetAnchor()
// Bsp - Update
void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
{
- bNoModifyHdl = true;
+ m_bNoModifyHdl = true;
Init(rSet);
- bNoModifyHdl = false;
+ m_bNoModifyHdl = false;
//lock PercentFields
m_aWidthED.LockAutoCalculation(true);
m_aHeightED.LockAutoCalculation(true);
@@ -1750,7 +1750,7 @@ SfxTabPage::sfxpg SwFrmPage::DeactivatePage(SfxItemSet * _pSet)
//FillItemSet doesn't set the anchor into the set when it matches
//the original. But for the other pages we need the current anchor.
- SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
+ SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
: getFrmDlgParentShell();
RndStdIds eAnchorId = (RndStdIds)GetAnchor();
SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
@@ -1804,13 +1804,13 @@ IMPL_LINK_NOARG_TYPED(SwFrmPage, RangeModifyLoseFocusHdl, Control&, void)
}
void SwFrmPage::RangeModifyHdl()
{
- if (bNoModifyHdl)
+ if (m_bNoModifyHdl)
return;
- SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
+ SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
: getFrmDlgParentShell();
OSL_ENSURE(pSh , "shell not found");
- SwFlyFrmAttrMgr aMgr( bNew, pSh, static_cast<const SwAttrSet&>(GetItemSet()) );
+ SwFlyFrmAttrMgr aMgr( m_bNew, pSh, static_cast<const SwAttrSet&>(GetItemSet()) );
SvxSwFrameValidation aVal;
aVal.nAnchorType = static_cast< sal_Int16 >(GetAnchor());
@@ -1819,22 +1819,22 @@ void SwFrmPage::RangeModifyHdl()
aVal.bMirror = m_pMirrorPagesCB->IsChecked();
aVal.bFollowTextFlow = m_pFollowTextFlowCB->IsChecked();
- if ( pHMap )
+ if ( m_pHMap )
{
// alignment horizonal
- const sal_Int32 nMapPos = GetMapPos(pHMap, *m_pHorizontalDLB);
- aVal.nHoriOrient = GetAlignment(pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
- aVal.nHRelOrient = GetRelation(pHMap, *m_pHoriRelationLB);
+ const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
+ aVal.nHoriOrient = GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
+ aVal.nHRelOrient = GetRelation(m_pHMap, *m_pHoriRelationLB);
}
else
aVal.nHoriOrient = text::HoriOrientation::NONE;
- if ( pVMap )
+ if ( m_pVMap )
{
// alignment vertical
- const sal_Int32 nMapPos = GetMapPos(pVMap, *m_pVerticalDLB);
- aVal.nVertOrient = GetAlignment(pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
- aVal.nVRelOrient = GetRelation(pVMap, *m_pVertRelationLB);
+ const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
+ aVal.nVertOrient = GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
+ aVal.nVRelOrient = GetRelation(m_pVMap, *m_pVertRelationLB);
}
else
aVal.nVertOrient = text::VertOrientation::NONE;
@@ -1888,7 +1888,7 @@ void SwFrmPage::RangeModifyHdl()
SwTwips nMaxWidth(aVal.nMaxWidth);
SwTwips nMaxHeight(aVal.nMaxHeight);
- if (aVal.bAutoHeight && (sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"))
+ if (aVal.bAutoHeight && (m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"))
{
SwTwips nTmp = std::min(nWidth * nMaxHeight / std::max(nHeight, 1L), nMaxHeight);
m_aWidthED.SetMax(m_aWidthED.NormalizePercent(nTmp), FUNIT_TWIP);
@@ -1911,9 +1911,9 @@ void SwFrmPage::RangeModifyHdl()
m_pAtHorzPosED->SetValue(m_pAtHorzPosED->Normalize(aVal.nHPos), FUNIT_TWIP);
const SwTwips nUpperOffset = (aVal.nAnchorType == FLY_AS_CHAR)
- ? nUpperBorder : 0;
+ ? m_nUpperBorder : 0;
const SwTwips nLowerOffset = (aVal.nAnchorType == FLY_AS_CHAR)
- ? nLowerBorder : 0;
+ ? m_nLowerBorder : 0;
m_pAtVertPosED->SetMin(m_pAtVertPosED->Normalize(aVal.nMinVPos + nLowerOffset + nUpperOffset), FUNIT_TWIP);
m_pAtVertPosED->SetMax(m_pAtVertPosED->Normalize(aVal.nMaxVPos), FUNIT_TWIP);
@@ -1938,7 +1938,7 @@ IMPL_LINK_NOARG_TYPED(SwFrmPage, AnchorTypeHdl, Button*, void)
InitPos( eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX);
RangeModifyHdl();
- if(bHtmlMode)
+ if(m_bHtmlMode)
{
PosHdl(*m_pHorizontalDLB);
PosHdl(*m_pVerticalDLB);
@@ -1953,7 +1953,7 @@ IMPL_LINK_TYPED( SwFrmPage, PosHdl, ListBox&, rLB, void )
bool bHori = &rLB == m_pHorizontalDLB;
ListBox *pRelLB = bHori ? m_pHoriRelationLB : m_pVertRelationLB;
FixedText *pRelFT = bHori ? m_pHoriRelationFT : m_pVertRelationFT;
- FrmMap *pMap = bHori ? pHMap : pVMap;
+ FrmMap *pMap = bHori ? m_pHMap : m_pVMap;
const sal_Int32 nMapPos = GetMapPos(pMap, rLB);
const sal_Int16 nAlign = GetAlignment(pMap, nMapPos, rLB, *pRelLB);
@@ -1988,12 +1988,12 @@ IMPL_LINK_TYPED( SwFrmPage, PosHdl, ListBox&, rLB, void )
UpdateExample();
if (bHori)
- bAtHorzPosModified = true;
+ m_bAtHorzPosModified = true;
else
- bAtVertPosModified = true;
+ m_bAtVertPosModified = true;
// special treatment for HTML-Mode with horizonal-vertical-dependencies
- if(bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
+ if(m_bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
{
bool bSet = false;
if(bHori)
@@ -2057,15 +2057,15 @@ IMPL_LINK_TYPED( SwFrmPage, RelHdl, ListBox&, rLB, void )
UpdateExample();
if (bHori)
- bAtHorzPosModified = true;
+ m_bAtHorzPosModified = true;
else
- bAtVertPosModified = true;
+ m_bAtVertPosModified = true;
- if (bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
+ if (m_bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
{
if(bHori)
{
- const sal_Int16 nRel = GetRelation(pHMap, *m_pHoriRelationLB);
+ const sal_Int16 nRel = GetRelation(m_pHMap, *m_pHoriRelationLB);
if(text::RelOrientation::PRINT_AREA == nRel && 0 == m_pVerticalDLB->GetSelectEntryPos())
{
m_pVerticalDLB->SelectEntryPos(1);
@@ -2081,9 +2081,9 @@ IMPL_LINK_TYPED( SwFrmPage, RelHdl, ListBox&, rLB, void )
IMPL_LINK_NOARG_TYPED(SwFrmPage, RealSizeHdl, Button*, void)
{
- m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP);
- m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(aGrfSize.Height()), FUNIT_TWIP);
- fWidthHeightRatio = aGrfSize.Height() ? double(aGrfSize.Width()) / double(aGrfSize.Height()) : 1.0;
+ m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(m_aGrfSize.Width() ), FUNIT_TWIP);
+ m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(m_aGrfSize.Height()), FUNIT_TWIP);
+ m_fWidthHeightRatio = m_aGrfSize.Height() ? double(m_aGrfSize.Width()) / double(m_aGrfSize.Height()) : 1.0;
UpdateExample();
}
@@ -2107,35 +2107,35 @@ IMPL_LINK_TYPED( SwFrmPage, ModifyHdl, Edit&, rEdit, void )
{
if (&rEdit == m_aWidthED.get())
{
- nHeight = SwTwips((double)nWidth / fWidthHeightRatio);
+ nHeight = SwTwips((double)nWidth / m_fWidthHeightRatio);
m_aHeightED.SetPrcntValue(m_aHeightED.NormalizePercent(nHeight), FUNIT_TWIP);
}
else if (&rEdit == m_aHeightED.get())
{
- nWidth = SwTwips((double)nHeight * fWidthHeightRatio);
+ nWidth = SwTwips((double)nHeight * m_fWidthHeightRatio);
m_aWidthED.SetPrcntValue(m_aWidthED.NormalizePercent(nWidth), FUNIT_TWIP);
}
}
- fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
+ m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
UpdateExample();
}
void SwFrmPage::UpdateExample()
{
sal_Int32 nPos = m_pHorizontalDLB->GetSelectEntryPos();
- if ( pHMap && nPos != LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND )
{
- const sal_Int32 nMapPos = GetMapPos(pHMap, *m_pHorizontalDLB);
- m_pExampleWN->SetHAlign(GetAlignment(pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB));
- m_pExampleWN->SetHoriRel(GetRelation(pHMap, *m_pHoriRelationLB));
+ const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
+ m_pExampleWN->SetHAlign(GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB));
+ m_pExampleWN->SetHoriRel(GetRelation(m_pHMap, *m_pHoriRelationLB));
}
nPos = m_pVerticalDLB->GetSelectEntryPos();
- if ( pVMap && nPos != LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND )
{
- const sal_Int32 nMapPos = GetMapPos(pVMap, *m_pVerticalDLB);
- m_pExampleWN->SetVAlign(GetAlignment(pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB));
- m_pExampleWN->SetVertRel(GetRelation(pVMap, *m_pVertRelationLB));
+ const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
+ m_pExampleWN->SetVAlign(GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB));
+ m_pExampleWN->SetVertRel(GetRelation(m_pVMap, *m_pVertRelationLB));
}
// size
@@ -2149,7 +2149,7 @@ void SwFrmPage::UpdateExample()
void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
{
- if(!bFormat)
+ if(!m_bFormat)
{
SwWrtShell* pSh = getFrmDlgParentShell();
@@ -2160,7 +2160,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
m_aHeightED.Enable( !bSizeFixed );
// size controls for math OLE objects
- if ( sDlgType == "ObjectDialog" && ! bNew )
+ if ( m_sDlgType == "ObjectDialog" && ! m_bNew )
{
// disable width and height for math objects
const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() );
@@ -2244,7 +2244,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
if( eSize == ATT_VAR_SIZE )
m_aWidthED.SetValue( m_aWidthED.GetMin() );
- if ( !bFormat )
+ if ( !m_bFormat )
{
SwWrtShell* pSh = getFrmDlgParentShell();
const SwFrameFormat* pFormat = pSh->GetFlyFrameFormat();
@@ -2257,8 +2257,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
// organise circulation-gap for character bound frames
const SvxULSpaceItem &rUL = static_cast<const SvxULSpaceItem &>(rSet.Get(RES_UL_SPACE));
- nUpperBorder = rUL.GetUpper();
- nLowerBorder = rUL.GetLower();
+ m_nUpperBorder = rUL.GetUpper();
+ m_nLowerBorder = rUL.GetLower();
if(SfxItemState::SET == rSet.GetItemState(FN_KEEP_ASPECT_RATIO))
{
@@ -2272,37 +2272,37 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
RndStdIds eAnchorId = (RndStdIds)GetAnchor();
- if ( bNew && !bFormat )
+ if ( m_bNew && !m_bFormat )
InitPos(eAnchorId, -1, 0, -1, 0, LONG_MAX, LONG_MAX);
else
{
const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT));
- nOldH = rHori.GetHoriOrient();
- nOldHRel = rHori.GetRelationOrient();
- nOldV = rVert.GetVertOrient(),
- nOldVRel = rVert.GetRelationOrient();
+ m_nOldH = rHori.GetHoriOrient();
+ m_nOldHRel = rHori.GetRelationOrient();
+ m_nOldV = rVert.GetVertOrient(),
+ m_nOldVRel = rVert.GetRelationOrient();
if (eAnchorId == FLY_AT_PAGE)
{
- if (nOldHRel == text::RelOrientation::FRAME)
- nOldHRel = text::RelOrientation::PAGE_FRAME;
- else if (nOldHRel == text::RelOrientation::PRINT_AREA)
- nOldHRel = text::RelOrientation::PAGE_PRINT_AREA;
- if (nOldVRel == text::RelOrientation::FRAME)
- nOldVRel = text::RelOrientation::PAGE_FRAME;
- else if (nOldVRel == text::RelOrientation::PRINT_AREA)
- nOldVRel = text::RelOrientation::PAGE_PRINT_AREA;
+ if (m_nOldHRel == text::RelOrientation::FRAME)
+ m_nOldHRel = text::RelOrientation::PAGE_FRAME;
+ else if (m_nOldHRel == text::RelOrientation::PRINT_AREA)
+ m_nOldHRel = text::RelOrientation::PAGE_PRINT_AREA;
+ if (m_nOldVRel == text::RelOrientation::FRAME)
+ m_nOldVRel = text::RelOrientation::PAGE_FRAME;
+ else if (m_nOldVRel == text::RelOrientation::PRINT_AREA)
+ m_nOldVRel = text::RelOrientation::PAGE_PRINT_AREA;
}
m_pMirrorPagesCB->Check(rHori.IsPosToggle());
m_pMirrorPagesCB->SaveValue();
InitPos(eAnchorId,
- nOldH,
- nOldHRel,
- nOldV,
- nOldVRel,
+ m_nOldH,
+ m_nOldHRel,
+ m_nOldV,
+ m_nOldVRel,
rHori.GetPos(),
rVert.GetPos());
}
@@ -2353,8 +2353,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
void SwFrmPage::SetFormatUsed(bool bFormatUsed)
{
- bFormat = bFormatUsed;
- if (bFormat)
+ m_bFormat = bFormatUsed;
+ if (m_bFormat)
{
m_pAnchorFrame->Hide();
}
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index a90580c..27ab4f4 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -90,38 +90,38 @@ class SwFrmPage: public SfxTabPage
VclPtr<SvxSwFrameExample> m_pExampleWN;
//'string provider'
- SvxSwFramePosString aFramePosString;
+ SvxSwFramePosString m_aFramePosString;
- bool bAtHorzPosModified;
- bool bAtVertPosModified;
+ bool m_bAtHorzPosModified;
+ bool m_bAtVertPosModified;
- bool bFormat;
- bool bNew;
- bool bNoModifyHdl;
- bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged
+ bool m_bFormat;
+ bool m_bNew;
+ bool m_bNoModifyHdl;
+ bool m_bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged
// --> OD 2009-08-31 #mongolianlayou#
- bool bIsVerticalL2R;
- bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
- bool bHtmlMode;
- sal_uInt16 nHtmlMode;
- OUString sDlgType;
- Size aGrfSize;
- SwTwips nUpperBorder;
- SwTwips nLowerBorder;
- double fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
+ bool m_bIsVerticalL2R;
+ bool m_bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
+ bool m_bHtmlMode;
+ sal_uInt16 m_nHtmlMode;
+ OUString m_sDlgType;
+ Size m_aGrfSize;
+ SwTwips m_nUpperBorder;
+ SwTwips m_nLowerBorder;
+ double m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
// OD 12.11.2003 #i22341# - keep content position of character for
// to character anchored objects.
const SwPosition* mpToCharContentPos;
// old alignment
- sal_Int16 nOldH;
- sal_Int16 nOldHRel;
- sal_Int16 nOldV;
- sal_Int16 nOldVRel;
+ sal_Int16 m_nOldH;
+ sal_Int16 m_nOldHRel;
+ sal_Int16 m_nOldV;
+ sal_Int16 m_nOldVRel;
- FrmMap* pVMap;
- FrmMap* pHMap;
+ FrmMap* m_pVMap;
+ FrmMap* m_pHMap;
bool m_bAllowVertPositioning;
bool m_bIsMathOLE;
@@ -194,10 +194,10 @@ public:
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
- void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; }
+ void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; }
void SetFormatUsed(bool bFormat);
- void SetFrmType(const OUString &rType) { sDlgType = rType; }
- inline bool IsInGraficMode() { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; }
+ void SetFrmType(const OUString &rType) { m_sDlgType = rType; }
+ inline bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; }
void EnableVerticalPositioning( bool bEnable );
};
commit 06fec09f7726f16e7a9fe5ea59066327a0c40eff
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 12 08:33:27 2015 +0100
sw: prefix members of SwLayAction
Change-Id: I5f30071bfe4f429a6ce7b2e79e4f1330b73e1e88
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 020ac06..57259d8 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -50,45 +50,45 @@ class SwWait;
*/
class SwLayAction
{
- SwRootFrm *pRoot;
- SwViewShellImp *pImp; // here the action logs in and off
+ SwRootFrm *m_pRoot;
+ SwViewShellImp *m_pImp; // here the action logs in and off
// For the sake of optimization, so that the tables stick a bit better to
// the Crsr when hitting return/backspace in front of one.
// The first TabFrm that paints itself (per page) adds itself to the pointer.
// The ContentFrms beneath the page do not need to deregister at the Shell for
// painting.
- const SwTabFrm *pOptTab;
+ const SwTabFrm *m_pOptTab;
- SwWait *pWait;
+ SwWait *m_pWait;
// If a paragraph (or anything else) moved more than one page when
// formatting, it adds its new page number here.
// The InternalAction can then take the appropriate steps.
- sal_uInt16 nPreInvaPage;
+ sal_uInt16 m_nPreInvaPage;
- std::clock_t nStartTicks; // The Action's starting time; if too much time passes the
+ std::clock_t m_nStartTicks; // The Action's starting time; if too much time passes the
// WaitCrsr can be enabled via CheckWaitCrsr()
- VclInputFlags nInputType; // Which input should terminate processing
- sal_uInt16 nEndPage; // StatBar control
- sal_uInt16 nCheckPageNum; // CheckPageDesc() was delayed if != USHRT_MAX
+ VclInputFlags m_nInputType; // Which input should terminate processing
+ sal_uInt16 m_nEndPage; // StatBar control
+ sal_uInt16 m_nCheckPageNum; // CheckPageDesc() was delayed if != USHRT_MAX
// check from this page onwards
- bool bPaint; // painting or only formatting?
- bool bComplete; // Format everything or just the visible Area?
- bool bCalcLayout; // Complete reformatting?
- bool bAgain; // For the automatically repeated Action if Pages are deleted
- bool bNextCycle; // Reset on the first invalid Page
- bool bInput; // For terminating processing on input
- bool bIdle; // True if the LayAction was triggered by the Idler
- bool bReschedule; // Call Reschedule depending on Progress?
- bool bCheckPages; // Run CheckPageDescs() or delay it
- bool bUpdateExpFields; // Is set if, after Formatting, we need to do another round for ExpField
- bool bBrowseActionStop; // Terminate Action early (as per bInput) and leave the rest to the Idler
- bool bWaitAllowed; // Waitcursor allowed?
- bool bPaintExtraData; // Painting line numbers (or similar) enabled?
- bool bActionInProgress; // Is set in Action() at the beginning and deleted at the end
+ bool m_bPaint; // painting or only formatting?
+ bool m_bComplete; // Format everything or just the visible Area?
+ bool m_bCalcLayout; // Complete reformatting?
+ bool m_bAgain; // For the automatically repeated Action if Pages are deleted
+ bool m_bNextCycle; // Reset on the first invalid Page
+ bool m_bInput; // For terminating processing on input
+ bool m_bIdle; // True if the LayAction was triggered by the Idler
+ bool m_bReschedule; // Call Reschedule depending on Progress?
+ bool m_bCheckPages; // Run CheckPageDescs() or delay it
+ bool m_bUpdateExpFields; // Is set if, after Formatting, we need to do another round for ExpField
+ bool m_bBrowseActionStop; // Terminate Action early (as per bInput) and leave the rest to the Idler
+ bool m_bWaitAllowed; // Waitcursor allowed?
+ bool m_bPaintExtraData; // Painting line numbers (or similar) enabled?
+ bool m_bActionInProgress; // Is set in Action() at the beginning and deleted at the end
// OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
bool mbFormatContentOnInterrupt;
@@ -116,56 +116,56 @@ class SwLayAction
bool RemoveEmptyBrowserPages();
inline void CheckIdleEnd();
- inline std::clock_t GetStartTicks() { return nStartTicks; }
+ inline std::clock_t GetStartTicks() { return m_nStartTicks; }
public:
SwLayAction( SwRootFrm *pRt, SwViewShellImp *pImp );
~SwLayAction();
- void SetIdle ( bool bNew ) { bIdle = bNew; }
- void SetCheckPages ( bool bNew ) { bCheckPages = bNew; }
- void SetBrowseActionStop( bool bNew ) { bBrowseActionStop = bNew; }
- void SetNextCycle ( bool bNew ) { bNextCycle = bNew; }
-
- bool IsWaitAllowed() const { return bWaitAllowed; }
- bool IsNextCycle() const { return bNextCycle; }
- bool IsInput() const { return bInput; }
- bool IsWait() const { return nullptr != pWait; }
- bool IsPaint() const { return bPaint; }
- bool IsIdle() const { return bIdle; }
- bool IsReschedule() const { return bReschedule; }
- bool IsPaintExtraData() const { return bPaintExtraData;}
+ void SetIdle ( bool bNew ) { m_bIdle = bNew; }
+ void SetCheckPages ( bool bNew ) { m_bCheckPages = bNew; }
+ void SetBrowseActionStop( bool bNew ) { m_bBrowseActionStop = bNew; }
+ void SetNextCycle ( bool bNew ) { m_bNextCycle = bNew; }
+
+ bool IsWaitAllowed() const { return m_bWaitAllowed; }
+ bool IsNextCycle() const { return m_bNextCycle; }
+ bool IsInput() const { return m_bInput; }
+ bool IsWait() const { return nullptr != m_pWait; }
+ bool IsPaint() const { return m_bPaint; }
+ bool IsIdle() const { return m_bIdle; }
+ bool IsReschedule() const { return m_bReschedule; }
+ bool IsPaintExtraData() const { return m_bPaintExtraData;}
bool IsInterrupt() const { return IsInput(); }
- VclInputFlags GetInputType() const { return nInputType; }
+ VclInputFlags GetInputType() const { return m_nInputType; }
// adjusting Action to the wanted behaviour
- void SetPaint ( bool bNew ) { bPaint = bNew; }
- void SetComplete ( bool bNew ) { bComplete = bNew; }
+ void SetPaint ( bool bNew ) { m_bPaint = bNew; }
+ void SetComplete ( bool bNew ) { m_bComplete = bNew; }
void SetStatBar ( bool bNew );
- void SetInputType ( VclInputFlags nNew ) { nInputType = nNew; }
- void SetCalcLayout ( bool bNew ) { bCalcLayout = bNew; }
- void SetReschedule ( bool bNew ) { bReschedule = bNew; }
- void SetWaitAllowed ( bool bNew ) { bWaitAllowed = bNew; }
+ void SetInputType ( VclInputFlags nNew ) { m_nInputType = nNew; }
+ void SetCalcLayout ( bool bNew ) { m_bCalcLayout = bNew; }
+ void SetReschedule ( bool bNew ) { m_bReschedule = bNew; }
+ void SetWaitAllowed ( bool bNew ) { m_bWaitAllowed = bNew; }
- void SetAgain() { bAgain = true; }
- void SetUpdateExpFields() {bUpdateExpFields = true; }
+ void SetAgain() { m_bAgain = true; }
+ void SetUpdateExpFields() {m_bUpdateExpFields = true; }
inline void SetCheckPageNum( sal_uInt16 nNew );
- inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { nCheckPageNum = nNew; }
+ inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { m_nCheckPageNum = nNew; }
void Action(OutputDevice* pRenderContext); // here it begins
void Reset(); // back to CTor-defaults
- bool IsAgain() const { return bAgain; }
- bool IsComplete() const { return bComplete; }
- bool IsExpFields() const { return bUpdateExpFields; }
- bool IsCalcLayout() const { return bCalcLayout; }
- bool IsCheckPages() const { return bCheckPages; }
- bool IsBrowseActionStop() const { return bBrowseActionStop; }
- bool IsActionInProgress() const { return bActionInProgress; }
+ bool IsAgain() const { return m_bAgain; }
+ bool IsComplete() const { return m_bComplete; }
+ bool IsExpFields() const { return m_bUpdateExpFields; }
+ bool IsCalcLayout() const { return m_bCalcLayout; }
+ bool IsCheckPages() const { return m_bCheckPages; }
+ bool IsBrowseActionStop() const { return m_bBrowseActionStop; }
+ bool IsActionInProgress() const { return m_bActionInProgress; }
- sal_uInt16 GetCheckPageNum() const { return nCheckPageNum; }
+ sal_uInt16 GetCheckPageNum() const { return m_nCheckPageNum; }
// others should be able to activate the WaitCrsr, too
void CheckWaitCrsr();
@@ -207,8 +207,8 @@ public:
inline void SwLayAction::SetCheckPageNum( sal_uInt16 nNew )
{
- if ( nNew < nCheckPageNum )
- nCheckPageNum = nNew;
+ if ( nNew < m_nCheckPageNum )
+ m_nCheckPageNum = nNew;
}
#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 842a699..1e5677e 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -78,7 +78,7 @@
{ \
if ( IsReschedule() ) \
{ \
- ::RescheduleProgress( pImp->GetShell()->GetDoc()->GetDocShell() ); \
+ ::RescheduleProgress( m_pImp->GetShell()->GetDoc()->GetDocShell() ); \
} \
}
@@ -88,7 +88,7 @@ void SwLayAction::CheckWaitCrsr()
if ( !IsWait() && IsWaitAllowed() && IsPaint() &&
((std::clock() - GetStartTicks()) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) )
{
- pWait = new SwWait( *pRoot->GetFormat()->GetDoc()->GetDocShell(), true );
+ m_pWait = new SwWait( *m_pRoot->GetFormat()->GetDoc()->GetDocShell(), true );
}
}
@@ -96,18 +96,18 @@ void SwLayAction::CheckWaitCrsr()
inline void SwLayAction::CheckIdleEnd()
{
if ( !IsInput() )
- bInput = bool(GetInputType()) && Application::AnyInput( GetInputType() );
+ m_bInput = bool(GetInputType()) && Application::AnyInput( GetInputType() );
}
void SwLayAction::SetStatBar( bool bNew )
{
if ( bNew )
{
- nEndPage = pRoot->GetPageNum();
- nEndPage += nEndPage * 10 / 100;
+ m_nEndPage = m_pRoot->GetPageNum();
+ m_nEndPage += m_nEndPage * 10 / 100;
}
else
- nEndPage = USHRT_MAX;
+ m_nEndPage = USHRT_MAX;
}
bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrm *pCnt,
@@ -186,7 +186,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrm *pCn
bool bRetPaint = false;
for ( SwRects::const_iterator it = aTmp.begin(); it != aTmp.end(); ++it )
- bRetPaint |= pImp->GetShell()->AddPaintRect( *it );
+ bRetPaint |= m_pImp->GetShell()->AddPaintRect( *it );
return bRetPaint;
}
@@ -199,7 +199,7 @@ inline bool SwLayAction::_PaintContent( const SwContentFrm *pContent,
if ( pPage->GetSortedObjs() )
return PaintWithoutFlys( rRect, pContent, pPage );
else
- return pImp->GetShell()->AddPaintRect( rRect );
+ return m_pImp->GetShell()->AddPaintRect( rRect );
}
return false;
}
@@ -259,42 +259,42 @@ void SwLayAction::PaintContent( const SwContentFrm *pCnt,
}
SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewShellImp *pI ) :
- pRoot( pRt ),
- pImp( pI ),
- pOptTab( nullptr ),
- pWait( nullptr ),
- nPreInvaPage( USHRT_MAX ),
- nStartTicks( std::clock() ),
- nInputType( VclInputFlags::NONE ),
- nEndPage( USHRT_MAX ),
- nCheckPageNum( USHRT_MAX )
+ m_pRoot( pRt ),
+ m_pImp( pI ),
+ m_pOptTab( nullptr ),
+ m_pWait( nullptr ),
+ m_nPreInvaPage( USHRT_MAX ),
+ m_nStartTicks( std::clock() ),
+ m_nInputType( VclInputFlags::NONE ),
+ m_nEndPage( USHRT_MAX ),
+ m_nCheckPageNum( USHRT_MAX )
{
- bPaintExtraData = ::IsExtraData( pImp->GetShell()->GetDoc() );
- bPaint = bComplete = bWaitAllowed = bCheckPages = true;
- bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
- bUpdateExpFields = bBrowseActionStop = bActionInProgress = false;
+ m_bPaintExtraData = ::IsExtraData( m_pImp->GetShell()->GetDoc() );
+ m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true;
+ m_bInput = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = m_bReschedule =
+ m_bUpdateExpFields = m_bBrowseActionStop = m_bActionInProgress = false;
// OD 14.04.2003 #106346# - init new flag <mbFormatContentOnInterrupt>.
mbFormatContentOnInterrupt = false;
- assert(!pImp->m_pLayAction); // there can be only one SwLayAction
- pImp->m_pLayAction = this; // register there
+ assert(!m_pImp->m_pLayAction); // there can be only one SwLayAction
+ m_pImp->m_pLayAction = this; // register there
}
SwLayAction::~SwLayAction()
{
- OSL_ENSURE( !pWait, "Wait object not destroyed" );
- pImp->m_pLayAction = nullptr; // unregister
+ OSL_ENSURE( !m_pWait, "Wait object not destroyed" );
+ m_pImp->m_pLayAction = nullptr; // unregister
}
void SwLayAction::Reset()
{
- pOptTab = nullptr;
- nStartTicks = std::clock();
- nInputType = VclInputFlags::NONE;
- nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX;
- bPaint = bComplete = bWaitAllowed = bCheckPages = true;
- bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
- bUpdateExpFields = bBrowseActionStop = false;
+ m_pOptTab = nullptr;
+ m_nStartTicks = std::clock();
+ m_nInputType = VclInputFlags::NONE;
+ m_nEndPage = m_nPreInvaPage = m_nCheckPageNum = USHRT_MAX;
+ m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true;
+ m_bInput = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = m_bReschedule =
+ m_bUpdateExpFields = m_bBrowseActionStop = false;
}
bool SwLayAction::RemoveEmptyBrowserPages()
@@ -302,10 +302,10 @@ bool SwLayAction::RemoveEmptyBrowserPages()
// switching from the normal to the browser mode, empty pages may be
// retained for an annoyingly long time, so delete them here
bool bRet = false;
- const SwViewShell *pSh = pRoot->GetCurrShell();
+ const SwViewShell *pSh = m_pRoot->GetCurrShell();
if( pSh && pSh->GetViewOptions()->getBrowseMode() )
{
- SwPageFrm *pPage = static_cast<SwPageFrm*>(pRoot->Lower());
+ SwPageFrm *pPage = static_cast<SwPageFrm*>(m_pRoot->Lower());
do
{
if ( (pPage->GetSortedObjs() && pPage->GetSortedObjs()->size()) ||
@@ -326,48 +326,48 @@ bool SwLayAction::RemoveEmptyBrowserPages()
void SwLayAction::Action(OutputDevice* pRenderContext)
{
- bActionInProgress = true;
+ m_bActionInProgress = true;
//TurboMode? Hands-off during idle-format
if ( IsPaint() && !IsIdle() && TurboAction() )
{
- delete pWait, pWait = nullptr;
- pRoot->ResetTurboFlag();
- bActionInProgress = false;
- pRoot->DeleteEmptySct();
+ delete m_pWait, m_pWait = nullptr;
+ m_pRoot->ResetTurboFlag();
+ m_bActionInProgress = false;
+ m_pRoot->DeleteEmptySct();
return;
}
- else if ( pRoot->GetTurbo() )
+ else if ( m_pRoot->GetTurbo() )
{
- pRoot->DisallowTurbo();
- const SwFrm *pFrm = pRoot->GetTurbo();
- pRoot->ResetTurbo();
+ m_pRoot->DisallowTurbo();
+ const SwFrm *pFrm = m_pRoot->GetTurbo();
+ m_pRoot->ResetTurbo();
pFrm->InvalidatePage();
}
- pRoot->DisallowTurbo();
+ m_pRoot->DisallowTurbo();
if ( IsCalcLayout() )
SetCheckPages( false );
InternalAction(pRenderContext);
- bAgain |= RemoveEmptyBrowserPages();
+ m_bAgain |= RemoveEmptyBrowserPages();
while ( IsAgain() )
{
- bAgain = bNextCycle = false;
+ m_bAgain = m_bNextCycle = false;
InternalAction(pRenderContext);
- bAgain |= RemoveEmptyBrowserPages();
+ m_bAgain |= RemoveEmptyBrowserPages();
}
- pRoot->DeleteEmptySct();
+ m_pRoot->DeleteEmptySct();
- delete pWait, pWait = nullptr;
+ delete m_pWait, m_pWait = nullptr;
//Turbo-Action permitted again for all cases.
- pRoot->ResetTurboFlag();
- pRoot->ResetTurbo();
+ m_pRoot->ResetTurboFlag();
+ m_pRoot->ResetTurbo();
SetCheckPages( true );
- bActionInProgress = false;
+ m_bActionInProgress = false;
}
SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage )
@@ -427,19 +427,19 @@ static void unlockPositionOfObjects( SwPageFrm *pPageFrm )
void SwLayAction::InternalAction(OutputDevice* pRenderContext)
{
- OSL_ENSURE( pRoot->Lower()->IsPageFrm(), ":-( No page below the root.");
+ OSL_ENSURE( m_pRoot->Lower()->IsPageFrm(), ":-( No page below the root.");
- pRoot->Calc(pRenderContext);
+ m_pRoot->Calc(pRenderContext);
// Figure out the first invalid page or the first one to be formatted,
// respectively. A complete-action means the first invalid page.
// However, the first page to be formatted might be the one having the
// number 1. If we're doing a fake formatting, the number of the first
// page is the number of the first visible page.
- SwPageFrm *pPage = IsComplete() ? static_cast<SwPageFrm*>(pRoot->Lower()) :
- pImp->GetFirstVisPage(pRenderContext);
+ SwPageFrm *pPage = IsComplete() ? static_cast<SwPageFrm*>(m_pRoot->Lower()) :
+ m_pImp->GetFirstVisPage(pRenderContext);
if ( !pPage )
- pPage = static_cast<SwPageFrm*>(pRoot->Lower());
+ pPage = static_cast<SwPageFrm*>(m_pRoot->Lower());
// If there's a first-flow-Content in the first visible page that's also a Follow,
// we switch the page back to the original master of that Content.
@@ -450,17 +450,17 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
pPage = static_cast<SwPageFrm*>(pPage->GetNext());
- IDocumentLayoutAccess& rLayoutAccess = pRoot->GetFormat()->getIDocumentLayoutAccess();
- bool bNoLoop = pPage && SwLayouter::StartLoopControl( pRoot->GetFormat()->GetDoc(), pPage );
+ IDocumentLayoutAccess& rLayoutAccess = m_pRoot->GetFormat()->getIDocumentLayoutAccess();
+ bool bNoLoop = pPage && SwLayouter::StartLoopControl( m_pRoot->GetFormat()->GetDoc(), pPage );
sal_uInt16 nPercentPageNum = 0;
- while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
+ while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
{
- if (!pPage || (nCheckPageNum != USHRT_MAX && pPage->GetPhyPageNum() >= nCheckPageNum))
+ if (!pPage || (m_nCheckPageNum != USHRT_MAX && pPage->GetPhyPageNum() >= m_nCheckPageNum))
{
- if ( !pPage || pPage->GetPhyPageNum() > nCheckPageNum )
+ if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
{
- SwPageFrm *pPg = static_cast<SwPageFrm*>(pRoot->Lower());
- while ( pPg && pPg->GetPhyPageNum() < nCheckPageNum )
+ SwPageFrm *pPg = static_cast<SwPageFrm*>(m_pRoot->Lower());
+ while ( pPg && pPg->GetPhyPageNum() < m_nCheckPageNum )
pPg = static_cast<SwPageFrm*>(pPg->GetNext());
if ( pPg )
pPage = pPg;
@@ -472,33 +472,33 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
SetCheckPages( true );
SwFrm::CheckPageDescs( pPage, true, &pTmp );
SetCheckPages( false );
- nCheckPageNum = USHRT_MAX;
+ m_nCheckPageNum = USHRT_MAX;
pPage = pTmp;
continue;
}
- if ( nEndPage != USHRT_MAX && pPage->GetPhyPageNum() > nPercentPageNum )
+ if ( m_nEndPage != USHRT_MAX && pPage->GetPhyPageNum() > nPercentPageNum )
{
nPercentPageNum = pPage->GetPhyPageNum();
- ::SetProgressState( nPercentPageNum, pImp->GetShell()->GetDoc()->GetDocShell());
+ ::SetProgressState( nPercentPageNum, m_pImp->GetShell()->GetDoc()->GetDocShell());
}
- pOptTab = nullptr;
+ m_pOptTab = nullptr;
// No Shortcut for Idle or CalcLayout
if ( !IsIdle() && !IsComplete() && IsShortCut( pPage ) )
{
- pRoot->DeleteEmptySct();
+ m_pRoot->DeleteEmptySct();
XCHECKPAGE;
if ( !IsInterrupt() &&
- (pRoot->IsSuperfluous() || pRoot->IsAssertFlyPages()) )
+ (m_pRoot->IsSuperfluous() || m_pRoot->IsAssertFlyPages()) )
{
- if ( pRoot->IsAssertFlyPages() )
- pRoot->AssertFlyPages();
- if ( pRoot->IsSuperfluous() )
+ if ( m_pRoot->IsAssertFlyPages() )
+ m_pRoot->AssertFlyPages();
+ if ( m_pRoot->IsSuperfluous() )
{
bool bOld = IsAgain();
- pRoot->RemoveSuperfluous();
- bAgain = bOld;
+ m_pRoot->RemoveSuperfluous();
+ m_bAgain = bOld;
}
if ( IsAgain() )
{
@@ -506,7 +506,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
rLayoutAccess.GetLayouter()->EndLoopControl();
return;
}
- pPage = static_cast<SwPageFrm*>(pRoot->Lower());
+ pPage = static_cast<SwPageFrm*>(m_pRoot->Lower());
while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
pPage = static_cast<SwPageFrm*>(pPage->GetNext());
while ( pPage && pPage->GetNext() &&
@@ -518,7 +518,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
}
else
{
- pRoot->DeleteEmptySct();
+ m_pRoot->DeleteEmptySct();
XCHECKPAGE;
while ( !IsInterrupt() && !IsNextCycle() &&
@@ -578,7 +578,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
pPage->InvalidateFlyLayout();
pPage->InvalidateFlyContent();
if ( IsBrowseActionStop() )
- bInput = true;
+ m_bInput = true;
}
}
if( bNoLoop )
@@ -600,22 +600,22 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
{
SetNextCycle( false );
- if ( nPreInvaPage != USHRT_MAX )
+ if ( m_nPreInvaPage != USHRT_MAX )
{
- if( !IsComplete() && nPreInvaPage + 2 < nFirstPageNum )
+ if( !IsComplete() && m_nPreInvaPage + 2 < nFirstPageNum )
{
- pImp->SetFirstVisPageInvalid();
- SwPageFrm *pTmpPage = pImp->GetFirstVisPage(pRenderContext);
+ m_pImp->SetFirstVisPageInvalid();
+ SwPageFrm *pTmpPage = m_pImp->GetFirstVisPage(pRenderContext);
nFirstPageNum = pTmpPage->GetPhyPageNum();
- if( nPreInvaPage < nFirstPageNum )
+ if( m_nPreInvaPage < nFirstPageNum )
{
- nPreInvaPage = nFirstPageNum;
+ m_nPreInvaPage = nFirstPageNum;
pPage = pTmpPage;
}
}
- while ( pPage->GetPrev() && pPage->GetPhyPageNum() > nPreInvaPage )
+ while ( pPage->GetPrev() && pPage->GetPhyPageNum() > m_nPreInvaPage )
pPage = static_cast<SwPageFrm*>(pPage->GetPrev());
- nPreInvaPage = USHRT_MAX;
+ m_nPreInvaPage = USHRT_MAX;
}
while ( pPage->GetPrev() &&
@@ -640,15 +640,15 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
CheckIdleEnd();
}
if ( !pPage && !IsInterrupt() &&
- (pRoot->IsSuperfluous() || pRoot->IsAssertFlyPages()) )
+ (m_pRoot->IsSuperfluous() || m_pRoot->IsAssertFlyPages()) )
{
- if ( pRoot->IsAssertFlyPages() )
- pRoot->AssertFlyPages();
- if ( pRoot->IsSuperfluous() )
+ if ( m_pRoot->IsAssertFlyPages() )
+ m_pRoot->AssertFlyPages();
+ if ( m_pRoot->IsSuperfluous() )
{
bool bOld = IsAgain();
- pRoot->RemoveSuperfluous();
- bAgain = bOld;
+ m_pRoot->RemoveSuperfluous();
+ m_bAgain = bOld;
}
if ( IsAgain() )
{
@@ -656,7 +656,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
rLayoutAccess.GetLayouter()->EndLoopControl();
return;
}
- pPage = static_cast<SwPageFrm*>(pRoot->Lower());
+ pPage = static_cast<SwPageFrm*>(m_pRoot->Lower());
while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
pPage = static_cast<SwPageFrm*>(pPage->GetNext());
while ( pPage && pPage->GetNext() &&
@@ -684,7 +684,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
// already - the border of the page will never be painted.
SwPageFrm *pPg = pPage;
XCHECKPAGE;
- const SwRect &rVis = pImp->GetShell()->VisArea();
+ const SwRect &rVis = m_pImp->GetShell()->VisArea();
while( pPg && pPg->Frm().Bottom() < rVis.Top() )
pPg = static_cast<SwPageFrm*>(pPg->GetNext());
@@ -783,7 +783,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
// reset flag for special interrupt content formatting.
mbFormatContentOnInterrupt = false;
}
- pOptTab = nullptr;
+ m_pOptTab = nullptr;
if( bNoLoop )
rLayoutAccess.GetLayouter()->EndLoopControl();
}
@@ -796,7 +796,7 @@ bool SwLayAction::_TurboAction( const SwContentFrm *pCnt )
{
const SwRect aOldRect( pCnt->UnionFrm( true ) );
const long nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom();
- pCnt->Calc(pImp->GetShell()->GetOut());
+ pCnt->Calc(m_pImp->GetShell()->GetOut());
if ( pCnt->Frm().Bottom() < aOldRect.Bottom() )
pCnt->SetRetouche();
@@ -810,7 +810,7 @@ bool SwLayAction::_TurboAction( const SwContentFrm *pCnt )
if ( nAllLines != static_cast<const SwTextFrm*>(pCnt)->GetAllLines() )
{
if ( IsPaintExtraData() )
- pImp->GetShell()->AddPaintRect( pCnt->Frm() );
+ m_pImp->GetShell()->AddPaintRect( pCnt->Frm() );
// This is to calculate the remaining LineNums on the page,
// and we don't stop processing here. To perform this inside RecalcAllLines
// would be expensive, because we would have to notify the page even
@@ -848,14 +848,14 @@ bool SwLayAction::TurboAction()
{
bool bRet = true;
- if ( pRoot->GetTurbo() )
+ if ( m_pRoot->GetTurbo() )
{
- if ( !_TurboAction( pRoot->GetTurbo() ) )
+ if ( !_TurboAction( m_pRoot->GetTurbo() ) )
{
CheckIdleEnd();
bRet = false;
}
- pRoot->ResetTurbo();
+ m_pRoot->ResetTurbo();
}
else
bRet = false;
@@ -986,9 +986,9 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
*/
bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
{
- vcl::RenderContext* pRenderContext = pImp->GetShell()->GetOut();
+ vcl::RenderContext* pRenderContext = m_pImp->GetShell()->GetOut();
bool bRet = false;
- const SwViewShell *pSh = pRoot->GetCurrShell();
+ const SwViewShell *pSh = m_pRoot->GetCurrShell();
const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
// If the page is not valid, we quickly format it, otherwise
@@ -1016,7 +1016,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
return false;
}
- const SwRect &rVis = pImp->GetShell()->VisArea();
+ const SwRect &rVis = m_pImp->GetShell()->VisArea();
if ( (prPage->Frm().Top() >= rVis.Bottom()) ||
(prPage->Frm().Left()>= rVis.Right()) )
{
@@ -1268,7 +1268,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
// Is the change even visible?
if ( pLay->IsCompletePaint() )
{
- pImp->GetShell()->AddPaintRect( aPaint );
+ m_pImp->GetShell()->AddPaintRect( aPaint );
bAddRect = false;
}
else
@@ -1276,18 +1276,18 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
SwRegionRects aRegion( aOldRect );
aRegion -= aPaint;
for ( size_t i = 0; i < aRegion.size(); ++i )
- pImp->GetShell()->AddPaintRect( aRegion[i] );
+ m_pImp->GetShell()->AddPaintRect( aRegion[i] );
aRegion.ChangeOrigin( aPaint );
aRegion.clear();
aRegion.push_back( aPaint );
aRegion -= aOldRect;
for ( size_t i = 0; i < aRegion.size(); ++i )
- pImp->GetShell()->AddPaintRect( aRegion[i] );
+ m_pImp->GetShell()->AddPaintRect( aRegion[i] );
}
}
else
{
- pImp->GetShell()->AddPaintRect( aPaint );
+ m_pImp->GetShell()->AddPaintRect( aPaint );
bAlreadyPainted = true;
// OD 11.11.2002 #104414# - remember frame at complete paint
aFrmAtCompletePaint = pLay->Frm();
@@ -1300,7 +1300,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell();
const SwTwips nHalfDocBorder = pSh ? pSh->GetViewOptions()->GetGapBetweenPages()
: SwViewOption::GetDefGapBetweenPages();
- const bool bLeftToRightViewLayout = pRoot->IsLeftToRightViewLayout();
+ const bool bLeftToRightViewLayout = m_pRoot->IsLeftToRightViewLayout();
const bool bPrev = bLeftToRightViewLayout ? pLay->GetPrev() : pLay->GetNext();
const bool bNext = bLeftToRightViewLayout ? pLay->GetNext() : pLay->GetPrev();
SwPageFrm* pPageFrm = static_cast<SwPageFrm*>(pLay);
@@ -1321,14 +1321,14 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
aSpaceToPrevPage.Top( aSpaceToPrevPage.Top() - nHalfDocBorder );
aSpaceToPrevPage.Bottom( pLay->Frm().Top() );
if(aSpaceToPrevPage.Height() > 0 && aSpaceToPrevPage.Width() > 0)
- pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
+ m_pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
// left
aSpaceToPrevPage = aPageRect;
aSpaceToPrevPage.Left( aSpaceToPrevPage.Left() - nHalfDocBorder );
aSpaceToPrevPage.Right( pLay->Frm().Left() );
if(aSpaceToPrevPage.Height() > 0 && aSpaceToPrevPage.Width() > 0)
- pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
+ m_pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
}
if ( bNext )
{
@@ -1337,14 +1337,14 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
aSpaceToNextPage.Bottom( aSpaceToNextPage.Bottom() + nHalfDocBorder );
aSpaceToNextPage.Top( pLay->Frm().Bottom() );
if(aSpaceToNextPage.Height() > 0 && aSpaceToNextPage.Width() > 0)
- pImp->GetShell()->AddPaintRect( aSpaceToNextPage );
+ m_pImp->GetShell()->AddPaintRect( aSpaceToNextPage );
// right
aSpaceToNextPage = aPageRect;
aSpaceToNextPage.Right( aSpaceToNextPage.Right() + nHalfDocBorder );
aSpaceToNextPage.Left( pLay->Frm().Right() );
if(aSpaceToNextPage.Height() > 0 && aSpaceToNextPage.Width() > 0)
- pImp->GetShell()->AddPaintRect( aSpaceToNextPage );
+ m_pImp->GetShell()->AddPaintRect( aSpaceToNextPage );
}
}
}
@@ -1358,7 +1358,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
SWRECTFN( pLay );
SwRect aRect( pLay->GetUpper()->PaintArea() );
(aRect.*fnRect->fnSetTop)( (pLay->*fnRect->fnGetPrtBottom)() );
- if ( !pImp->GetShell()->AddPaintRect( aRect ) )
+ if ( !m_pImp->GetShell()->AddPaintRect( aRect ) )
pLay->ResetRetouche();
}
@@ -1387,7 +1387,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
else if( !pLow->IsSctFrm() || static_cast<SwSectionFrm*>(pLow)->GetSection() )
bChanged |= FormatLayout( pRenderContext, static_cast<SwLayoutFrm*>(pLow), bAddRect );
}
- else if ( pImp->GetShell()->IsPaintLocked() )
+ else if ( m_pImp->GetShell()->IsPaintLocked() )
// Shortcut to minimize the cycles. With Lock, the
// paint is coming either way (primarily for browse)
pLow->OptCalc();
@@ -1406,14 +1406,14 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrm *pLay,
aBoundRect.Height() > aFrmAtCompletePaint.Height() )
)
{
- pImp->GetShell()->AddPaintRect( aBoundRect );
+ m_pImp->GetShell()->AddPaintRect( aBoundRect );
}
return bChanged || bTabChanged;
}
bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
{
- vcl::RenderContext* pRenderContext = pImp->GetShell()->GetOut();
+ vcl::RenderContext* pRenderContext = m_pImp->GetShell()->GetOut();
OSL_ENSURE( !IsAgain(), "Attention to the invalid page." );
if ( IsAgain() )
return false;
@@ -1430,7 +1430,7 @@ bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
if ( IsPaint() && (pFly->IsCompletePaint() || bChanged) &&
pFly->Frm().Top() > 0 && pFly->Frm().Left() > 0 )
- pImp->GetShell()->AddPaintRect( pFly->Frm() );
+ m_pImp->GetShell()->AddPaintRect( pFly->Frm() );
if ( bChanged )
pFly->Invalidate();
@@ -1454,7 +1454,7 @@ bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
if ( pLow->IsTabFrm() )
bTabChanged |= FormatLayoutTab( static_cast<SwTabFrm*>(pLow), bAddRect );
else
- bChanged |= FormatLayout( pImp->GetShell()->GetOut(), static_cast<SwLayoutFrm*>(pLow), bAddRect );
+ bChanged |= FormatLayout( m_pImp->GetShell()->GetOut(), static_cast<SwLayoutFrm*>(pLow), bAddRect );
}
pLow = pLow->GetNext();
}
@@ -1469,8 +1469,8 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
if ( IsAgain() || !pTab->Lower() )
return false;
- vcl::RenderContext* pRenderContext = pImp->GetShell()->GetOut();
- IDocumentTimerAccess& rTimerAccess = pRoot->GetFormat()->getIDocumentTimerAccess();
+ vcl::RenderContext* pRenderContext = m_pImp->GetShell()->GetOut();
+ IDocumentTimerAccess& rTimerAccess = m_pRoot->GetFormat()->getIDocumentTimerAccess();
rTimerAccess.BlockIdling();
bool bChanged = false;
@@ -1518,14 +1518,14 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
{
aMarginRect = pTab->Frm();
(aMarginRect.*fnRect->fnSetWidth)( nLeftMargin );
- pImp->GetShell()->AddPaintRect( aMarginRect );
+ m_pImp->GetShell()->AddPaintRect( aMarginRect );
}
if ( (pTab->*fnRect->fnGetRightMargin)() > 0)
{
aMarginRect = pTab->Frm();
(aMarginRect.*fnRect->fnSetLeft)( (pTab->*fnRect->fnGetPrtRight)() );
- pImp->GetShell()->AddPaintRect( aMarginRect );
+ m_pImp->GetShell()->AddPaintRect( aMarginRect );
}
SwTwips nTopMargin = (pTab->*fnRect->fnGetTopMargin)();
@@ -1533,19 +1533,19 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
{
aMarginRect = pTab->Frm();
(aMarginRect.*fnRect->fnSetHeight)( nTopMargin );
- pImp->GetShell()->AddPaintRect( aMarginRect );
+ m_pImp->GetShell()->AddPaintRect( aMarginRect );
}
if ( (pTab->*fnRect->fnGetBottomMargin)() > 0)
{
aMarginRect = pTab->Frm();
(aMarginRect.*fnRect->fnSetTop)( (pTab->*fnRect->fnGetPrtBottom)() );
- pImp->GetShell()->AddPaintRect( aMarginRect );
+ m_pImp->GetShell()->AddPaintRect( aMarginRect );
}
}
else if ( pTab->IsCompletePaint() )
{
- pImp->GetShell()->AddPaintRect( aPaintFrm );
+ m_pImp->GetShell()->AddPaintRect( aPaintFrm );
bAddRect = false;
bPainted = true;
}
@@ -1555,15 +1555,15 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
SwRect aRect( pTab->GetUpper()->PaintArea() );
// OD 04.11.2002 #104100# - vertical layout support
(aRect.*fnRect->fnSetTop)( (pTab->*fnRect->fnGetPrtBottom)() );
- if ( !pImp->GetShell()->AddPaintRect( aRect ) )
+ if ( !m_pImp->GetShell()->AddPaintRect( aRect ) )
pTab->ResetRetouche();
}
}
else
bAddRect = false;
- if ( pTab->IsCompletePaint() && !pOptTab )
- pOptTab = pTab;
+ if ( pTab->IsCompletePaint() && !m_pOptTab )
+ m_pOptTab = pTab;
pTab->ResetCompletePaint();
}
if ( IsPaint() && bAddRect && pTab->IsRetouche() && !pTab->GetNext() )
@@ -1574,7 +1574,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
SwRect aRect( pTab->GetUpper()->PaintArea() );
// OD 04.11.2002 #104100# - vertical layout support
(aRect.*fnRect->fnSetTop)( (pTab->*fnRect->fnGetPrtBottom)() );
- if ( !pImp->GetShell()->AddPaintRect( aRect ) )
+ if ( !m_pImp->GetShell()->AddPaintRect( aRect ) )
pTab->ResetRetouche();
}
@@ -1584,7 +1584,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
// Ugly shortcut!
if ( pTab->IsLowersFormatted() &&
- (bPainted || !pImp->GetShell()->VisArea().IsOver( pTab->Frm())) )
+ (bPainted || !m_pImp->GetShell()->VisArea().IsOver( pTab->Frm())) )
return false;
// Now, deal with the lowers
@@ -1602,7 +1602,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
SwLayoutFrm *pLow = static_cast<SwLayoutFrm*>(pTab->Lower());
while ( pLow )
{
- bChanged |= FormatLayout( pImp->GetShell()->GetOut(), pLow, bAddRect );
+ bChanged |= FormatLayout( m_pImp->GetShell()->GetOut(), pLow, bAddRect );
if ( IsAgain() )
return false;
pLow = static_cast<SwLayoutFrm*>(pLow->GetNext());
@@ -1615,7 +1615,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
bool SwLayAction::FormatContent( const SwPageFrm *pPage )
{
const SwContentFrm *pContent = pPage->ContainsContent();
- const SwViewShell *pSh = pRoot->GetCurrShell();
+ const SwViewShell *pSh = m_pRoot->GetCurrShell();
const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
while ( pContent && pPage->IsAnLower( pContent ) )
@@ -1634,10 +1634,10 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
const SwTabFrm *pTab = pContent->FindTabFrm();
const bool bInValid = !pContent->IsValid() || pContent->IsCompletePaint();
const bool bOldPaint = IsPaint();
- bPaint = bOldPaint && !(pTab && pTab == pOptTab);
+ m_bPaint = bOldPaint && !(pTab && pTab == m_pOptTab);
_FormatContent( pContent, pPage );
// #i26945# - reset <bPaint> before format objects
- bPaint = bOldPaint;
+ m_bPaint = bOldPaint;
// OD 2004-05-10 #i28701# - format floating screen object at content frame.
// No format, if action flag <bAgain> is set or action is interrupted.
@@ -1660,7 +1660,7 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines();
if ( IsPaintExtraData() && IsPaint() &&
nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() )
- pImp->GetShell()->AddPaintRect( pContent->Frm() );
+ m_pImp->GetShell()->AddPaintRect( pContent->Frm() );
}
if ( IsAgain() )
@@ -1686,7 +1686,7 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
{
const sal_uInt16 nCurNum = pContent->FindPageFrm()->GetPhyPageNum();
if ( nCurNum < pPage->GetPhyPageNum() )
- nPreInvaPage = nCurNum;
+ m_nPreInvaPage = nCurNum;
// If the Frm flowed backwards more than one page, we need to
// start over again from the beginning, so nothing gets left out.
@@ -1719,9 +1719,9 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
if ( bSetContent )
{
if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() &&
- pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
+ pContent->Frm().Top() > m_pImp->GetShell()->VisArea().Bottom())
{
- const long nBottom = pImp->GetShell()->VisArea().Bottom();
+ const long nBottom = m_pImp->GetShell()->VisArea().Bottom();
const SwFrm *pTmp = lcl_FindFirstInvaContent( pPage,
nBottom, pContent );
if ( !pTmp )
@@ -1751,7 +1751,7 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines();
if ( IsPaintExtraData() && IsPaint() &&
nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() )
- pImp->GetShell()->AddPaintRect( pContent->Frm() );
+ m_pImp->GetShell()->AddPaintRect( pContent->Frm() );
}
// Do this if the Frm has been formatted before.
@@ -1766,9 +1766,9 @@ bool SwLayAction::FormatContent( const SwPageFrm *pPage )
return false;
}
if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() &&
- pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list