strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS opofxmlstorage (1.13.106); FILE MERGED

Browse source 
2006/09/08 13:30:07 mav 1.13.106.3: RESYNC: (1.13-1.14); FILE MERGED
2006/09/05 09:11:03 mav 1.13.106.2: #122878# import/export iconified object into MS-format
2006/08/16 15:57:38 mav 1.13.106.1: #i68684# support iconified objects
This commit is contained in:
Oliver Bolte 2006-10-13 10:08:14 +00:00
parent 1e6b5d784f
commit aaa136305a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sw/inc/ndole.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: ndole.hxx,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: hr $ $Date: 2006-08-14 15:27:39 $
* last change: $Author: obo $ $Date: 2006-10-13 11:08:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -66,7 +66,7 @@ class SwOLEObj
public:
SwOLEObj( const svt::EmbeddedObjectRef& pObj );
SwOLEObj( const String &rName );
SwOLEObj( const String &rName, sal_Int64 nAspect );
~SwOLEObj();
BOOL UnloadObject();
@ -94,7 +94,6 @@ class SwOLENode: public SwNoTxtNode
friend class SwNodes;
mutable SwOLEObj aOLEObj;
Graphic* pGraphic;
sal_Int64 nViewAspect;
String sChartTblName; // bei Chart Objecten: Name der ref. Tabelle
BOOL bOLESizeInvalid; //Soll beim SwDoc::PrtOLENotify beruecksichtig
//werden (zum Beispiel kopiert). Ist nicht
@ -110,6 +109,7 @@ class SwOLENode: public SwNoTxtNode
SwOLENode( const SwNodeIndex &rWhere,
const String &rName,
sal_Int64 nAspect,
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
@ -139,7 +139,8 @@ public:
BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; }
void SetOLESizeInvalid( BOOL b ){ bOLESizeInvalid = b; }
sal_Int64 GetAspect() const { return nViewAspect; }
sal_Int64 GetAspect() const { return aOLEObj.GetObject().GetViewAspect(); }
void SetAspect( sal_Int64 nAspect) { aOLEObj.GetObject().SetViewAspect( nAspect ); }
// OLE-Object aus dem "Speicher" entfernen
// inline void Unload() { aOLEObj.Unload(); }