Kaydet (Commit) fdeaa040 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwFrmAddPage

Change-Id: Id4a5a5794ff03a88922df7fd1dcba75ed601dd59
üst cd43da04
...@@ -2864,34 +2864,34 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void) ...@@ -2864,34 +2864,34 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void)
SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet) SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet) : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet)
, pWrtSh(nullptr) , m_pWrtSh(nullptr)
, bHtmlMode(false) , m_bHtmlMode(false)
, bFormat(false) , m_bFormat(false)
, bNew(false) , m_bNew(false)
{ {
get(pNameFrame, "nameframe"); get(m_pNameFrame, "nameframe");
get(pNameFT,"name_label"); get(m_pNameFT,"name_label");
get(pNameED,"name"); get(m_pNameED,"name");
get(pAltNameFT,"altname_label"); get(m_pAltNameFT,"altname_label");
get(pAltNameED,"altname"); get(m_pAltNameED,"altname");
get(pPrevFT,"prev_label"); get(m_pPrevFT,"prev_label");
get(pPrevLB,"prev"); get(m_pPrevLB,"prev");
get(pNextFT,"next_label"); get(m_pNextFT,"next_label");
get(pNextLB,"next"); get(m_pNextLB,"next");
get(pProtectFrame,"protect"); get(m_pProtectFrame,"protect");
get(pProtectContentCB,"protectcontent"); get(m_pProtectContentCB,"protectcontent");
get(pProtectFrameCB,"protectframe"); get(m_pProtectFrameCB,"protectframe");
get(pProtectSizeCB,"protectsize"); get(m_pProtectSizeCB,"protectsize");
get(m_pContentAlignFrame, "contentalign"); get(m_pContentAlignFrame, "contentalign");
get(m_pVertAlignLB,"vertalign"); get(m_pVertAlignLB,"vertalign");
get(pPropertiesFrame,"properties"); get(m_pPropertiesFrame,"properties");
get(pEditInReadonlyCB,"editinreadonly"); get(m_pEditInReadonlyCB,"editinreadonly");
get(pPrintFrameCB,"printframe"); get(m_pPrintFrameCB,"printframe");
get(pTextFlowFT,"textflow_label"); get(m_pTextFlowFT,"textflow_label");
get(pTextFlowLB,"textflow"); get(m_pTextFlowLB,"textflow");
} }
...@@ -2902,26 +2902,26 @@ SwFrmAddPage::~SwFrmAddPage() ...@@ -2902,26 +2902,26 @@ SwFrmAddPage::~SwFrmAddPage()
void SwFrmAddPage::dispose() void SwFrmAddPage::dispose()
{ {
pNameFrame.clear(); m_pNameFrame.clear();
pNameFT.clear(); m_pNameFT.clear();
pNameED.clear(); m_pNameED.clear();
pAltNameFT.clear(); m_pAltNameFT.clear();
pAltNameED.clear(); m_pAltNameED.clear();
pPrevFT.clear(); m_pPrevFT.clear();
pPrevLB.clear(); m_pPrevLB.clear();
pNextFT.clear(); m_pNextFT.clear();
pNextLB.clear(); m_pNextLB.clear();
pProtectFrame.clear(); m_pProtectFrame.clear();
pProtectContentCB.clear(); m_pProtectContentCB.clear();
pProtectFrameCB.clear(); m_pProtectFrameCB.clear();
pProtectSizeCB.clear(); m_pProtectSizeCB.clear();
m_pContentAlignFrame.clear(); m_pContentAlignFrame.clear();
m_pVertAlignLB.clear(); m_pVertAlignLB.clear();
pPropertiesFrame.clear(); m_pPropertiesFrame.clear();
pEditInReadonlyCB.clear(); m_pEditInReadonlyCB.clear();
pPrintFrameCB.clear(); m_pPrintFrameCB.clear();
pTextFlowFT.clear(); m_pTextFlowFT.clear();
pTextFlowLB.clear(); m_pTextFlowLB.clear();
SfxTabPage::dispose(); SfxTabPage::dispose();
} }
...@@ -2935,30 +2935,30 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) ...@@ -2935,30 +2935,30 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
{ {
const SfxPoolItem* pItem; const SfxPoolItem* pItem;
sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current())); sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; m_bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
if (bHtmlMode) if (m_bHtmlMode)
{ {
pProtectFrame->Hide(); m_pProtectFrame->Hide();
pEditInReadonlyCB->Hide(); m_pEditInReadonlyCB->Hide();
pPrintFrameCB->Hide(); m_pPrintFrameCB->Hide();
} }
if (sDlgType == "PictureDialog" || sDlgType == "ObjectDialog") if (m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog")
{ {
pEditInReadonlyCB->Hide(); m_pEditInReadonlyCB->Hide();
if (bHtmlMode) if (m_bHtmlMode)
{ {
pPropertiesFrame->Hide(); m_pPropertiesFrame->Hide();
} }
m_pContentAlignFrame->Hide(); m_pContentAlignFrame->Hide();
} }
if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem)) if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem))
{ {
pAltNameED->SetText(static_cast<const SfxStringItem*>(pItem)->GetValue()); m_pAltNameED->SetText(static_cast<const SfxStringItem*>(pItem)->GetValue());
pAltNameED->SaveValue(); m_pAltNameED->SaveValue();
} }
if(!bFormat) if(!m_bFormat)
{ {
// insert graphic - properties // insert graphic - properties
// bNew is not set, so recognise by selection // bNew is not set, so recognise by selection
...@@ -2968,42 +2968,42 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) ...@@ -2968,42 +2968,42 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
aTmpName1 = static_cast<const SfxStringItem*>(pItem)->GetValue(); aTmpName1 = static_cast<const SfxStringItem*>(pItem)->GetValue();
} }
OSL_ENSURE(pWrtSh, "keine Shell?"); OSL_ENSURE(m_pWrtSh, "keine Shell?");
if( bNew || aTmpName1.isEmpty() ) if( m_bNew || aTmpName1.isEmpty() )
{ {
if (sDlgType == "PictureDialog") if (m_sDlgType == "PictureDialog")
aTmpName1 = pWrtSh->GetUniqueGrfName(); aTmpName1 = m_pWrtSh->GetUniqueGrfName();
else if (sDlgType == "ObjectDialog") else if (m_sDlgType == "ObjectDialog")
aTmpName1 = pWrtSh->GetUniqueOLEName(); aTmpName1 = m_pWrtSh->GetUniqueOLEName();
else else
aTmpName1 = pWrtSh->GetUniqueFrameName(); aTmpName1 = m_pWrtSh->GetUniqueFrameName();
pWrtSh->SetFlyName(aTmpName1); m_pWrtSh->SetFlyName(aTmpName1);
} }
pNameED->SetText( aTmpName1 ); m_pNameED->SetText( aTmpName1 );
pNameED->SaveValue(); m_pNameED->SaveValue();
} }
else else
{ {
pNameED->Enable( false ); m_pNameED->Enable( false );
pAltNameED->Enable(false); m_pAltNameED->Enable(false);
pNameFT->Enable( false ); m_pNameFT->Enable( false );
pAltNameFT->Enable(false); m_pAltNameFT->Enable(false);
} }
if (sDlgType == "FrameDialog" && pAltNameFT->IsVisible()) if (m_sDlgType == "FrameDialog" && m_pAltNameFT->IsVisible())
{ {
pAltNameFT->Hide(); m_pAltNameFT->Hide();
pAltNameED->Hide(); m_pAltNameED->Hide();
} }
else else
{ {
pNameED->SetModifyHdl(LINK(this, SwFrmAddPage, EditModifyHdl)); m_pNameED->SetModifyHdl(LINK(this, SwFrmAddPage, EditModifyHdl));
} }
if (!bNew) if (!m_bNew)
{ {
SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat(); SwFrameFormat* pFormat = m_pWrtSh->GetFlyFrameFormat();
if (pFormat) if (pFormat)
{ {
...@@ -3024,79 +3024,79 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) ...@@ -3024,79 +3024,79 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
::std::vector< OUString > aThisPageFrames; ::std::vector< OUString > aThisPageFrames;
::std::vector< OUString > aNextPageFrames; ::std::vector< OUString > aNextPageFrames;
::std::vector< OUString > aRemainFrames; ::std::vector< OUString > aRemainFrames;
pWrtSh->GetConnectableFrameFormats(*pFormat, sNextChain, false, m_pWrtSh->GetConnectableFrameFormats(*pFormat, sNextChain, false,
aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
lcl_InsertVectors(*pPrevLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); lcl_InsertVectors(*m_pPrevLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
if(!sPrevChain.isEmpty()) if(!sPrevChain.isEmpty())
{ {
if(LISTBOX_ENTRY_NOTFOUND == pPrevLB->GetEntryPos(sPrevChain)) if(LISTBOX_ENTRY_NOTFOUND == m_pPrevLB->GetEntryPos(sPrevChain))
pPrevLB->InsertEntry(sPrevChain, 1); m_pPrevLB->InsertEntry(sPrevChain, 1);
pPrevLB->SelectEntry(sPrevChain); m_pPrevLB->SelectEntry(sPrevChain);
} }
else else
pPrevLB->SelectEntryPos(0); m_pPrevLB->SelectEntryPos(0);
aPrevPageFrames.erase(aPrevPageFrames.begin(), aPrevPageFrames.end()); aPrevPageFrames.erase(aPrevPageFrames.begin(), aPrevPageFrames.end());
aNextPageFrames.erase(aNextPageFrames.begin(), aNextPageFrames.end()); aNextPageFrames.erase(aNextPageFrames.begin(), aNextPageFrames.end());
aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end()); aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end());
aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end()); aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end());
pWrtSh->GetConnectableFrameFormats(*pFormat, sPrevChain, true, m_pWrtSh->GetConnectableFrameFormats(*pFormat, sPrevChain, true,
aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
lcl_InsertVectors(*pNextLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); lcl_InsertVectors(*m_pNextLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
if(!sNextChain.isEmpty()) if(!sNextChain.isEmpty())
{ {
if(LISTBOX_ENTRY_NOTFOUND == pNextLB->GetEntryPos(sNextChain)) if(LISTBOX_ENTRY_NOTFOUND == m_pNextLB->GetEntryPos(sNextChain))
pNextLB->InsertEntry(sNextChain, 1); m_pNextLB->InsertEntry(sNextChain, 1);
pNextLB->SelectEntry(sNextChain); m_pNextLB->SelectEntry(sNextChain);
} }
else else
pNextLB->SelectEntryPos(0); m_pNextLB->SelectEntryPos(0);
Link<ListBox&,void> aLink(LINK(this, SwFrmAddPage, ChainModifyHdl)); Link<ListBox&,void> aLink(LINK(this, SwFrmAddPage, ChainModifyHdl));
pPrevLB->SetSelectHdl(aLink); m_pPrevLB->SetSelectHdl(aLink);
pNextLB->SetSelectHdl(aLink); m_pNextLB->SetSelectHdl(aLink);
} }
} }
// Pos Protected // Pos Protected
const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet->Get(RES_PROTECT)); const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet->Get(RES_PROTECT));
pProtectFrameCB->Check(rProt.IsPosProtected()); m_pProtectFrameCB->Check(rProt.IsPosProtected());
pProtectContentCB->Check(rProt.IsContentProtected()); m_pProtectContentCB->Check(rProt.IsContentProtected());
pProtectSizeCB->Check(rProt.IsSizeProtected()); m_pProtectSizeCB->Check(rProt.IsSizeProtected());
const SwFormatEditInReadonly& rEdit = static_cast<const SwFormatEditInReadonly& >(rSet->Get(RES_EDIT_IN_READONLY)); const SwFormatEditInReadonly& rEdit = static_cast<const SwFormatEditInReadonly& >(rSet->Get(RES_EDIT_IN_READONLY));
pEditInReadonlyCB->Check(rEdit.GetValue()); pEditInReadonlyCB->SaveValue(); m_pEditInReadonlyCB->Check(rEdit.GetValue()); m_pEditInReadonlyCB->SaveValue();
// print // print
const SvxPrintItem& rPrt = static_cast<const SvxPrintItem&>(rSet->Get(RES_PRINT)); const SvxPrintItem& rPrt = static_cast<const SvxPrintItem&>(rSet->Get(RES_PRINT));
pPrintFrameCB->Check(rPrt.GetValue()); pPrintFrameCB->SaveValue(); m_pPrintFrameCB->Check(rPrt.GetValue()); m_pPrintFrameCB->SaveValue();
// textflow // textflow
SfxItemState eState; SfxItemState eState;
if( (!bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES))) if( (!m_bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES)))
&& sDlgType != "PictureDialog" && sDlgType != "ObjectDialog" && && m_sDlgType != "PictureDialog" && m_sDlgType != "ObjectDialog" &&
SfxItemState::UNKNOWN != ( eState = rSet->GetItemState( SfxItemState::UNKNOWN != ( eState = rSet->GetItemState(
RES_FRAMEDIR )) ) RES_FRAMEDIR )) )
{ {
pTextFlowFT->Show(); m_pTextFlowFT->Show();
pTextFlowLB->Show(); m_pTextFlowLB->Show();
//vertical text flow is not possible in HTML //vertical text flow is not possible in HTML
if(bHtmlMode) if(m_bHtmlMode)
{ {
sal_uLong nData = FRMDIR_VERT_TOP_RIGHT; sal_uLong nData = FRMDIR_VERT_TOP_RIGHT;
pTextFlowLB->RemoveEntry(pTextFlowLB->GetEntryPos(reinterpret_cast<void*>(nData))); m_pTextFlowLB->RemoveEntry(m_pTextFlowLB->GetEntryPos(reinterpret_cast<void*>(nData)));
} }
sal_uInt16 nVal = static_cast<const SvxFrameDirectionItem&>(rSet->Get(RES_FRAMEDIR)).GetValue(); sal_uInt16 nVal = static_cast<const SvxFrameDirectionItem&>(rSet->Get(RES_FRAMEDIR)).GetValue();
sal_Int32 nPos; sal_Int32 nPos;
for( nPos = pTextFlowLB->GetEntryCount(); nPos; ) for( nPos = m_pTextFlowLB->GetEntryCount(); nPos; )
if( (sal_uInt16)reinterpret_cast<sal_IntPtr>(pTextFlowLB->GetEntryData( --nPos )) == nVal ) if( (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTextFlowLB->GetEntryData( --nPos )) == nVal )
break; break;
pTextFlowLB->SelectEntryPos( nPos ); m_pTextFlowLB->SelectEntryPos( nPos );
pTextFlowLB->SaveValue(); m_pTextFlowLB->SaveValue();
} }
else else
{ {
pTextFlowFT->Hide(); m_pTextFlowFT->Hide();
pTextFlowLB->Hide(); m_pTextFlowLB->Hide();
} }
// Content alignment // Content alignment
...@@ -3119,47 +3119,47 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) ...@@ -3119,47 +3119,47 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet) bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
{ {
bool bRet = false; bool bRet = false;
if (pNameED->IsValueChangedFromSaved()) if (m_pNameED->IsValueChangedFromSaved())
bRet |= nullptr != rSet->Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); bRet |= nullptr != rSet->Put(SfxStringItem(FN_SET_FRM_NAME, m_pNameED->GetText()));
if (pAltNameED->IsValueChangedFromSaved()) if (m_pAltNameED->IsValueChangedFromSaved())
bRet |= nullptr != rSet->Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); bRet |= nullptr != rSet->Put(SfxStringItem(FN_SET_FRM_ALT_NAME, m_pAltNameED->GetText()));
const SfxPoolItem* pOldItem; const SfxPoolItem* pOldItem;
SvxProtectItem aProt ( static_cast<const SvxProtectItem& >(GetItemSet().Get(RES_PROTECT)) ); SvxProtectItem aProt ( static_cast<const SvxProtectItem& >(GetItemSet().Get(RES_PROTECT)) );
aProt.SetContentProtect( pProtectContentCB->IsChecked() ); aProt.SetContentProtect( m_pProtectContentCB->IsChecked() );
aProt.SetSizeProtect ( pProtectSizeCB->IsChecked() ); aProt.SetSizeProtect ( m_pProtectSizeCB->IsChecked() );
aProt.SetPosProtect ( pProtectFrameCB->IsChecked() ); aProt.SetPosProtect ( m_pProtectFrameCB->IsChecked() );
if ( nullptr == (pOldItem = GetOldItem(*rSet, FN_SET_PROTECT)) || if ( nullptr == (pOldItem = GetOldItem(*rSet, FN_SET_PROTECT)) ||
aProt != *pOldItem ) aProt != *pOldItem )
bRet |= nullptr != rSet->Put( aProt); bRet |= nullptr != rSet->Put( aProt);
if ( pEditInReadonlyCB->IsValueChangedFromSaved() ) if ( m_pEditInReadonlyCB->IsValueChangedFromSaved() )
bRet |= nullptr != rSet->Put( SwFormatEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); bRet |= nullptr != rSet->Put( SwFormatEditInReadonly( RES_EDIT_IN_READONLY, m_pEditInReadonlyCB->IsChecked()));
if ( pPrintFrameCB->IsValueChangedFromSaved() ) if ( m_pPrintFrameCB->IsValueChangedFromSaved() )
bRet |= nullptr != rSet->Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); bRet |= nullptr != rSet->Put( SvxPrintItem( RES_PRINT, m_pPrintFrameCB->IsChecked()));
// textflow // textflow
if( pTextFlowLB->IsVisible() ) if( m_pTextFlowLB->IsVisible() )
{ {
sal_Int32 nPos = pTextFlowLB->GetSelectEntryPos(); sal_Int32 nPos = m_pTextFlowLB->GetSelectEntryPos();
if( pTextFlowLB->IsValueChangedFromSaved() ) if( m_pTextFlowLB->IsValueChangedFromSaved() )
{ {
sal_uInt16 nData = (sal_uInt16)reinterpret_cast<sal_IntPtr>(pTextFlowLB->GetEntryData( nPos )); sal_uInt16 nData = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTextFlowLB->GetEntryData( nPos ));
bRet |= nullptr != rSet->Put( SvxFrameDirectionItem( bRet |= nullptr != rSet->Put( SvxFrameDirectionItem(
(SvxFrameDirection)nData, RES_FRAMEDIR )); (SvxFrameDirection)nData, RES_FRAMEDIR ));
} }
} }
if(pWrtSh) if(m_pWrtSh)
{ {
const SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat(); const SwFrameFormat* pFormat = m_pWrtSh->GetFlyFrameFormat();
if (pFormat) if (pFormat)
{ {
OUString sCurrentPrevChain, sCurrentNextChain; OUString sCurrentPrevChain, sCurrentNextChain;
if(pPrevLB->GetSelectEntryPos()) if(m_pPrevLB->GetSelectEntryPos())
sCurrentPrevChain = pPrevLB->GetSelectEntry(); sCurrentPrevChain = m_pPrevLB->GetSelectEntry();
if(pNextLB->GetSelectEntryPos()) if(m_pNextLB->GetSelectEntryPos())
sCurrentNextChain = pNextLB->GetSelectEntry(); sCurrentNextChain = m_pNextLB->GetSelectEntry();
const SwFormatChain &rChain = pFormat->GetChain(); const SwFormatChain &rChain = pFormat->GetChain();
const SwFlyFrameFormat* pFlyFormat; const SwFlyFrameFormat* pFlyFormat;
OUString sNextChain, sPrevChain; OUString sNextChain, sPrevChain;
...@@ -3193,32 +3193,32 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet) ...@@ -3193,32 +3193,32 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
IMPL_LINK_NOARG_TYPED(SwFrmAddPage, EditModifyHdl, Edit&, void) IMPL_LINK_NOARG_TYPED(SwFrmAddPage, EditModifyHdl, Edit&, void)
{ {
bool bEnable = !pNameED->GetText().isEmpty(); bool bEnable = !m_pNameED->GetText().isEmpty();
pAltNameED->Enable(bEnable); m_pAltNameED->Enable(bEnable);
pAltNameFT->Enable(bEnable); m_pAltNameFT->Enable(bEnable);
} }
void SwFrmAddPage::SetFormatUsed(bool bFormatUsed) void SwFrmAddPage::SetFormatUsed(bool bFormatUsed)
{ {
bFormat = bFormatUsed; m_bFormat = bFormatUsed;
if (bFormat) if (m_bFormat)
{ {
pNameFrame->Hide(); m_pNameFrame->Hide();
} }
} }
IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void) IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void)
{ {
OUString sCurrentPrevChain, sCurrentNextChain; OUString sCurrentPrevChain, sCurrentNextChain;
if(pPrevLB->GetSelectEntryPos()) if(m_pPrevLB->GetSelectEntryPos())
sCurrentPrevChain = pPrevLB->GetSelectEntry(); sCurrentPrevChain = m_pPrevLB->GetSelectEntry();
if(pNextLB->GetSelectEntryPos()) if(m_pNextLB->GetSelectEntryPos())
sCurrentNextChain = pNextLB->GetSelectEntry(); sCurrentNextChain = m_pNextLB->GetSelectEntry();
SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat(); SwFrameFormat* pFormat = m_pWrtSh->GetFlyFrameFormat();
if (pFormat) if (pFormat)
{ {
bool bNextBox = pNextLB == &rBox; bool bNextBox = m_pNextLB == &rBox;
ListBox& rChangeLB = bNextBox ? *pPrevLB : *pNextLB; ListBox& rChangeLB = bNextBox ? *m_pPrevLB : *m_pNextLB;
for(sal_Int32 nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) for(sal_Int32 nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--)
rChangeLB.RemoveEntry(nEntry - 1); rChangeLB.RemoveEntry(nEntry - 1);
//determine chainable frames //determine chainable frames
...@@ -3226,7 +3226,7 @@ IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void) ...@@ -3226,7 +3226,7 @@ IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void)
::std::vector< OUString > aThisPageFrames; ::std::vector< OUString > aThisPageFrames;
::std::vector< OUString > aNextPageFrames; ::std::vector< OUString > aNextPageFrames;
::std::vector< OUString > aRemainFrames; ::std::vector< OUString > aRemainFrames;
pWrtSh->GetConnectableFrameFormats(*pFormat, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, m_pWrtSh->GetConnectableFrameFormats(*pFormat, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox,
aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
lcl_InsertVectors(rChangeLB, lcl_InsertVectors(rChangeLB,
aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
......
...@@ -273,36 +273,36 @@ public: ...@@ -273,36 +273,36 @@ public:
class SwFrmAddPage : public SfxTabPage class SwFrmAddPage : public SfxTabPage
{ {
VclPtr<VclContainer> pNameFrame; VclPtr<VclContainer> m_pNameFrame;
VclPtr<FixedText> pNameFT; VclPtr<FixedText> m_pNameFT;
VclPtr<Edit> pNameED; VclPtr<Edit> m_pNameED;
VclPtr<FixedText> pAltNameFT; VclPtr<FixedText> m_pAltNameFT;
VclPtr<Edit> pAltNameED; VclPtr<Edit> m_pAltNameED;
VclPtr<FixedText> pPrevFT; VclPtr<FixedText> m_pPrevFT;
VclPtr<ListBox> pPrevLB; VclPtr<ListBox> m_pPrevLB;
VclPtr<FixedText> pNextFT; VclPtr<FixedText> m_pNextFT;
VclPtr<ListBox> pNextLB; VclPtr<ListBox> m_pNextLB;
VclPtr<VclContainer> pProtectFrame; VclPtr<VclContainer> m_pProtectFrame;
VclPtr<CheckBox> pProtectContentCB; VclPtr<CheckBox> m_pProtectContentCB;
VclPtr<CheckBox> pProtectFrameCB; VclPtr<CheckBox> m_pProtectFrameCB;
VclPtr<CheckBox> pProtectSizeCB; VclPtr<CheckBox> m_pProtectSizeCB;
VclPtr<VclContainer> m_pContentAlignFrame; VclPtr<VclContainer> m_pContentAlignFrame;
VclPtr<ListBox> m_pVertAlignLB; VclPtr<ListBox> m_pVertAlignLB;
VclPtr<VclContainer> pPropertiesFrame; VclPtr<VclContainer> m_pPropertiesFrame;
VclPtr<CheckBox> pEditInReadonlyCB; VclPtr<CheckBox> m_pEditInReadonlyCB;
VclPtr<CheckBox> pPrintFrameCB; VclPtr<CheckBox> m_pPrintFrameCB;
VclPtr<FixedText> pTextFlowFT; VclPtr<FixedText> m_pTextFlowFT;
VclPtr<ListBox> pTextFlowLB; VclPtr<ListBox> m_pTextFlowLB;
SwWrtShell* pWrtSh; SwWrtShell* m_pWrtSh;
OUString sDlgType; OUString m_sDlgType;
bool bHtmlMode; bool m_bHtmlMode;
bool bFormat; bool m_bFormat;
bool bNew; bool m_bNew;
DECL_LINK_TYPED(EditModifyHdl, Edit&, void); DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
DECL_LINK_TYPED(ChainModifyHdl, ListBox&, void); DECL_LINK_TYPED(ChainModifyHdl, ListBox&, void);
...@@ -321,9 +321,9 @@ public: ...@@ -321,9 +321,9 @@ public:
virtual void Reset(const SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override;
void SetFormatUsed(bool bFormat); void SetFormatUsed(bool bFormat);
void SetFrmType(const OUString &rType) { sDlgType = rType; } void SetFrmType(const OUString &rType) { m_sDlgType = rType; }
void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; }
void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment