diff options
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/AccessibleShape.hxx | 2 | ||||
-rw-r--r-- | include/svx/AccessibleShapeTreeInfo.hxx | 8 | ||||
-rw-r--r-- | include/svx/charmap.hxx | 2 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/nbdtmg.hxx | 2 | ||||
-rw-r--r-- | include/svx/obj3d.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdasitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdr/contact/objectcontact.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdrpaintwindow.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdobj.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdpage.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdpagv.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdpntv.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdview.hxx | 2 | ||||
-rw-r--r-- | include/svx/xbtmpit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflhtit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xlndsit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xlnedit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xlnstit.hxx | 2 | ||||
-rw-r--r-- | include/svx/zoomslideritem.hxx | 2 |
22 files changed, 30 insertions, 29 deletions
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index cc1aa035ac8a..ab79abb3eaba 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -385,7 +385,7 @@ public: //===== Misc ======================================================== ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - GetXShape(); + GetXShape() { return( mxShape );} /** set the index _nIndex at the accessible shape @param _nIndex diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index 0527caf7022d..d56663384819 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -74,7 +74,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent> - GetDocumentWindow (void) const; + GetDocumentWindow (void) const { return mxDocumentWindow;} /** Deprecated. Use the correctly named SetModelBroadcaster method instead. @@ -86,7 +86,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetControllerBroadcaster (void) const; + GetControllerBroadcaster (void) const { return mxModelBroadcaster;} /** Set a new broadcaster that sends events indicating shape changes. The broadcaster usually is or belongs to a document model. @@ -104,7 +104,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetModelBroadcaster (void) const; + GetModelBroadcaster (void) const { return mxModelBroadcaster;} /** Set the view that will be used to construct SvxTextEditSources which in turn are used to create accessible edit engines. @@ -135,7 +135,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> - GetController (void) const; + GetController (void) const { return mxController;} /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 0b62071789bb..53d78124c30a 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -72,7 +72,7 @@ public: sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; - ScrollBar* getScrollBar(); + ScrollBar* getScrollBar() { return &aVscrollSB;} void ReleaseAccessible(); sal_Int32 getMaxCharCount() const; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 0580d7164647..4e007dfe9da0 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -114,7 +114,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; void Reset(); - RECT_POINT GetActualRP() const; + RECT_POINT GetActualRP() const { return eRP;} void SetActualRP( RECT_POINT eNewRP ); void SetState( CTL_STATE nState ); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index d32b8efd47cf..79d257360ad0 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -230,7 +230,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase // store the attributes passed from pSet void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: - OUString GetBulCharFmtName(); + OUString GetBulCharFmtName() { return aNumCharFmtName;} SfxMapUnit GetMapUnit() { return eCoreUnit;} protected: bool bIsLoading; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 259f4f4dbda5..24b0c9cf74e4 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -170,7 +170,7 @@ public: const basegfx::B3DHomMatrix& GetFullTransform() const; // get and (re)set transformation matrix - const basegfx::B3DHomMatrix& GetTransform() const; + const basegfx::B3DHomMatrix& GetTransform() const { return maTransformation;} virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix); virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 3fd8bd3cb4f6..101b461380ab 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -92,7 +92,7 @@ private: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; + const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const { return aPropSeq;} com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ); com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index b94e5a97d3be..89c3bb24eb7a 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -139,7 +139,7 @@ namespace sdr virtual bool AreGluePointsVisible() const; // method to get the primitiveAnimator - sdr::animation::primitiveAnimator& getPrimitiveAnimator(); + sdr::animation::primitiveAnimator& getPrimitiveAnimator() { return maPrimitiveAnimator; } // method to get the EventHandler. It will // return a existing one or create a new one using CreateEventHandler(). diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 9e507ad1be86..abdbcc016d72 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -136,7 +136,7 @@ public: SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; } // RedrawRegion - const Region& GetRedrawRegion() const; + const Region& GetRedrawRegion() const { return maRedrawRegion;} void SetRedrawRegion(const Region& rNew); // #i72889# read/write access to TempoparyTarget diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a97bf5d8934b..350ad963deba 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/weakref.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <rtl/ustring.hxx> #include <sot/storage.hxx> #include <tools/link.hxx> @@ -623,7 +624,7 @@ public: void setLock( bool bLock ); void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;} void SetCharCompressType( sal_uInt16 nType ); sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 84ebec038420..82ee2fbf6768 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -900,7 +900,7 @@ public: void SetResizeProtect(bool bProt); bool IsResizeProtect() const { return bSizProt;} void SetPrintable(bool bPrn); - bool IsPrintable() const; + bool IsPrintable() const { return !bNoPrint;} void SetVisible(bool bVisible); bool IsVisible() const { return mbVisible;} void SetEmptyPresObj(bool bEpt); @@ -984,7 +984,7 @@ public: // the following methods are used to control it; // usually this data makes no sense after the import is finished, since the object // might be resized - Rectangle GetBLIPSizeRectangle() const; + Rectangle GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} void SetBLIPSizeRectangle( const Rectangle& aRect ); /// @see mbDoNotInsertIntoPageAutomatically diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 6a529c26c0e7..e60060968fae 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -142,8 +142,8 @@ public: void ReleaseGraphicLink(); bool IsLinkedGraphic() const; - const OUString& GetFileName() const; - const OUString& GetFilterName() const; + const OUString& GetFileName() const { return aFileName;} + const OUString& GetFilterName() const { return aFilterName;} void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 9dc74bbb7bdb..a3c4f78086a7 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -396,7 +396,7 @@ public: virtual bool isUsedByModel() const SAL_OVERRIDE; // data read/write - const SfxItemSet& GetItemSet() const; + const SfxItemSet& GetItemSet() const { return *mpProperties;} void PutItemSet(const SfxItemSet& rSet); void PutItem(const SfxPoolItem& rItem); void ClearItem(const sal_uInt16 nWhich = 0); diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 0785eded905b..2450e409617e 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -255,11 +255,11 @@ public: void SetApplicationBackgroundColor(Color aBackgroundColor); // #109585# - Color GetApplicationBackgroundColor() const; + Color GetApplicationBackgroundColor() const { return maBackgroundColor;} // #103911# Set/Get document color for svx at SdrPageViews void SetApplicationDocumentColor(Color aDocumentColor); - Color GetApplicationDocumentColor() const; + Color GetApplicationDocumentColor() const { return maDocumentColor;} }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 645c35383a41..061e983b7e46 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -405,7 +405,7 @@ public: bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht - Color GetGridColor() const; + Color GetGridColor() const { return maGridColor;} void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); } void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); } void SetBordVisible(bool bOn = true) { bBordVisible=bOn; InvalidateAllWin(); } @@ -532,7 +532,7 @@ public: bool IsPrintPreview() const { return bPrintPreview; } void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; } - const svtools::ColorConfig& getColorConfig() const; + const svtools::ColorConfig& getColorConfig() const { return maColorConfig;} virtual void onChangeColorConfig(); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index a237bc23f8cb..81debfd248df 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -247,7 +247,7 @@ public: // und mehr... OUString GetStatusText(); - SvtAccessibilityOptions& getAccessibilityOptions(); + SvtAccessibilityOptions& getAccessibilityOptions() { return maAccessibilityOptions;} virtual void onAccessibilityOptionsChanged(); }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index a5ebc6d62a9e..686d3b6361ef 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -63,7 +63,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - const GraphicObject& GetGraphicObject() const; + const GraphicObject& GetGraphicObject() const { return maGraphicObject;} void SetGraphicObject(const GraphicObject& rGraphicObject); static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 364292f66e89..a37ac54b0883 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -55,7 +55,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - const XHatch& GetHatchValue() const; // GetValue -> GetHatchValue + const XHatch& GetHatchValue() const { return aHatch;} // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index e58159932117..9c31904671e3 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -57,7 +57,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - const XDash& GetDashValue() const; + const XDash& GetDashValue() const { return aDash;} void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index edd77763abab..175f02380b82 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -54,7 +54,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - basegfx::B2DPolyPolygon GetLineEndValue() const; + basegfx::B2DPolyPolygon GetLineEndValue() const { return maPolyPolygon;} void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } XLineEndItem* checkForUniqueItem( SdrModel* pModel ) const; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index bb0c66720d31..1d3b525e993c 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -54,7 +54,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - basegfx::B2DPolyPolygon GetLineStartValue() const; + basegfx::B2DPolyPolygon GetLineStartValue() const { return maPolyPolygon;} void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } XLineStartItem* checkForUniqueItem( SdrModel* pModel ) const; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 0cb37424ef19..45c32b60bb34 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -40,7 +40,7 @@ public: virtual ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); - const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const; + const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} sal_uInt16 GetMinZoom() const {return mnMinZoom;} sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} |