diff options
Diffstat (limited to 'include')
33 files changed, 4 insertions, 232 deletions
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 7eecd2741f8e..635ebf4c2448 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -116,10 +116,6 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date toDate(sal_Int32 _nVal); OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Time toTime(sal_Int64 _nVal); - /** convert a double which is a date value relative to a given fixed date into a date value relative - to the standard db null date. - */ - inline double toStandardDbDate(const ::com::sun::star::util::Date& _rNullDate, double _rVal) { return _rVal + toDays(_rNullDate); } /** convert a double which is a date value relative to the standard db null date into a date value relative to a given fixed date. */ diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index e1460512d11e..e9b26dd33a27 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -287,15 +287,6 @@ namespace accessibility Argument maArg; }; - /** Generic algorithm on given paragraphs - - Convenience method, that already adapts the given functor with WeakChildAdapter - */ - template < typename Functor > void ForEach( Functor& rFunctor ) - { - ::std::for_each( begin(), end(), WeakChildAdapter< Functor >(rFunctor) ); - } - private: /// Set state on given child void SetState( sal_Int32 nChild, const sal_Int16 nStateId ); diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index 3ec7c39d57a2..fa5c771c7b88 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -98,14 +98,6 @@ namespace o3tl EditStatusFlags::CRSRLEFTPARA at the time cursor movement and the enter. */ -inline void SetFlags( EEControlBits& rBits, EEControlBits nMask, bool bOn ) -{ - if ( bOn ) - rBits |= nMask; - else - rBits &= ~nMask; -} - inline void SetFlags( EVControlBits& rBits, EVControlBits nMask, bool bOn ) { if ( bOn ) diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 54a518e97c05..f92f72cb3e5e 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -42,13 +42,6 @@ EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); -inline OUString GetBoolString(bool bVal) -{ - return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE); -} - - - inline long Scale( long nVal, long nMult, long nDiv ) { BigInt aVal( nVal ); diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx index faa77f876dc1..2d263fc3dbaa 100644 --- a/include/editeng/overflowingtxt.hxx +++ b/include/editeng/overflowingtxt.hxx @@ -116,14 +116,10 @@ public: OutlinerParaObject *InsertOverflowingText(Outliner *, OutlinerParaObject *); OutlinerParaObject *RemoveOverflowingText(Outliner *); - static ESelection GetInsertionPointSel(); ESelection GetOverflowPointSel() const; bool IsLastParaInterrupted() const; -protected: - void impSetOutlinerToEmptyTxt(Outliner *); - private: NonOverflowingText *mpNonOverflowingTxt; OverflowingText *mpOverflowingTxt; diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 9ab24396ba2e..0d855889a6d5 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -61,15 +61,6 @@ enum TextCategory sym //Symbol }; -/** Categorize codepoints according to how MS seems to do it. - - It's been bugging me for ages as to what codepoint MS considers in - what category. Tom Jebo has a post suggesting the criteria used here - and indicating its been submitting to the standards working group - as a proposed resolution. -*/ -MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag); - #define OOXML_COLOR_AUTO 0x0a /** diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 3310f91aa77a..386e04d0053e 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -144,7 +144,6 @@ LNG_DLLPUBLIC bool HasDigits( const OUString &rText ); LNG_DLLPUBLIC bool IsNumeric( const OUString &rText ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName ); LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > GetLinguProperties(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index 86bfb79fa2d3..c1602af7c25b 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -154,9 +154,6 @@ public: static bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); }; -bool sha1( std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); -bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); - } // namespace core } // namespace oox diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 0d01fc4d19b1..5dc25fb8c1d1 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -83,8 +83,6 @@ public: ~ModelMap() {} ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); } - template< typename Param1Type > - ModelType& create( KeyType eKey, const Param1Type& rParam1 ) { return insert( eKey, new ModelType( rParam1 ) ); } private: ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 423af9c77ab4..36edfe351e38 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -116,21 +116,6 @@ public: template< typename Type > sal_Int32 readArray( Type* opnArray, sal_Int32 nElemCount ); - /** Reads a sequence of values from the stream. - - The sequence will be reallocated internally. Converts all values in the - array to platform byte order. All data types supported by the - ByteOrderConverter class can be used. - - @param nElemCount - Number of elements to put into the sequence (NOT byte count). - - @return - Number of sequence elements really read (NOT byte count). - */ - template< typename Type > - sal_Int32 readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount ); - /** Reads a vector of values from the stream. The vector will be resized internally. Converts all values in the @@ -146,16 +131,6 @@ public: template< typename Type > sal_Int32 readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount ); - /** Skips an array of values of a certain type in the stream. - - All data types supported by the ByteOrderConverter class can be used. - - @param nElemCount - Number of array elements to skip (NOT byte count). - */ - template< typename Type > - void skipArray( sal_Int32 nElemCount ); - /** Reads a NUL-terminated Unicode character array and returns the string. */ OUString readNulUnicodeArray(); @@ -253,26 +228,12 @@ sal_Int32 BinaryInputStream::readArray( Type* opnArray, sal_Int32 nElemCount ) } template< typename Type > -sal_Int32 BinaryInputStream::readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount ) -{ - orSequence.reallocate( nElemCount ); - return orSequence.hasElements() ? readArray( orSequence.getArray(), nElemCount ) : 0; -} - -template< typename Type > sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount ) { orVector.resize( static_cast< size_t >( nElemCount ) ); return orVector.empty() ? 0 : readArray( &orVector.front(), nElemCount ); } -template< typename Type > -void BinaryInputStream::skipArray( sal_Int32 nElemCount ) -{ - sal_Int32 nSkipSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type ); - skip( nSkipSize, sizeof( Type ) ); -} - /** Wraps a UNO input stream and provides convenient access functions. diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 1fc980409e99..971ce01b0d8b 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -48,11 +48,6 @@ public: virtual ~StylePreviewRenderer() {} - void setRenderText(OUString& rRenderText) - { - msRenderText = rRenderText; - } - virtual bool recalculate() = 0; virtual Size getRenderSize() = 0; virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 5c5efee18e8d..f1dd6a72c99c 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -292,8 +292,6 @@ protected: SFX2_DLLPRIVATE bool ImplHasAccessibleListeners(); DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); - DECL_LINK(OnItemSelected, ThumbnailViewItem*); - protected: ThumbnailValueItemList mItemList; diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx index 3cdf343dacfc..a0b97a2b0d00 100644 --- a/include/svl/urlbmk.hxx +++ b/include/svl/urlbmk.hxx @@ -35,11 +35,6 @@ class INetBookmark OUString aUrl; OUString aDescr; -protected: - - void SetURL( const OUString& rS ) { aUrl = rS; } - void SetDescription( const OUString& rS ) { aDescr = rS; } - public: INetBookmark( const OUString &rUrl, const OUString &rDescr ) : aUrl( rUrl ), aDescr( rDescr ) diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 15484c717cdc..828532c8faf0 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -42,16 +42,13 @@ public: bool GetIsAllowAnimatedGraphics() const; bool GetIsAllowAnimatedText() const; bool GetIsAutomaticFontColor() const; - sal_Int16 GetHelpTipSeconds() const; bool IsSelectionInReadonly() const; bool GetAutoDetectSystemHC() const; void SetIsForPagePreviews(bool bSet); - void SetIsHelpTipsDisappear(bool bSet); void SetIsAllowAnimatedGraphics(bool bSet); void SetIsAllowAnimatedText(bool bSet); void SetIsAutomaticFontColor(bool bSet); - void SetHelpTipSeconds(sal_Int16 nSet); void SetSelectionInReadonly(bool bSet); void SetAutoDetectSystemHC(bool bSet); diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 57f7725d6d8c..66dc7cb0fd78 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -48,44 +48,6 @@ public: then this function returns ENTRY_NOTFOUND */ virtual sal_Int32 getSelIndex() const = 0; - /** @return The item name of the entry with the given index - The index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual OUString getItemName( sal_Int32 index ) const = 0; - - /** @return The version string of the entry with the given index - The index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual OUString getItemVersion( sal_Int32 index ) const = 0; - - /** @return The description string of the entry with the given index - The index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual OUString getItemDescription( sal_Int32 index ) const = 0; - - /** @return The publisher string of the entry with the given index - The index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual OUString getItemPublisher( sal_Int32 index ) const = 0; - - /** @return The link behind the publisher text of the entry with the given index - The index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual OUString getItemPublisherLink( sal_Int32 index ) const = 0; - - /** The entry at the given position will be selected - Index starts with 0. - Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual void select( sal_Int32 index ) = 0; - - /** The first found entry with the given name will be selected - When there was no entry found with the name, the selection doesn't change. - Please note that there might be more than one entry with the same - name, because: - 1. the name is not unique - 2. one extension can be installed as user and shared extension. - */ - virtual void select( const OUString & sName ) = 0; }; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 6e4999a03c3a..c3e01ddb7df6 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -340,7 +340,6 @@ public: bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } bool HasSwapStreamHdl() const { return maSwapStreamHdl.IsSet(); } - void SetSwapStreamHdl(); void SetSwapStreamHdl(const Link<const GraphicObject*, SvStream*>& rHdl); void FireSwapInRequest(); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 3cf051924821..5da0c1cd7581 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -344,7 +344,6 @@ public: inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } inline void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } inline void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } - inline void SetDoubleClickHdl( const Link<HeaderBar*,void>& rLink ) { maDoubleClickHdl = rLink; } inline void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } inline bool IsDragable() const { return mbDragable; } diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 4dc2485b854a..3239ac7311ee 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -54,8 +54,7 @@ public: bool IsImportUnknown() const; void SetImportUnknown(bool bSet); - sal_uInt16 GetExportMode() const; - void SetExportMode(sal_uInt16 nSet); + sal_uInt16 GetExportMode() const; bool IsStarBasic() const; void SetStarBasic(bool bSet); diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index cad738c68d3e..25951f671638 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -130,9 +130,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer // combined with Application::GetSettings().GetStyleSettings().GetHighlightColor()) Color getHilightColor() const; - void SetTransparentSelection( bool bState ); - void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - private: /*-**************************************************************************************************** diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 57305c6a8d13..4f836601d05a 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -78,7 +78,6 @@ namespace vcl { class Window; } // displaying a database exception for the user // display info about a simple css::sdbc::SQLException void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL); -void displayException(const css::sdbc::SQLWarning&, vcl::Window* _pParent = NULL); SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL); void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL); void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index e64f1ce5e985..17fc58b791a1 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -173,10 +173,8 @@ private: bool operator==( const Style& rL, const Style& rR ); SVX_DLLPUBLIC bool operator<( const Style& rL, const Style& rR ); -inline bool operator!=( const Style& rL, const Style& rR ) { return !(rL == rR); } inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } -inline bool operator>=( const Style& rL, const Style& rR ) { return !(rL < rR); } @@ -219,24 +217,6 @@ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight ); /** Returns the angle between horizontal border of a rectangle and its diagonal. The returned values represents the inner angle between the diagonals and - horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The - passed rectangle positions may be unordered, they are adjusted internally. - */ -inline double GetHorDiagAngle( long nX1, long nX2, long nY1, long nY2 ) -{ return GetHorDiagAngle( nX2 - nX1, nY2 - nY1 ); } - -/** Returns the angle between horizontal border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and - horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The - passed rectangle edges may be unordered, they are adjusted internally. - */ -inline double GetHorDiagAngle( const Point& rP1, const Point& rP2 ) -{ return GetHorDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); } - -/** Returns the angle between horizontal border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and horizontal borders, and is therefore in the range [0,PI/2] (inclusive). */ inline double GetHorDiagAngle( const Rectangle& rRect ) @@ -256,24 +236,6 @@ inline double GetVerDiagAngle( long nWidth, long nHeight ) /** Returns the angle between vertical border of a rectangle and its diagonal. The returned values represents the inner angle between the diagonals and - vertical borders, and is therefore in the range [0,PI/2] (inclusive). The - passed rectangle positions may be unordered, they are adjusted internally. - */ -inline double GetVerDiagAngle( long nX1, long nX2, long nY1, long nY2 ) -{ return GetVerDiagAngle( nX2 - nX1, nY2 - nY1 ); } - -/** Returns the angle between vertical border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and - vertical borders, and is therefore in the range [0,PI/2] (inclusive). The - passed rectangle edges may be unordered, they are adjusted internally. - */ -inline double GetVerDiagAngle( const Point& rP1, const Point& rP2 ) -{ return GetVerDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); } - -/** Returns the angle between vertical border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and vertical borders, and is therefore in the range [0,PI/2] (inclusive). */ inline double GetVerDiagAngle( const Rectangle& rRect ) diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 9da08188480a..3340f5e63127 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -66,10 +66,6 @@ public: { return mxRef; } - inline void SetValue( const rtl::Reference<reference_type> &xRef ) - { - mxRef = xRef; - } }; #endif diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 8bcb82f0a326..6379540c2dda 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -331,8 +331,7 @@ public: static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ); SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL) const; - TextChain *GetTextChain() const; - static void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext); + TextChain * GetTextChain() const; // ReferenceDevice for the EditEngine void SetRefDevice(OutputDevice* pDev); diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 651a61d69369..2552f678e67b 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -520,8 +520,6 @@ public: void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } - void SetToBeChained(bool bToBeChained); - /** Setup given Outliner equivalently to SdrTextObj::Paint() To setup an arbitrary Outliner in the same way as the draw diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 2f20a41e4478..a8f5d77d36d3 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -55,7 +55,6 @@ inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); } inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } -inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false); @@ -69,7 +68,6 @@ void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs); void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs); void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2); -void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false); diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx index 3e95bbc3c3b1..3d58e027aaa5 100644 --- a/include/svx/textchainflow.hxx +++ b/include/svx/textchainflow.hxx @@ -101,8 +101,6 @@ public: protected: virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) SAL_OVERRIDE; - virtual void impSetTextForEditingOutliner(OutlinerParaObject *); - virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) SAL_OVERRIDE; private: diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index e0526bbcdff9..286ed7424e6d 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -72,10 +72,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op @onerror No error should occur! *//*-*****************************************************************************************************/ - bool IsFontHistoryEnabled ( ) const; - void EnableFontHistory ( bool bState ); + bool IsFontHistoryEnabled ( ) const; - bool IsFontWYSIWYGEnabled ( ) const; + bool IsFontWYSIWYGEnabled ( ) const; void EnableFontWYSIWYG ( bool bState ); private: diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 318064bbf3b0..191a6e73208a 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -287,7 +287,6 @@ public: sal_uInt16 ExportGraphic( const Graphic& rGraphic, const OUString& rPath, SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL ); - long GetExportGraphicHint() const { return nExpGraphHint; } sal_uInt16 CanImportGraphic( const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 0be5645d0c68..f3d0f980634e 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -363,9 +363,6 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; -VCL_DLLPUBLIC void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, - sal_Int32 nWidth = 1, sal_Int32 nHeight = 1); - class VCL_DLLPUBLIC VclBin : public VclContainer { public: diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 71cc2105006a..92edf09eed2e 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -95,11 +95,9 @@ public: const PPDValue* getValue( const OUString& rOption ) const; const PPDValue* getValueCaseInsensitive( const OUString& rOption ) const; const PPDValue* getDefaultValue() const { return m_pDefaultValue; } - const PPDValue* getQueryValue() const { return m_bQueryValue ? &m_aQueryValue : NULL; } const OUString& getKey() const { return m_aKey; } bool isUIKey() const { return m_bUIOption; } - UIType getUIType() const { return m_eUIType; } SetupType getSetupType() const { return m_eSetupType; } int getOrderDependency() const { return m_nOrderDependency; } }; @@ -195,9 +193,6 @@ private: static OUString getPPDFile( const OUString& rFile ); public: static const PPDParser* getParser( const OUString& rFile ); - static void freeAll(); - - const OUString& getFilename() const { return m_aFile; } const PPDKey* getKey( int n ) const; const PPDKey* getKey( const OUString& rKey ) const; @@ -206,11 +201,6 @@ public: const ::std::list< PPDConstraint >& getConstraints() const { return m_aConstraints; } - const OUString& getPrinterName() const - { return m_aPrinterName.isEmpty() ? m_aNickName : m_aPrinterName; } - const OUString& getNickName() const - { return m_aNickName.isEmpty() ? m_aPrinterName : m_aNickName; } - bool isColorDevice() const { return m_bColorDevice; } bool isType42Capable() const { return m_bType42Capable; } sal_uLong getLanguageLevel() const { return m_nLanguageLevel; } @@ -222,8 +212,6 @@ public: int& rWidth, int& rHeight ) const; // width and height in pt // returns false if paper not found - int getPaperDimensions() const - { return m_pPaperDimensions ? m_pPaperDimensions->countValues() : 0; } // match the best paper for width and height OUString matchPaper( int nWidth, int nHeight ) const; @@ -237,21 +225,12 @@ public: // values int pt OUString getDefaultInputSlot() const; - int getInputSlots() const - { return m_pInputSlots ? m_pInputSlots->countValues() : 0; } void getDefaultResolution( int& rXRes, int& rYRes ) const; // values in dpi static void getResolutionFromString( const OUString&, int&, int& ); // helper function - int getDuplexTypes() const - { return m_pDuplexTypes ? m_pDuplexTypes->countValues() : 0; } - - int getFonts() const - { return m_pFontList ? m_pFontList->countValues() : 0; } - - OUString translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; OUString translateOption( const OUString& i_rKey, diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 28fbec3bdb37..56cbbe627f62 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -81,7 +81,6 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetValue( sal_uInt16 nNewPercent ); - sal_uInt16 GetValue() const { return mnPercent; } }; #endif // INCLUDED_VCL_PRGSBAR_HXX diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index 3f1debfd346f..d41a7c8bc270 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -137,9 +137,6 @@ public: // lists the names of all known printers void listPrinters( std::list< OUString >& rList ) const; - // gets the number of known printers - int countPrinters() const { return m_aPrinters.size(); } - // gets info about a named printer const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 812112b1bf7f..341f1c5d7c00 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -456,8 +456,6 @@ inline bool ImplDoTiledRendering() namespace vcl { class Window; } -vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); - namespace vcl { class Cursor; } class Dialog; class WindowImpl; @@ -550,7 +548,6 @@ private: #ifdef DBG_UTIL friend const char* ::ImplDbgCheckWindow( const void* pObj ); #endif - friend vcl::Window* ::ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: |