summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/svl/hint.hxx18
-rw-r--r--include/svl/inethist.hxx9
-rw-r--r--include/svl/itemset.hxx2
-rw-r--r--include/svl/poolitem.hxx9
-rw-r--r--include/svtools/ruler.hxx2
-rw-r--r--include/svx/fmtools.hxx2
-rw-r--r--include/svx/ruler.hxx2
-rw-r--r--include/tools/debug.hxx12
8 files changed, 26 insertions, 30 deletions
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 70df0743b47a..4aec70090c54 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -28,24 +28,6 @@ public:
};
-
-#define DECL_PTRHINT(Visibility, Name, Type) \
- class Visibility Name: public SfxHint \
- { \
- Type* pObj; \
- \
- public: \
- explicit Name( Type* Object ); \
- virtual ~Name(); \
- \
- Type* GetObject() const { return pObj; } \
- }
-
-#define IMPL_PTRHINT(Name, Type) \
- Name::Name( Type* pObject ) { pObj = pObject; } \
- Name::~Name() {}
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index b54f8dc426ff..3fcca5eb0d49 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -107,7 +107,14 @@ public:
};
// broadcasted from PutUrl().
-DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject);
+class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint
+{
+ const INetURLObject* pObj;
+public:
+ explicit INetURLHistoryHint( const INetURLObject* Object ) : pObj(Object) {}
+ virtual ~INetURLHistoryHint() {}
+ const INetURLObject* GetObject() const { return pObj; }
+};
#endif // INCLUDED_SVL_INETHIST_HXX
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 75f725000569..f706e42fe01a 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -66,7 +66,7 @@ protected:
// Notification-Callback
virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew );
- int PutDirect(const SfxPoolItem &rItem);
+ void PutDirect(const SfxPoolItem &rItem);
public:
SfxItemSet( const SfxItemSet& );
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 8857002b69ca..4cd3c88947e4 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -339,7 +339,14 @@ public:
};
-DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem);
+class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint
+{
+ SfxPoolItem* pObj;
+public:
+ explicit SfxPoolItemHint( SfxPoolItem* Object ) : pObj(Object) {}
+ virtual ~SfxPoolItemHint() {}
+ SfxPoolItem* GetObject() const { return pObj; }
+};
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 0f9f68359533..97c446c4271c 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -718,7 +718,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- virtual long StartDrag();
+ virtual bool StartDrag();
virtual void Drag();
virtual void EndDrag();
virtual void Click();
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 06b8a329a334..0784991ee8f7 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -142,7 +142,7 @@ public:
bool moveToBookmark(const css::uno::Any& bookmark) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); }
bool moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveRelativeToBookmark(bookmark, rows); }
sal_Int32 compareBookmarks(const css::uno::Any& lhs, const css::uno::Any& rhs) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->compareBookmarks(lhs, rhs); }
- sal_Int32 hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); }
+ bool hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); }
sal_Int32 hashBookmark(const css::uno::Any& bookmark) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hashBookmark(bookmark); }
// css::sdbc::XResultSet
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 007f4d89c378..e82af688ef47 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -212,7 +212,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
protected:
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
virtual void Click() SAL_OVERRIDE;
- virtual long StartDrag() SAL_OVERRIDE;
+ virtual bool StartDrag() SAL_OVERRIDE;
virtual void Drag() SAL_OVERRIDE;
virtual void EndDrag() SAL_OVERRIDE;
virtual void ExtraDown() SAL_OVERRIDE;
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index 4b0ee11434d9..b6e2f627fd07 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -69,31 +69,31 @@ inline void DbgSaveData( const DbgData& rData )
DbgFunc( DBG_FUNC_SAVEDATA, (void*)&rData );
}
-inline sal_uIntPtr DbgIsResource()
+inline bool DbgIsResource()
{
DbgData* pData = DbgGetData();
if ( pData )
return pData->nTestFlags & DBG_TEST_RESOURCE;
else
- return sal_False;
+ return false;
}
-inline sal_uIntPtr DbgIsDialog()
+inline bool DbgIsDialog()
{
DbgData* pData = DbgGetData();
if ( pData )
return pData->nTestFlags & DBG_TEST_DIALOG;
else
- return sal_False;
+ return false;
}
-inline sal_uIntPtr DbgIsBoldAppFont()
+inline bool DbgIsBoldAppFont()
{
DbgData* pData = DbgGetData();
if ( pData )
return pData->nTestFlags & DBG_TEST_BOLDAPPFONT;
else
- return sal_False;
+ return false;
}
inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc )
generated by cgit (git 2.34.1) at 2025-02-10 15:35:59 +0000