diff options
| -rw-r--r-- | sw/inc/ndgrf.hxx | 18 | ||||
| -rw-r--r-- | sw/inc/ndole.hxx | 9 |
2 files changed, 8 insertions, 19 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index e970615e9fe8..ca2367ad9e2c 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _NDGRF_HXX -#define _NDGRF_HXX +#ifndef NDGRF_HXX +#define NDGRF_HXX #include <sfx2/lnkbase.hxx> #include <svtools/grfmgr.hxx> #include <ndnotxt.hxx> @@ -147,7 +147,6 @@ public: void onGraphicChanged(); virtual Size GetTwipSize() const; -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED void SetTwipSize( const Size& rSz ); sal_Bool IsTransparent() const; @@ -166,10 +165,9 @@ public: inline sal_Bool IsScaleImageMap() const { return bScaleImageMap; } inline void SetScaleImageMap( sal_Bool b ) { bScaleImageMap = b; } -#endif - /// in ndcopy.cxx + + /// in ndcopy.cxx virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED /** Re-read in case graphic was not OK. The current one gets replaced by the new one. */ @@ -186,14 +184,11 @@ public: void SetNewStreamName( const String& r ) { aNewStrmName = r; } /// Is this node selected by any shell? sal_Bool IsSelected() const; -#endif /// Communicate to graphic that node is in Undo-range. virtual sal_Bool SavePersistentData(); virtual sal_Bool RestorePersistentData(); -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED - /// Query link-data. bool IsGrfLink() const { return refLink.Is(); } inline bool IsLinkedFile() const; @@ -209,7 +204,6 @@ public: /// Returns the with our graphic attributes filled Graphic-Attr-Structure. GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; -#endif boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer(); bool IsLinkedInputStreamReady() const; void TriggerAsyncRetrieveInputStream(); @@ -226,21 +220,21 @@ inline SwGrfNode *SwNode::GetGrfNode() { return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0; } + inline const SwGrfNode *SwNode::GetGrfNode() const { return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0; } -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED inline bool SwGrfNode::IsLinkedFile() const { return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); } + inline bool SwGrfNode::IsLinkedDDE() const { return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); } -#endif #endif diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 9596d4ba7d81..3a80cea9c51f 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _NDOLE_HXX -#define _NDOLE_HXX +#ifndef NDOLE_HXX +#define NDOLE_HXX #include <ndnotxt.hxx> @@ -58,12 +58,10 @@ public: String GetDescription(); -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef(); svt::EmbeddedObjectRef& GetObject(); const String& GetCurrentPersistName() const { return aName; } sal_Bool IsOleRef() const; ///< To avoid unneccessary loading of object. -#endif }; @@ -139,11 +137,8 @@ public: // #i99665# bool IsChart() const; - -#ifndef _FESHVIEW_ONLY_INLINE_NEEDED const String& GetChartTblName() const { return sChartTblName; } void SetChartTblName( const String& rNm ) { sChartTblName = rNm; } -#endif }; |