diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/uibase/shells/drawsh.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/uibase/shells/drawsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/drawsh.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 80cb4c4b1c49..28c8d9691452 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -369,9 +369,9 @@ void SwDrawShell::Execute(SfxRequest &rReq) { if (SdrObject* pObj = IsSingleFillableNonOLESelected()) { - SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj); - if (pFrmFmt) - SwTextBoxHelper::create(pFrmFmt); + SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj); + if (pFrameFormat) + SwTextBoxHelper::create(pFrameFormat); } break; } @@ -379,9 +379,9 @@ void SwDrawShell::Execute(SfxRequest &rReq) { if (SdrObject* pObj = IsSingleFillableNonOLESelected()) { - SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj); - if (pFrmFmt) - SwTextBoxHelper::destroy(pFrmFmt); + SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj); + if (pFrameFormat) + SwTextBoxHelper::destroy(pFrameFormat); } break; } @@ -495,9 +495,9 @@ void SwDrawShell::GetState(SfxItemSet& rSet) bool bDisable = true; if (SdrObject* pObj = IsSingleFillableNonOLESelected()) { - SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj); + SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj); // Allow creating a TextBox only in case this is a draw format without a TextBox so far. - if (pFrmFmt && pFrmFmt->Which() == RES_DRAWFRMFMT && !SwTextBoxHelper::findTextBox(pFrmFmt)) + if (pFrameFormat && pFrameFormat->Which() == RES_DRAWFRMFMT && !SwTextBoxHelper::findTextBox(pFrameFormat)) { if (SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj)) { @@ -518,9 +518,9 @@ void SwDrawShell::GetState(SfxItemSet& rSet) bool bDisable = true; if (SdrObject* pObj = IsSingleFillableNonOLESelected()) { - SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj); + SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj); // Allow removing a TextBox only in case it has one. - if (pFrmFmt && SwTextBoxHelper::findTextBox(pFrmFmt)) + if (pFrameFormat && SwTextBoxHelper::findTextBox(pFrameFormat)) bDisable = false; } |