diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:06:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:06:01 +0000 |
| commit | 20eb43f78a9d16c1da04bbdf75f35c6eda3cef6b (patch) | |
| tree | 88bf035e9ebcb5b0a3ae08932b26232efdf59f5e /sw/inc/ndole.hxx | |
| parent | 3fa103c95a15a970c7bd1c548ba0fe3f8543d85f (diff) | |
INTEGRATION: CWS swusing (1.16.38); FILE MERGED
2007/10/10 14:14:49 tl 1.16.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/inc/ndole.hxx')
| -rw-r--r-- | sw/inc/ndole.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index af0aa2b29625..17e20f5450f2 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ndole.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2007-09-27 08:06:45 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:06:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,6 +116,8 @@ class SwOLENode: public SwNoTxtNode // aOLEObj besitzt einen privaten Copy-CTOR, wir brauchen auch einen: SwOLENode( const SwOLENode & ); + using SwNoTxtNode::GetGraphic; + public: const SwOLEObj& GetOLEObj() const { return aOLEObj; } SwOLEObj& GetOLEObj() { return aOLEObj; } @@ -127,7 +129,6 @@ public: virtual Size GetTwipSize() const; - using SwNoTxtNode::GetGraphic; Graphic* GetGraphic(); Graphic* GetHCGraphic(); // tries to retrieve HighContrast representation if possible |