diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-25 01:11:16 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-25 11:31:14 +0200 |
commit | a352018c76028b332ccc50be6ee12c16f75aac25 (patch) | |
tree | 77e5d5d4855bdc238bb3844c35f3bbf85bbd1adb /svx | |
parent | 24b0d0a0a247cf1cb39b8c2f544f48ce1aecc45d (diff) |
unusedcode: svx::, svxform::
Diffstat (limited to 'svx')
38 files changed, 0 insertions, 582 deletions
diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index b8ccaf717a63..d31cb446d8cf 100644 --- a/svx/inc/svx/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx @@ -65,10 +65,6 @@ namespace svxform */ virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const; - public: - // helper methods to ease access to some of the characteristics of the locale - sal_Unicode getNumDecimalSep( ) const; - sal_Unicode getNumThousandSep( ) const; }; //========================================================================== diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index e62dfce0ad09..dc5b33c3cc40 100644 --- a/svx/inc/svx/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx @@ -38,9 +38,6 @@ namespace svx { SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); -/** deprecated */ -SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 ); - } #endif // _SVX_UNONAMESPACEMAP_HXX_ diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index 063424661ddc..2244dc5f121a 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -88,12 +88,6 @@ namespace svx ~ODataAccessDescriptor(); - /** returns the descriptor as property set - <p>If you call this method more than once, without writing any values between both calls, the same object - is returned. If you wrote values, a new object is returned.</p> - */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - createPropertySet(); /** returns the descriptor as property value sequence <p>If you call this method more than once, without writing any values between both calls, the same object is returned. If you wrote values, a new object is returned.</p> @@ -101,21 +95,6 @@ namespace svx ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > createPropertyValueSequence(); - /** returns the descriptor as Any sequence - <p>If you call this method more than once, without writing any values between both calls, the same object - is returned. If you wrote values, a new object is returned.</p> - */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - createAnySequence(); - - /** initialized the descriptor from the property set given - <p>If <arg>_bClear</arg> is <TRUE/>, the descriptor will clear all it's current settings before - initializing with the new ones.</p> - */ - void initializeFrom( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxValues, - sal_Bool _bClear = sal_True); - /** initialized the descriptor from the property values given <p>If <arg>_bClear</arg> is <TRUE/>, the descriptor will clear all it's current settings before initializing with the new ones.</p> diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index ba0a092439ea..8639e1e6070f 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -271,8 +271,6 @@ namespace svx public: OMultiColumnTransferable(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aDescriptors); - void push_back(ODataAccessDescriptor& _aDescriptor); - /** checks whether or not an object descriptor can be extracted from the data flavor vector given @param _rFlavors available flavors diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index cd1d78a1657b..3ba4a3bcaccc 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -67,15 +67,6 @@ namespace svx /** extracts a component descriptor from the transferable given */ - static sal_Bool extractComponentDescriptor( - const TransferableDataHelper& _rData - ,sal_Bool _bExtractForm - ,::rtl::OUString& _rDatasourceOrLocation - ,::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent - ); - - /** extracts a component descriptor from the transferable given - */ static ODataAccessDescriptor extractComponentDescriptor(const TransferableDataHelper& _rData); diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 909bd1306cd8..8c86223e20d7 100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -148,14 +148,6 @@ namespace svxform ) const; // ------------------------------------------------ - ::com::sun::star::sdb::SQLContext prependContextInfo( - ::com::sun::star::sdbc::SQLException& _rException, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, - const ::rtl::OUString& _rContextDetails - ) const; - - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( const ::rtl::OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory @@ -174,12 +166,6 @@ namespace svxform sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; // ------------------------------------------------ - /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE - @param _rxCursorSet the property set - */ - sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; - - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, @@ -190,15 +176,6 @@ namespace svxform ) SAL_THROW( ( ) ); // ------------------------------------------------ - ::com::sun::star::uno::Sequence< ::rtl::OUString > - getFieldNamesByCommandDescriptor( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, - ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); - - // ------------------------------------------------ bool isEmbeddedInDatabase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection diff --git a/svx/inc/svx/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index ff79216b341f..4b5c15df84a1 100644 --- a/svx/inc/svx/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx @@ -59,8 +59,6 @@ struct DialControl_Impl; class SVX_DLLPUBLIC DialControl : public Control { public: - explicit DialControl( Window* pParent, const Size& rSize, const Font& rFont, WinBits nWinStyle = 0 ); - explicit DialControl( Window* pParent, const Size& rSize, WinBits nWinStyle = 0 ); explicit DialControl( Window* pParent, const ResId& rResId ); virtual ~DialControl(); @@ -87,13 +85,6 @@ public: /** Links the passed numeric edit field to the control (bi-directional). */ void SetLinkedField( NumericField* pField ); - /** Returns the linked numeric edit field, or 0. */ - NumericField* GetLinkedField() const; - - /** The passed handler is called whenever the totation value changes. */ - void SetModifyHdl( const Link& rLink ); - /** Returns the current modify handler. */ - const Link& GetModifyHdl() const; private: void Init( const Size& rWinSize, const Font& rWinFont ); diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 89ad20bef6f9..744c3b4dc4b7 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -89,7 +89,6 @@ namespace svxform FmSearchParams(); sal_Bool isIgnoreWidthCJK( ) const; - void setIgnoreWidthCJK( sal_Bool _bIgnore ); sal_Int32 getTransliterationFlags( ) const { return nTransliterationFlags; } void setTransliterationFlags( sal_Int32 _nFlags ) { nTransliterationFlags = _nFlags; } diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 48b43186b4a2..358c87f6ea1a 100644 --- a/svx/inc/svx/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx @@ -114,7 +114,6 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog void initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites); void insertSelectedFontwork(); - void changeText( SdrTextObj* pObj ); void fillFavorites( sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites ); std::vector< Bitmap * > maFavoritesHorizontal; diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 6418e47d285a..1d6e7aa2f06f 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -169,8 +169,6 @@ public: /** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */ Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); - /** Returns this style scaled by the specified scaling factor. Ensures that visible lines keep visible. */ - Style Scale( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) const; /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); @@ -597,52 +595,6 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ---------------------------------------------------------------------------- - -/** Draws a horizontal frame border, regards all connected frame styles. - - This is a simplified version of the DrawHorFrameBorder() function described - above. It does not support diagonal connected frame borders. See description - above for additional details about the parameters. - - The function preserves all settings of the passed output device. - */ -void SVX_DLLPUBLIC DrawHorFrameBorder( - OutputDevice& rDev, /// The output device used to draw the frame border. - - const Point& rLPos, /// Reference point for left end of the processed frame border. - const Point& rRPos, /// Reference point for right end of the processed frame border. - const Style& rBorder, /// Style of the processed frame border. - - const Style& rLFromT, /// Vertical frame border from top to left end of rBorder. - const Style& rLFromL, /// Horizontal frame border from left to left end of rBorder. - const Style& rLFromB, /// Vertical frame border from bottom to left end of rBorder. - - const Style& rRFromT, /// Vertical frame border from top to right end of rBorder. - const Style& rRFromR, /// Horizontal frame border from right to right end of rBorder. - const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. - - const Color* pForceColor = 0 /// If specified, overrides frame border color. -); - -// ---------------------------------------------------------------------------- - -/** Draws a horizontal frame border without connected frame styles. - - This is the most simplified version of the DrawHorFrameBorder() function - described above. See description above for additional details about the - parameters. - - The function preserves all settings of the passed output device. - */ -void SVX_DLLPUBLIC DrawHorFrameBorder( - OutputDevice& rDev, /// The output device used to draw the frame border. - const Point& rLPos, /// Reference point for left end of the processed frame border. - const Point& rRPos, /// Reference point for right end of the processed frame border. - const Style& rBorder, /// Style of the frame border to draw. - const Color* pForceColor = 0 /// If specified, overrides frame border color. -); - // ============================================================================ /** Draws a vertical frame border, regards all connected frame styles. @@ -714,52 +666,6 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ---------------------------------------------------------------------------- - -/** Draws a vertical frame border, regards all connected frame styles. - - This is a simplified version of the DrawVerFrameBorder() function described - above. It does not support diagonal connected frame borders. See description - above for additional details about the parameters. - - The function preserves all settings of the passed output device. - */ -void SVX_DLLPUBLIC DrawVerFrameBorder( - OutputDevice& rDev, /// The output device used to draw the frame border. - - const Point& rTPos, /// Reference point for top end of the processed frame border. - const Point& rBPos, /// Reference point for bottom end of the processed frame border. - const Style& rBorder, /// Style of the processed frame border. - - const Style& rTFromL, /// Horizontal frame border from left to top end of rBorder. - const Style& rTFromT, /// Vertical frame border from top to top end of rBorder. - const Style& rTFromR, /// Horizontal frame border from right to top end of rBorder. - - const Style& rBFromL, /// Horizontal frame border from left to bottom end of rBorder. - const Style& rBFromB, /// Vertical frame border from bottom to bottom end of rBorder. - const Style& rBFromR, /// Horizontal frame border from right to bottom end of rBorder. - - const Color* pForceColor = 0 /// If specified, overrides frame border color. -); - -// ---------------------------------------------------------------------------- - -/** Draws a vertical frame border without connected frame styles. - - This is the most simplified version of the DrawVerFrameBorder() function - described above. See description above for additional details about the - parameters. - - The function preserves all settings of the passed output device. - */ -void SVX_DLLPUBLIC DrawVerFrameBorder( - OutputDevice& rDev, /// The output device used to draw the frame border. - const Point& rTPos, /// Reference point for top end of the processed frame border. - const Point& rBPos, /// Reference point for bottom end of the processed frame border. - const Style& rBorder, /// Style of the frame border to draw. - const Color* pForceColor = 0 /// If specified, overrides frame border color. -); - // ============================================================================ /** Draws both diagonal frame borders, regards all connected frame styles. diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx index ab952eb6e2b7..86a3ab1f36c2 100644 --- a/svx/inc/svx/framelinkarray.hxx +++ b/svx/inc/svx/framelinkarray.hxx @@ -65,7 +65,6 @@ struct Cell inline bool IsOverlapped() const { return mbOverlapX || mbOverlapY; } void MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ); - void MirrorSelfY( bool bMirrorStyles, bool bSwapDiag ); }; typedef std::vector< long > LongVec; diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index b44343466d03..33570cba7154 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -48,7 +48,6 @@ namespace svx { class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox { public: - explicit FrameDirectionListBox( Window* pParent, WinBits nStyle = WB_BORDER ); explicit FrameDirectionListBox( Window* pParent, const ResId& rResId ); virtual ~FrameDirectionListBox(); diff --git a/svx/inc/svx/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 752821e870f8..86625e17eff2 100644 --- a/svx/inc/svx/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx @@ -64,10 +64,6 @@ struct OrientationHelper_Impl; class SVX_DLLPUBLIC OrientationHelper { public: - explicit OrientationHelper( - DialControl& rCtrlDial, - CheckBox& rCbStacked ); - /** @param rNfRotation A numeric field that will be connected to the DialControl. */ explicit OrientationHelper( DialControl& rCtrlDial, diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index 37c300e26775..19ac03e06586 100644 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -65,9 +65,6 @@ namespace svx void Update( const Color& rColor ); - protected: - void DrawChar(VirtualDevice&, const Color&); - private: sal_uInt16 mnDrawMode; sal_uInt16 mnBtnId; diff --git a/svx/inc/svx/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index 8c35ee3e333b..40af44c3fdfa 100644 --- a/svx/inc/svx/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx @@ -81,8 +81,6 @@ namespace svx virtual void AddSupportedFormats(); virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - static sal_uInt32 getDescriptorFormatId(); - OXFormsDescriptor m_aDescriptor; public: diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index ff98511135bf..15886ebe9d6f 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -291,23 +291,6 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont ) // ============================================================================ -DialControl::DialControl( Window* pParent, const Size& rSize, const Font& rFont, WinBits nWinStyle ) : - Control( pParent, nWinStyle ), - mpImpl( new DialControl_Impl( *this ) ) -{ - Init( rSize, rFont ); -} - -DialControl::DialControl( Window* pParent, const Size& rSize, WinBits nWinStyle ) : - Control( pParent, nWinStyle ), - mpImpl( new DialControl_Impl( *this ) ) -{ - if( pParent ) - Init( rSize, pParent->GetFont() ); - else - Init( rSize ); -} - DialControl::DialControl( Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), mpImpl( new DialControl_Impl( *this ) ) @@ -436,21 +419,6 @@ void DialControl::SetLinkedField( NumericField* pField ) ImplSetFieldLink( LINK( this, DialControl, LinkedFieldModifyHdl ) ); } -NumericField* DialControl::GetLinkedField() const -{ - return mpImpl->mpLinkField; -} - -void DialControl::SetModifyHdl( const Link& rLink ) -{ - mpImpl->maModifyHdl = rLink; -} - -const Link& DialControl::GetModifyHdl() const -{ - return mpImpl->maModifyHdl; -} - // private -------------------------------------------------------------------- void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 4b045f30ae1c..d22b5e98acfd 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1247,11 +1247,6 @@ Style& Style::ScaleSelf( double fScale, sal_uInt16 nMaxWidth ) return *this; } -Style Style::Scale( double fScale, sal_uInt16 nMaxWidth ) const -{ - return Style( *this ).ScaleSelf( fScale, nMaxWidth ); -} - Style& Style::MirrorSelf() { if( mnSecn ) @@ -1483,28 +1478,6 @@ void DrawHorFrameBorder( OutputDevice& rDev, } } -void DrawHorFrameBorder( OutputDevice& rDev, - const Point& rLPos, const Point& rRPos, const Style& rBorder, - const Style& rLFromT, const Style& rLFromL, const Style& rLFromB, - const Style& rRFromT, const Style& rRFromR, const Style& rRFromB, - const Color* pForceColor ) -{ - /* Recycle complex version of the DrawHorFrameBorder() function with empty diagonals. */ - const DiagStyle aNoStyle; - DrawHorFrameBorder( - rDev, rLPos, rRPos, rBorder, - aNoStyle, rLFromT, rLFromL, rLFromB, aNoStyle, - aNoStyle, rRFromT, rRFromR, rRFromB, aNoStyle, - pForceColor ); -} - -void DrawHorFrameBorder( OutputDevice& rDev, - const Point& rLPos, const Point& rRPos, const Style& rBorder, const Color* pForceColor ) -{ - if( rBorder.Prim() ) - lclDrawHorFrameBorder( rDev, rLPos, rRPos, rBorder, BorderResult(), pForceColor ); -} - // ---------------------------------------------------------------------------- void DrawVerFrameBorder( OutputDevice& rDev, @@ -1523,28 +1496,6 @@ void DrawVerFrameBorder( OutputDevice& rDev, } } -void DrawVerFrameBorder( OutputDevice& rDev, - const Point& rTPos, const Point& rBPos, const Style& rBorder, - const Style& rTFromL, const Style& rTFromT, const Style& rTFromR, - const Style& rBFromL, const Style& rBFromB, const Style& rBFromR, - const Color* pForceColor ) -{ - /* Recycle complex version of the DrawVerFrameBorder() function with empty diagonals. */ - const DiagStyle aNoStyle; - DrawVerFrameBorder( - rDev, rTPos, rBPos, rBorder, - aNoStyle, rTFromL, rTFromT, rTFromR, aNoStyle, - aNoStyle, rBFromL, rBFromB, rBFromR, aNoStyle, - pForceColor ); -} - -void DrawVerFrameBorder( OutputDevice& rDev, - const Point& rTPos, const Point& rBPos, const Style& rBorder, const Color* pForceColor ) -{ - if( rBorder.Prim() ) - lclDrawVerFrameBorder( rDev, rTPos, rBPos, rBorder, BorderResult(), pForceColor ); -} - // ============================================================================ void DrawDiagFrameBorders( diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 3107e7ac3408..1ac302b89cc5 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -72,21 +72,6 @@ void Cell::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) } } -void Cell::MirrorSelfY( bool bMirrorStyles, bool bSwapDiag ) -{ - std::swap( maTop, maBottom ); - std::swap( mnAddTop, mnAddBottom ); - if( bMirrorStyles ) - { - maTop.MirrorSelf(); - maBottom.MirrorSelf(); - } - if( bSwapDiag ) - std::swap( maTLBR, maBLTR ); - /* Do not mirror diagonal styles, because they are oriented vertical. - Therefore swapping the styles is sufficient for correct behaviour. */ -} - // ---------------------------------------------------------------------------- diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 965ff2cc24ac..047f375b4f46 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -50,11 +50,6 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection ) // ============================================================================ -FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nStyle ) : - ListBox( pParent, nStyle ) -{ -} - FrameDirectionListBox::FrameDirectionListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 4878f350d37d..49b2497ce396 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -116,13 +116,6 @@ IMPL_LINK( OrientationHelper_Impl, ClickHdl, void*, EMPTYARG ) // ============================================================================ -OrientationHelper::OrientationHelper( DialControl& rCtrlDial, CheckBox& rCbStacked ) : - mpImpl( new OrientationHelper_Impl( rCtrlDial, rCbStacked ) ) -{ - mpImpl->EnableDependentWindows(); - mpImpl->ShowDependentWindows(); -} - OrientationHelper::OrientationHelper( DialControl& rCtrlDial, NumericField& rNfRotation, CheckBox& rCbStacked ) : mpImpl( new OrientationHelper_Impl( rCtrlDial, rCbStacked ) ) { diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 6d6f100714ae..97869b24d6f0 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -667,13 +667,6 @@ namespace svx AddFormat(getDescriptorFormatId()); } //-------------------------------------------------------------------- - void OMultiColumnTransferable::push_back(ODataAccessDescriptor& _aDescriptor) - { - const sal_Int32 nCount = m_aDescriptors.getLength(); - m_aDescriptors.realloc(nCount+1); - m_aDescriptors[nCount].Value <<= _aDescriptor.createPropertyValueSequence(); - } - //-------------------------------------------------------------------- sal_Bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 7d5ee63782fa..f58743bdb1dc 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -161,22 +161,6 @@ namespace svx return ODataAccessDescriptor(); } - //-------------------------------------------------------------------- - sal_Bool OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData - ,sal_Bool _bExtractForm - , ::rtl::OUString& _rDatasourceOrLocation - , ::com::sun::star::uno::Reference< XContent>& _xContent) - { - if ( _rData.HasFormat( getDescriptorFormatId(_bExtractForm)) ) - { - ODataAccessDescriptor aDescriptor = extractComponentDescriptor(_rData); - _rDatasourceOrLocation = aDescriptor.getDataSource(); - aDescriptor[daComponent] >>= _xContent; - return sal_True; - } - - return sal_False; - } //........................................................................ } // namespace svx //........................................................................ diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 3906972883fa..453fb800b559 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -49,17 +49,6 @@ namespace svx { } //-------------------------------------------------------------------- - sal_uInt32 OXFormsTransferable::getDescriptorFormatId() - { - static sal_uInt32 s_nFormat = (sal_uInt32)-1; - if ((sal_uInt32)-1 == s_nFormat) - { - s_nFormat = SotExchange::RegisterFormatName( String::CreateFromAscii("application/x-openoffice;windows_formatname=\"???\"") ); - OSL_ENSURE( (sal_uInt32)-1 != s_nFormat, "OXFormsTransferable::getDescriptorFormatId: bad exchange id!" ); - } - return s_nFormat; - } - //-------------------------------------------------------------------- void OXFormsTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_XFORMS ); diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index d5b93d1bb212..b840209f8d5e 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -136,28 +136,6 @@ OSystemParseContext::~OSystemParseContext() return sKeyword; } -//----------------------------------------------------------------------------- -static sal_Unicode lcl_getSeparatorChar( const String& _rSeparator, sal_Unicode _nFallback ) -{ - DBG_ASSERT( 0 < _rSeparator.Len(), "::lcl_getSeparatorChar: invalid decimal separator!" ); - - sal_Unicode nReturn( _nFallback ); - if ( _rSeparator.Len() ) - nReturn = static_cast< sal_Char >( _rSeparator.GetBuffer( )[0] ); - return nReturn; -} - -//----------------------------------------------------------------------------- -sal_Unicode OSystemParseContext::getNumDecimalSep( ) const -{ - return lcl_getSeparatorChar( SvtSysLocale().GetLocaleData().getNumDecimalSep(), '.' ); -} - -//----------------------------------------------------------------------------- -sal_Unicode OSystemParseContext::getNumThousandSep( ) const -{ - return lcl_getSeparatorChar( SvtSysLocale().GetLocaleData().getNumThousandSep(), ',' ); -} // ----------------------------------------------------------------------------- IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const { diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index f10546cf45c3..6a97a1d5709a 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -422,14 +422,6 @@ namespace svx } //-------------------------------------------------------------------- - void ODataAccessDescriptor::initializeFrom(const Reference< XPropertySet >& _rxValues, sal_Bool _bClear) - { - if (_bClear) - clear(); - m_pImpl->buildFrom(_rxValues); - } - - //-------------------------------------------------------------------- void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear) { if (_bClear) @@ -443,25 +435,8 @@ namespace svx m_pImpl->updateSequence(); return m_pImpl->m_aAsSequence; } - //-------------------------------------------------------------------- - Sequence< Any > ODataAccessDescriptor::createAnySequence() - { - m_pImpl->updateSequence(); - Sequence< Any > aRet(m_pImpl->m_aAsSequence.getLength()); - const PropertyValue* pBegin = m_pImpl->m_aAsSequence.getConstArray(); - const PropertyValue* pEnd = pBegin + m_pImpl->m_aAsSequence.getLength(); - for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) - aRet[i] <<= *pBegin; - return aRet; - } //-------------------------------------------------------------------- - Reference< XPropertySet > ODataAccessDescriptor::createPropertySet() - { - m_pImpl->updateSet(); - return m_pImpl->m_xAsSet; - } - //-------------------------------------------------------------------- ::rtl::OUString ODataAccessDescriptor::getDataSource() const { ::rtl::OUString sDataSourceName; diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index cf36a7db03a6..bc4310c7357c 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -245,16 +245,6 @@ namespace svxform return sReturn; } - //-------------------------------------------------------------------- - SQLContext OStaticDataAccessTools::prependContextInfo(SQLException& _rException, const Reference< XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails) const - { - SQLContext aReturn; - if ( ensureLoaded() ) - aReturn = m_xDataAccessTools->prependContextInfo(_rException, _rxContext, _rContextDescription, _rContextDetails); - return aReturn; - } - //---------------------------------------------------------------- Reference< XDataSource > OStaticDataAccessTools::getDataSource( const ::rtl::OUString& _rsRegisteredName, const Reference< XMultiServiceFactory>& _rxFactory ) const { @@ -283,15 +273,6 @@ namespace svxform } //---------------------------------------------------------------- - sal_Bool OStaticDataAccessTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const - { - sal_Bool bRet = sal_False; - if ( ensureLoaded() ) - bRet = m_xDataAccessTools->canDelete( _rxCursorSet ); - return bRet; - } - - //---------------------------------------------------------------- Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) @@ -305,18 +286,6 @@ namespace svxform } //---------------------------------------------------------------- - Sequence< ::rtl::OUString > OStaticDataAccessTools::getFieldNamesByCommandDescriptor( - const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) - { - Sequence< ::rtl::OUString > aNames; - if ( ensureLoaded() ) - aNames = m_xDataAccessTools->getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType, - _rCommand, _pErrorInfo ); - return aNames; - } - - //---------------------------------------------------------------- bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection ) { bool bReturn = false; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index d838fe6633e0..2acbc957d2b3 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1190,12 +1190,6 @@ FmFilterNavigator::~FmFilterNavigator() } //------------------------------------------------------------------------ -void FmFilterNavigator::Clear() -{ - m_pModel->Clear(); -} - -//------------------------------------------------------------------------ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent) { if (xCurrent == m_pModel->GetCurrentController()) diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 2d286c00376b..b1ae5f12449b 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -75,14 +75,6 @@ namespace svxform return 0 != (nTransliterationFlags & TransliterationModules_IGNORE_WIDTH); } - void FmSearchParams::setIgnoreWidthCJK( sal_Bool _bIgnore ) - { - if ( _bIgnore ) - nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH; - else - nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH; - } - sal_Bool FmSearchParams::isCaseSensitive( ) const { return 0 == (nTransliterationFlags & TransliterationModules_IGNORE_CASE); diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 98e92250d972..50ff9b0a619b 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -227,16 +227,6 @@ namespace svx } //-------------------------------------------------------------------- - ControllerFeatures::ControllerFeatures( const Reference< XMultiServiceFactory >& _rxORB, - const Reference< XForm >& _rxForm, IControllerFeatureInvalidation* _pInvalidationCallback ) - :m_aContext( _rxORB ) - ,m_pInvalidationCallback( _pInvalidationCallback ) - ,m_pImpl( NULL ) - { - assign( _rxForm ); - } - - //-------------------------------------------------------------------- void ControllerFeatures::assign( const Reference< XFormController >& _rxController ) { dispose(); @@ -377,18 +367,6 @@ namespace svx } //-------------------------------------------------------------------- - bool FormControllerHelper::moveRight( ) const - { - return impl_operateForm_nothrow( FormFeature::MoveToNext ); - } - - //-------------------------------------------------------------------- - bool FormControllerHelper::moveLeft( ) const - { - return impl_operateForm_nothrow( FormFeature::MoveToPrevious ); - } - - //-------------------------------------------------------------------- void FormControllerHelper::execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const Any& _rParamValue ) const { Sequence< NamedValue > aArguments(1); diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index c401f41c0588..c57efdcb4d86 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -63,24 +63,6 @@ namespace svx } //-------------------------------------------------------------------- - void OSingleFeatureDispatcher::dispose() - { - { - ::osl::MutexGuard aGuard( m_rMutex ); - if ( m_bDisposed ) - return; - } - - EventObject aDisposeEvent( *this ); - m_aStatusListeners.disposeAndClear( aDisposeEvent ); - - { - ::osl::MutexGuard aGuard( m_rMutex ); - m_bDisposed = sal_True; - } - } - - //-------------------------------------------------------------------- void OSingleFeatureDispatcher::getUnoState( FeatureStateEvent& /* [out] */ _rState ) const { _rState.Source = *const_cast< OSingleFeatureDispatcher* >( this ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 96af909eb63b..aea69b246fcb 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -556,21 +556,6 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::IsDeleteAllowed() - { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsDeleteAllowed" ); - ////////////////////////////////////////////////////////////////////// - // Haben wir eine Form... - SvLBoxEntry* pCurEntry = GetCurEntry(); - sal_uInt32 nCurEntryPos = GetModel()->GetAbsPos( pCurEntry ); - - if( nCurEntryPos==0 ) // Root kann nicht geloescht werden - return sal_False; - else - return IsFormEntry(pCurEntry) || IsFormComponentEntry(pCurEntry); - } - - //------------------------------------------------------------------------ SvLBoxEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::FindEntry" ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 920e79482b82..e7af44f532c2 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -296,7 +296,6 @@ protected: virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); void DeleteSelection(); - void Clear(); SvLBoxEntry* FindEntry(const FmFilterData* pItem) const; void Insert(FmFilterData* pItem, sal_Int32 nPos); void Remove(FmFilterData* pItem); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 02243f49759c..7070eac032e4 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -466,7 +466,6 @@ namespace svxform void UpdateContent(); - sal_Bool IsDeleteAllowed(); FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvLBoxEntry* pParentEntry ); SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 82432a5b5f36..b7db8c61fec4 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -127,25 +127,6 @@ namespace svx IControllerFeatureInvalidation* _pInvalidationCallback ); - /** constructs the helper form a <type scope="com::sun::star::form">XForm<type> instance - - Any functionality which depends on a controller will not be available. - - @param _rxORB - a multi service factory for creating various needed components - - @param _rxForm - The form which the helper should be responsible for. Must not be <NULL/>. - - @param _pInvalidationCallback - the callback for invalidating feature states - */ - ControllerFeatures( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, - IControllerFeatureInvalidation* _pInvalidationCallback - ); - /// dtor ~ControllerFeatures(); @@ -246,9 +227,6 @@ namespace svx sal_Bool isInsertionRow() const; sal_Bool isModifiedRow() const; - bool moveLeft( ) const; - bool moveRight( ) const; - bool canDoFormFilter() const; /** disposes this instance. diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 777b573faf54..fd0a155b2dc9 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -85,20 +85,6 @@ namespace svx ::osl::Mutex& _rMutex ); - /** disposes the dispatcher instance - - All status listeners will, after receiving an <member scope="com::sun::star::lang">XEventListener::disposing</member> - call, be released. - - The controller provided in the in constructor will not be used anymore after returning from this call. - - No further requests to dispatch slots will be accepted. - - Multiple calls are allowed: if the object already was disposed, then subsequent calls are - silently ignored. - */ - void dispose(); - /** notifies all our listeners of the current state */ void updateAllListeners(); @@ -144,11 +130,6 @@ namespace svx our mutex is locked */ void getUnoState( ::com::sun::star::frame::FeatureStateEvent& /* [out] */ _rState ) const; - - private: - OSingleFeatureDispatcher(); // never implemented - OSingleFeatureDispatcher( const OSingleFeatureDispatcher& ); // never implemented - OSingleFeatureDispatcher& operator=( const OSingleFeatureDispatcher& ); // never implemented }; //........................................................................ diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bd3cd0e30c6b..448ef1be8278 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -192,39 +192,6 @@ void FontWorkGalleryDialog::fillFavorites( sal_uInt16 nThemeId, std::vector< Bit } } -void FontWorkGalleryDialog::changeText( SdrTextObj* pObj ) -{ - if( pObj ) - { - SdrOutliner& rOutl = mpModel->GetDrawOutliner(pObj); - - sal_uInt16 nOutlMode = rOutl.GetMode(); - Size aPaperSize = rOutl.GetPaperSize(); - sal_Bool bUpdateMode = rOutl.GetUpdateMode(); - rOutl.SetUpdateMode(sal_False); - rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() ); - - // #95114# Always set the object's StyleSheet at the Outliner to - // use the current objects StyleSheet. Thus it's the same as in - // SetText(...). - // #95114# Moved this implementation from where SetObjText(...) was called - // to inside this method to work even when outliner is fetched here. - rOutl.SetStyleSheet(0, pObj->GetStyleSheet()); - - rOutl.SetPaperSize( pObj->GetLogicRect().GetSize() ); - - rOutl.SetText( maStrClickToAddText, rOutl.GetParagraph( 0 ) ); - pObj->SetOutlinerParaObject( rOutl.CreateParaObject() ); - - rOutl.Init( nOutlMode ); - rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() ); - rOutl.SetUpdateMode( bUpdateMode ); - rOutl.SetPaperSize( aPaperSize ); - - rOutl.Clear(); - } -} - void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel* pModel ) { mppSdrObject = ppSdrObject; @@ -277,7 +244,6 @@ void FontWorkGalleryDialog::insertSelectedFontwork() else if( pPV ) { mpSdrView->InsertObjectAtView( pNewObject, *pPV ); - // changeText( PTR_CAST( SdrTextObj, pNewObject ) ); } } } diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 0be242c9daf8..f6eea4c593a2 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -171,39 +171,6 @@ namespace svx } } - // ----------------------------------------------------------------------- - - void ToolboxButtonColorUpdater::DrawChar( VirtualDevice& rVirDev, const Color& rCol ) - { - Font aOldFont = rVirDev.GetFont(); - Font aFont = aOldFont; - Size aSz = aFont.GetSize(); - aSz.Height() = maBmpSize.Height(); - aFont.SetSize( aSz ); - aFont.SetWeight( WEIGHT_BOLD ); - - if ( mnDrawMode == TBX_UPDATER_MODE_CHAR_COLOR ) - { - aFont.SetColor( rCol ); - aFont.SetFillColor( Color( IMAGE_COL_TRANSPARENT ) ); - } - else - { - rVirDev.SetLineColor(); - rVirDev.SetFillColor( rCol ); - Rectangle aRect( Point(0,0), maBmpSize ); - rVirDev.DrawRect( aRect ); - aFont.SetFillColor( rCol ); - } - rVirDev.SetFont( aFont ); - Size aTxtSize(rVirDev.GetTextWidth( 'A' ), rVirDev.GetTextHeight()); - Point aPos( ( maBmpSize.Width() - aTxtSize.Width() ) / 2, - ( maBmpSize.Height() - aTxtSize.Height() ) / 2 ); - - rVirDev.DrawText( aPos, 'A' ); - rVirDev.SetFont( aOldFont ); - } - //........................................................................ } // namespace svx //........................................................................ diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index fc401c68c8a8..7c28a2f2f4d4 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -84,11 +84,6 @@ namespace svx virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); }; - Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* ) - { - return (XWeak*)new NamespaceMap( pWhichIds, pPool1 ); - } - Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { return (XWeak*)new NamespaceMap( pWhichIds, pPool ); |