diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:07:47 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:07:47 +0000 |
commit | 7812fee3000583c9dd5ab8bbb4b0ae6bc9b27b9e (patch) | |
tree | 2d5979331caabc4369e1e0e082e3ca82b44fc20d /sw/inc/swtable.hxx | |
parent | 5a2f386789157cda6768e7cb11e455a61dae42b5 (diff) |
INTEGRATION: CWS swusing (1.23.38); FILE MERGED
2007/10/10 14:14:49 tl 1.23.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/inc/swtable.hxx')
-rw-r--r-- | sw/inc/swtable.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index c499d0f12b6c..7274245fa28e 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -4,9 +4,9 @@ * * $RCSfile: swtable.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2007-09-27 08:12:16 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:07:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,6 +105,8 @@ typedef SwTableLine* SwTableLinePtr; class SwTable: public SwClient //Client vom FrmFmt { + using SwClient::IsModifyLocked; + protected: SwTableLines aLines; SwTableSortBoxes aSortCntBoxes; @@ -131,7 +133,6 @@ protected: bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change #endif - using SwClient::IsModifyLocked; BOOL IsModifyLocked(){ return bModifyLocked;} public: |