From 60336fbefa1b29b0bfa8d89eec240a483b438c06 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 23 Nov 2010 12:50:54 +0100 Subject: dba34b: DBTypeConversion::getValue renamed to getFormattedValue (at least those variants returning a string), which will give us some better control over the changes required for #i115250# --- svx/source/inc/typeconversionclient.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index 53bf13b7702c..7dd3da378619 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -70,7 +70,7 @@ namespace svxform } // -------------------------------------------------------- - inline ::rtl::OUString getValue( + inline ::rtl::OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, @@ -79,7 +79,7 @@ namespace svxform { ::rtl::OUString sReturn; if ( ensureLoaded() ) - sReturn = m_xTypeConversion->getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); + sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); return sReturn; } }; -- cgit From 9e9e1181d4bda2f836cd9c23832142325d3229c1 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 23 Nov 2010 21:55:13 +0100 Subject: dba34b: #i115250# DBTypeConversion::getValue: do not use the target format to determine how to obtain the column value, instead, use the column type --- svx/source/inc/typeconversionclient.hxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index 7dd3da378619..9ff7e12fe4d0 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -60,12 +60,11 @@ namespace svxform // -------------------------------------------------------- inline double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, - const ::com::sun::star::util::Date& _rNullDate, - sal_Int16 _nKeyType) const + const ::com::sun::star::util::Date& _rNullDate ) const { double nReturn(0); if ( ensureLoaded() ) - nReturn = m_xTypeConversion->getValue(_rxVariant, _rNullDate, _nKeyType); + nReturn = m_xTypeConversion->getValue( _rxVariant, _rNullDate ); return nReturn; } -- cgit From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 10 Jan 2011 16:11:35 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from svx --- svx/source/inc/GraphCtlAccessibleContext.hxx | 2 +- svx/source/inc/charmapacc.hxx | 4 ++-- svx/source/inc/datanavi.hxx | 16 ++++++++-------- svx/source/inc/docrecovery.hxx | 4 ++-- svx/source/inc/fmgroup.hxx | 12 ++++++------ svx/source/inc/fmslotinvalidator.hxx | 2 +- svx/source/inc/fmtextcontroldialogs.hxx | 2 +- svx/source/inc/fmvwimp.hxx | 6 +++--- svx/source/inc/formtoolbars.hxx | 8 ++++---- svx/source/inc/frmselimpl.hxx | 2 +- svx/source/inc/stringlistresource.hxx | 2 +- svx/source/inc/svdoimp.hxx | 6 +++--- svx/source/inc/tabwin.hxx | 2 +- svx/source/inc/tbxform.hxx | 26 +++++++++++++------------- 14 files changed, 47 insertions(+), 47 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 395d3d511841..1d29cba30c8c 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -184,7 +184,7 @@ public: //===== IAccessibleViewforwarder ======================================== - virtual BOOL IsValid (void) const; + virtual sal_Bool IsValid (void) const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel (const Point& rPoint) const; virtual Size LogicToPixel (const Size& rSize) const; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index f7eba57bd8fb..5bd5714b8039 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -109,14 +109,14 @@ namespace svx struct SvxShowCharSetItem { SvxShowCharSet& mrParent; - USHORT mnId; + sal_uInt16 mnId; XubString maText; Rectangle maRect; SvxShowCharSetItemAcc* m_pItem; SvxShowCharSetAcc* m_pParent; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc; - SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos ); + SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ); ~SvxShowCharSetItem(); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible(); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index ab8bda588c5a..a8bfad89090b 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -129,7 +129,7 @@ namespace svxform ~DataTreeListBox(); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); @@ -166,7 +166,7 @@ namespace svxform void AddChildren( SvLBoxEntry* _pParent, const ImageList& _rImgLst, const XNode_ref& _xNode ); - bool DoToolBoxAction( USHORT _nToolBoxID ); + bool DoToolBoxAction( sal_uInt16 _nToolBoxID ); SvLBoxEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); SvLBoxEntry* AddEntry( const XPropertySet_ref& _rPropSet ); void EditEntry( const XPropertySet_ref& _rPropSet ); @@ -182,12 +182,12 @@ namespace svxform virtual void Resize(); inline bool HasModel() const { return m_bHasModel; } - String SetModel( const XModel_ref& _xModel, USHORT _nPagePos ); + String SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos ); void ClearModel(); String LoadInstance( const PropertyValue_seq& _xPropSeq, const ImageList& _rImgLst ); - bool DoMenuAction( USHORT _nMenuID ); + bool DoMenuAction( sal_uInt16 _nMenuID ); void EnableMenuItems( Menu* _pMenu ); inline SvLBoxEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); } @@ -227,7 +227,7 @@ namespace svxform long m_nMinWidth; long m_nMinHeight; long m_nBorderHeight; - USHORT m_nLastSelectedPos; + sal_uInt16 m_nLastSelectedPos; bool m_bShowDetails; bool m_bIsNotifyDisabled; Size m_a2Size; @@ -250,14 +250,14 @@ namespace svxform DECL_LINK( ActivatePageHdl, TabControl* ); DECL_LINK( UpdateHdl, Timer* ); - XFormsPage* GetCurrentPage( USHORT& rCurId ); + XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); void SetPageModel(); void ClearAllPageModels( bool bClearPages ); void InitPages(); void CreateInstancePage( const PropertyValue_seq& _xPropSeq ); bool HasFirstInstancePage() const; - USHORT GetNewPageId() const; + sal_uInt16 GetNewPageId() const; protected: virtual void Resize(); @@ -574,7 +574,7 @@ namespace svxform inline void SetName( const String& _rName ) { m_aNameED.SetText( _rName );} inline String GetURL() const { return m_aURLED.GetText(); } inline void SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );} - inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); } + inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); } inline void SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); } }; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index b35b46a941aa..ebe104058509 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -591,14 +591,14 @@ class RecovDocListEntry : public SvLBoxString //--------------------------------------- /** @short TODO */ RecovDocListEntry( SvLBoxEntry* pEntry, - USHORT nFlags, + sal_uInt16 nFlags, const String& sText ); //--------------------------------------- /** @short TODO */ virtual void Paint(const Point& aPos , SvLBox& aDevice, - USHORT nFlags , + sal_uInt16 nFlags , SvLBoxEntry* pEntry ); }; diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx index 109a445dca70..5cad571dee7b 100644 --- a/svx/source/inc/fmgroup.hxx +++ b/svx/source/inc/fmgroup.hxx @@ -63,9 +63,9 @@ public: virtual XIdlClassRef getIdlClass(); // XGroup - virtual INT32 getFormControlCount(); + virtual sal_Int32 getFormControlCount(); virtual XFormControlRef getFormControlByName( const XubString& sName ) const; - virtual XFormControlRef getFormControlByIndex( INT32 Index ) const; + virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const; virtual void appendFormControl( const XFormControlRef& FormControl ); virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl ); @@ -93,11 +93,11 @@ public: // PropertySetInterface virtual FmXPropertySetInfo* createPropertySetInfo() const; - virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName, + virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName, const UsrAny& aValue, PropertyChangeEventSequence* pSeq, - INT32 nIndex ); - virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const; + sal_Int32 nIndex ); + virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const; virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); }; @@ -112,7 +112,7 @@ class FmXGroupModelInfo : public FmXControlModelInfo protected: FmXGroupModelInfo( const FmXGroupModel* pCp ); - virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const; + virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const; }; diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index 7baa4f451a3f..d37099f40cf4 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -35,7 +35,7 @@ namespace svx { //........................................................................ - typedef USHORT SfxSlotId; + typedef sal_uInt16 SfxSlotId; //==================================================================== //= ISlotInvalidator diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index afb737864bd8..2b6ccb09d89d 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -50,7 +50,7 @@ namespace svx ~TextControlCharAttribDialog(); protected: - virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage ); + virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ); }; //==================================================================== diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 8bb682690b36..9641db8c8a19 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -252,7 +252,7 @@ private: void addWindow(const SdrPageWindow&); void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); void Activate(sal_Bool bSync = sal_False); - void Deactivate(BOOL bDeactivateController = TRUE); + void Deactivate(sal_Bool bDeactivateController = sal_True); SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ); SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ); @@ -266,8 +266,8 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, - UINT32 _nInventor, - UINT16 _nLabelObjectID, + sal_uInt32 _nInventor, + sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 96da1c9aa5af..db21979ab756 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -63,19 +63,19 @@ namespace svxform on the type of our document */ SVX_DLLPUBLIC ::rtl::OUString - getToolboxResourceName( USHORT _nSlotId ) const; + getToolboxResourceName( sal_uInt16 _nSlotId ) const; /** toggles the toolbox associated with the given slot */ - SVX_DLLPUBLIC void toggleToolbox( USHORT _nSlotId ) const; + SVX_DLLPUBLIC void toggleToolbox( sal_uInt16 _nSlotId ) const; /** determines whether the toolbox associated with the given slot is currently visible */ - SVX_DLLPUBLIC bool isToolboxVisible( USHORT _nSlotId ) const; + SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const; /** ensures that a given toolbox is visible */ - inline void showToolbox( USHORT _SlotId ) const + inline void showToolbox( sal_uInt16 _SlotId ) const { if ( !isToolboxVisible( _SlotId ) ) toggleToolbox( _SlotId ); diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index f9e3727988af..77554da2587e 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -75,7 +75,7 @@ public: void SetKeyboardNeighbors( FrameBorderType eLeft, FrameBorderType eRight, FrameBorderType eTop, FrameBorderType eBottom ); - FrameBorderType GetKeyboardNeighbor( USHORT nKeyCode ) const; + FrameBorderType GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const; private: const FrameBorderType meType; /// Frame border type (position in control). diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 2f7b60073200..5fdcfb320443 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -65,7 +65,7 @@ namespace svx @return String The string. */ - String getString( USHORT _nResId ) + String getString( sal_uInt16 _nResId ) { return String( ResId( _nResId, *m_pResMgr ) ); } diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx index 3014b42d4721..91add6aaa48e 100644 --- a/svx/source/inc/svdoimp.hxx +++ b/svx/source/inc/svdoimp.hxx @@ -98,9 +98,9 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, const Size& rBmpSize, const Size& rBmpPerCent, const Size& rBmpOffPerCent, - BOOL bBmpLogSize, - BOOL bBmpTile, - BOOL bBmpStretch, + sal_Bool bBmpLogSize, + sal_Bool bBmpTile, + sal_Bool bBmpStretch, RECT_POINT eBmpRectPoint ); diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index b62a71e56525..bbb5cb261b46 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -60,7 +60,7 @@ protected: virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // SvLBox - virtual BOOL DoubleClickHdl(); + virtual sal_Bool DoubleClickHdl(); using SvLBox::ExecuteDrop; }; diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 79fee9082999..774e786b80f7 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -59,7 +59,7 @@ private: DECL_LINK( TbxSelectHdl, ToolBox* ); public: - SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx ); + SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx ); ~SvxFmConfigWin(); void Update(); @@ -71,7 +71,7 @@ public: class SvxFmTbxCtlConfig : public SfxToolBoxControl { private: - UINT16 nLastSlot; + sal_uInt16 nLastSlot; protected: using SfxToolBoxControl::Select; @@ -79,11 +79,11 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlConfig() {} - virtual void Select( USHORT nModifier ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_uInt16 nModifier ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -96,12 +96,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlAbsRec(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -111,7 +111,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecText(); virtual Window* CreateItemWindow( Window* pParent ); @@ -123,7 +123,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecFromText(); virtual Window* CreateItemWindow( Window* pParent ); @@ -137,11 +137,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecTotal(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -150,7 +150,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; //======================================================================== @@ -158,7 +158,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -- cgit From 006b8504d7c633a61b4953151e71b83fda8e204d Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Thu, 13 Jan 2011 16:27:50 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from svx --- svx/source/inc/delayedevent.hxx | 2 +- svx/source/inc/filtnav.hxx | 2 +- svx/source/inc/fmexpl.hxx | 6 +++--- svx/source/inc/fmobj.hxx | 2 +- svx/source/inc/fmpgeimp.hxx | 2 +- svx/source/inc/fmshimp.hxx | 16 ++++++++-------- svx/source/inc/formcontroller.hxx | 10 +++++----- svx/source/inc/gridcell.hxx | 16 ++++++++-------- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index d2a928bffb63..5dd531de8090 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -69,7 +69,7 @@ namespace svxform private: Link m_aHandler; - ULONG m_nEventId; + sal_uLong m_nEventId; private: DECL_LINK( OnCall, void* ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index df4e2b8559a6..10a290cd2b04 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -318,7 +318,7 @@ private: @param _pTargetItems The target where to insert the items. @param _bCopy - If the items will not be removed from the model, otherwise they will. + If the items will not be removed from the model, otherwise they will. */ void insertFilterItem(const ::std::vector& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False); SvLBoxEntry* getPrevEntry(SvLBoxEntry* _pStartWith = NULL); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 487c9287c972..598e9d61196a 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -390,7 +390,7 @@ namespace svxform void ClearBranch( FmFormData* pParentData ); void UpdateContent( FmFormShell* pNewShell ); - void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND, + void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND, sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); @@ -440,7 +440,7 @@ namespace svxform SvLBoxEntry* m_pRootEntry; SvLBoxEntry* m_pEditEntry; - ULONG nEditEvent; + sal_uLong nEditEvent; SELDATA_ITEMS m_sdiState; Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde @@ -465,7 +465,7 @@ namespace svxform sal_Bool IsDeleteAllowed(); FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvLBoxEntry* pParentEntry ); - SvLBoxEntry* Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND ); + SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 5398973cb6b3..fae15aeb18df 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -45,7 +45,7 @@ class FmFormObj: public SdrUnoObj // m_pEnvironmentHistory was created FmFormView* m_pControlCreationView; - ULONG m_nControlCreationEvent; + sal_uLong m_nControlCreationEvent; // Informationen fuer die Controlumgebung // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 755c754853dc..6f3e37e96c3a 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -150,7 +150,7 @@ private: If xCurrentForm is not valid anymore, it is reset to . @return - if and only if xCurrentForm is valid. + if and only if xCurrentForm is valid. @since #i40086# */ diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e56f9fd64a36..73956dc2925c 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -123,11 +123,11 @@ class FmFormPage; struct SAL_DLLPRIVATE FmLoadAction { FmFormPage* pPage; - ULONG nEventId; + sal_uLong nEventId; sal_uInt16 nFlags; FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { } - FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId ) + FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId ) :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags ) { } @@ -200,8 +200,8 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE SvLongs m_arrRelativeGridColumn; ::osl::Mutex m_aMutex; - ULONG m_nInvalidationEvent; - ULONG m_nActivationEvent; + sal_uLong m_nInvalidationEvent; + sal_uLong m_nActivationEvent; ::std::queue< FmLoadAction > m_aLoadingPages; @@ -364,7 +364,7 @@ protected: ::std::vector< String >& _out_rNames ); /** checks whether the instance is already disposed, if so, this is reported as assertion error (debug - builds only) and is returned. + builds only) and is returned. */ bool impl_checkDisposed() const; @@ -383,7 +383,7 @@ public: /** announces a new "current selection" @return - if and only if the to-bet-set selection was different from the previous selection + if and only if the to-bet-set selection was different from the previous selection */ bool setCurrentSelection( const InterfaceBag& _rSelection ); @@ -397,7 +397,7 @@ public: /** sets a new current selection as indicated by a mark list @return - if and only if the to-bet-set selection was different from the previous selection + if and only if the to-bet-set selection was different from the previous selection */ bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList); @@ -450,7 +450,7 @@ public: /// executes a control conversion slot for a given object bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId ); /** executes a control conversion slot for the current selection - @precond canConvertCurrentSelectionToControl( _nSlotId ) must return + @precond canConvertCurrentSelectionToControl( _nSlotId ) must return */ bool executeControlConversionSlot( sal_uInt16 _nSlotId ); /// checks whether the given slot id denotes a control conversion slot diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index b0f42a0e97ea..6ed0a8512158 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -460,7 +460,7 @@ namespace svxform one will be used. Else, an attempt is made to create an InteractionHandler is made. - @return + @return if and only if m_xInteractionHandler is valid when the method returns */ bool ensureInteractionHandler(); @@ -476,7 +476,7 @@ namespace svxform @param _rxNewControl The control which should replace the existent control. @return - if and only if the control was successfully replaced + if and only if the control was successfully replaced */ bool replaceControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl, @@ -552,15 +552,15 @@ namespace svxform valid. @param _rFirstInvalidityExplanation - if the method returns (i.e. if there is an invalid control), this string contains + if the method returns (i.e. if there is an invalid control), this string contains the explanation for the invalidity, as obtained from the validator. @param _rxFirstInvalidModel - if the method returns (i.e. if there is an invalid control), this contains + if the method returns (i.e. if there is an invalid control), this contains the control model @return - if and only if all controls belonging to our form are valid + if and only if all controls belonging to our form are valid */ bool checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index acead19ba9ee..67c76e9142b2 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -831,7 +831,7 @@ public: protected: virtual Window* getEventWindow() const; - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -871,15 +871,15 @@ protected: /** determines whether the text of this cell can be painted directly, without using the painter control - If this is , the PaintCell method will simply use the text as returned + If this is , the PaintCell method will simply use the text as returned by GetText, and draw it onto the device passed to PaintFieldToCell, while respecting the current alignment settings. - If this is , the PaintFieldToCell request will be forwarded to the painter + If this is , the PaintFieldToCell request will be forwarded to the painter control (m_pPainter). This is more expensive, but the only option if your painting involves more that a simple DrawText. - This member is by default, and can be modified by derived classes. + This member is by default, and can be modified by derived classes. */ sal_Bool m_bFastPaint; @@ -947,7 +947,7 @@ public: virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -999,7 +999,7 @@ public: protected: virtual Window* getEventWindow() const; - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; //================================================================== @@ -1051,7 +1051,7 @@ public: virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); DECL_LINK( OnDoubleClick, void* ); }; @@ -1096,7 +1096,7 @@ public: virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; //================================================================== -- cgit From 94eae11e9ee5956df320078b759ad86459df6694 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 14 Jan 2011 11:20:36 +0100 Subject: removetooltypes01: #i112600# fix TRUE/FALSE autodoc tags --- svx/source/inc/filtnav.hxx | 2 +- svx/source/inc/fmpgeimp.hxx | 2 +- svx/source/inc/fmshimp.hxx | 8 ++++---- svx/source/inc/formcontroller.hxx | 10 +++++----- svx/source/inc/gridcell.hxx | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 10a290cd2b04..df4e2b8559a6 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -318,7 +318,7 @@ private: @param _pTargetItems The target where to insert the items. @param _bCopy - If the items will not be removed from the model, otherwise they will. + If the items will not be removed from the model, otherwise they will. */ void insertFilterItem(const ::std::vector& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False); SvLBoxEntry* getPrevEntry(SvLBoxEntry* _pStartWith = NULL); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6f3e37e96c3a..755c754853dc 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -150,7 +150,7 @@ private: If xCurrentForm is not valid anymore, it is reset to . @return - if and only if xCurrentForm is valid. + if and only if xCurrentForm is valid. @since #i40086# */ diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 73956dc2925c..73fe666c3528 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -364,7 +364,7 @@ protected: ::std::vector< String >& _out_rNames ); /** checks whether the instance is already disposed, if so, this is reported as assertion error (debug - builds only) and is returned. + builds only) and is returned. */ bool impl_checkDisposed() const; @@ -383,7 +383,7 @@ public: /** announces a new "current selection" @return - if and only if the to-bet-set selection was different from the previous selection + if and only if the to-bet-set selection was different from the previous selection */ bool setCurrentSelection( const InterfaceBag& _rSelection ); @@ -397,7 +397,7 @@ public: /** sets a new current selection as indicated by a mark list @return - if and only if the to-bet-set selection was different from the previous selection + if and only if the to-bet-set selection was different from the previous selection */ bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList); @@ -450,7 +450,7 @@ public: /// executes a control conversion slot for a given object bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId ); /** executes a control conversion slot for the current selection - @precond canConvertCurrentSelectionToControl( _nSlotId ) must return + @precond canConvertCurrentSelectionToControl( _nSlotId ) must return */ bool executeControlConversionSlot( sal_uInt16 _nSlotId ); /// checks whether the given slot id denotes a control conversion slot diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 6ed0a8512158..b0f42a0e97ea 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -460,7 +460,7 @@ namespace svxform one will be used. Else, an attempt is made to create an InteractionHandler is made. - @return + @return if and only if m_xInteractionHandler is valid when the method returns */ bool ensureInteractionHandler(); @@ -476,7 +476,7 @@ namespace svxform @param _rxNewControl The control which should replace the existent control. @return - if and only if the control was successfully replaced + if and only if the control was successfully replaced */ bool replaceControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl, @@ -552,15 +552,15 @@ namespace svxform valid. @param _rFirstInvalidityExplanation - if the method returns (i.e. if there is an invalid control), this string contains + if the method returns (i.e. if there is an invalid control), this string contains the explanation for the invalidity, as obtained from the validator. @param _rxFirstInvalidModel - if the method returns (i.e. if there is an invalid control), this contains + if the method returns (i.e. if there is an invalid control), this contains the control model @return - if and only if all controls belonging to our form are valid + if and only if all controls belonging to our form are valid */ bool checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 67c76e9142b2..cde1533eca46 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -871,15 +871,15 @@ protected: /** determines whether the text of this cell can be painted directly, without using the painter control - If this is , the PaintCell method will simply use the text as returned + If this is , the PaintCell method will simply use the text as returned by GetText, and draw it onto the device passed to PaintFieldToCell, while respecting the current alignment settings. - If this is , the PaintFieldToCell request will be forwarded to the painter + If this is , the PaintFieldToCell request will be forwarded to the painter control (m_pPainter). This is more expensive, but the only option if your painting involves more that a simple DrawText. - This member is by default, and can be modified by derived classes. + This member is by default, and can be modified by derived classes. */ sal_Bool m_bFastPaint; -- cgit