diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 10:08:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 10:08:01 +0000 |
| commit | 1e6b5d784f61896807ec9d36b09a06c69c5de118 (patch) | |
| tree | b38068bf4d0772a61edf019af63bd12fc39d405f /sw/inc/ndarr.hxx | |
| parent | INTEGRATION: CWS opofxmlstorage (1.120.20); FILE MERGED (diff) | |
| download | core-1e6b5d784f61896807ec9d36b09a06c69c5de118.tar.gz core-1e6b5d784f61896807ec9d36b09a06c69c5de118.zip | |
INTEGRATION: CWS opofxmlstorage (1.12.282); FILE MERGED
2006/09/08 13:29:25 mav 1.12.282.2: RESYNC: (1.12-1.13); FILE MERGED
2006/09/05 09:11:03 mav 1.12.282.1: #122878# import/export iconified object into MS-format
Diffstat (limited to 'sw/inc/ndarr.hxx')
| -rw-r--r-- | sw/inc/ndarr.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index d5a58bc417d0..d99d59b608b1 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ndarr.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2006-08-14 15:26:45 $ + * last change: $Author: obo $ $Date: 2006-10-13 11:08:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,7 +55,7 @@ class Graphic; class GraphicObject; -class UniString; +class String; class SwAttrSet; class SwCntntNode; class SwDoc; @@ -237,8 +237,8 @@ public: SwAttrSet* pAutoAttr = 0 ); SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, - const UniString& rGrfName, - const UniString& rFltName, + const String& rGrfName, + const String& rFltName, const Graphic* pGraphic, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0, @@ -254,9 +254,10 @@ public: SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0 ); // in ndole.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, - const UniString &rName, + const String &rName, + sal_Int64 nAspect, SwGrfFmtColl *pColl, - SwAttrSet* pAutoAttr = 0 ); // in ndole.cxx + SwAttrSet* pAutoAttr ); // in ndole.cxx // Array aller GliederiungsNodes; const SwOutlineNodes& GetOutLineNds() const; |