summaryrefslogtreecommitdiff
path: root/sw/inc/ndnotxt.hxx
diff options
context:
space:
mode:
authorRobinson Tryon <qubit@runcibility.com>2015-11-25 06:03:10 -0500
committerRobinson Tryon <qubit@runcibility.com>2015-11-25 06:07:38 -0500
commit49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch)
tree045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/inc/ndnotxt.hxx
parent5470a365f25e5052b4dd74f76aa2196f0d70934b (diff)
bin/rename-sw-abbreviations.sh libreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/inc/ndnotxt.hxx')
-rw-r--r--sw/inc/ndnotxt.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 3c6b23439704..4a4e3c492672 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -28,7 +28,7 @@ namespace tools { class PolyPolygon; }
class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
{
friend class SwNodes;
- friend class SwNoTextFrm;
+ friend class SwNoTextFrame;
tools::PolyPolygon *pContour;
bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -51,7 +51,7 @@ protected:
public:
virtual ~SwNoTextNode();
- virtual SwContentFrm *MakeFrm( SwFrm* ) override;
+ virtual SwContentFrame *MakeFrame( SwFrame* ) override;
inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }