[Libreoffice-commits] .: sfx2/inc svx/inc
Gert Faller
gfaller at kemper.freedesktop.org
Sun Dec 12 01:46:53 PST 2010
sfx2/inc/sfx2/childwin.hxx | 14 +++++++-------
sfx2/inc/sfx2/mnuitem.hxx | 2 +-
sfx2/inc/sfx2/msg.hxx | 4 ++--
sfx2/inc/sfx2/shell.hxx | 2 +-
sfx2/inc/sfx2/tbxctrl.hxx | 4 ++--
sfx2/inc/sfx2/viewsh.hxx | 2 +-
sfx2/inc/stbitem.hxx | 2 +-
svx/inc/svx/svdmodel.hxx | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit e1e3dffe7df0b9b367bcf4c0c6e90414817926b5
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Dec 12 10:46:36 2010 +0100
cleaning of __EXPORT define
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index 78254a2..f3e058a 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -262,7 +262,7 @@ public:
//! demn"achst hinf"allig !
#define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \
- SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
SfxChildWindowContext *pContext = new Class(pParent, \
@@ -282,7 +282,7 @@ public:
// CreateImpl mu\s noch als Parameter die Factory mitbekommen wg. ContextId
// Solange wird diese Id auf 0 gesetzt und in SfxChildWindow::CreateContext gepatched
#define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \
- SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\
@@ -307,7 +307,7 @@ public:
SFX_IMPL_POS_CHILDWINDOW(Class, MyID, CHILDWIN_NOPOS)
#define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \
- SfxChildWindow* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindow* Class::CreateImpl( ::Window *pParent, \
sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
@@ -326,7 +326,7 @@ public:
#define SFX_IMPL_FLOATINGWINDOW(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo ); \
@@ -334,7 +334,7 @@ public:
#define SFX_IMPL_MODELESSDIALOG(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxModelessDialog*)GetWindow())->FillInfo( aInfo ); \
@@ -342,7 +342,7 @@ public:
#define SFX_IMPL_DOCKINGWINDOW(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxDockingWindow*)GetWindow())->FillInfo( aInfo ); \
@@ -350,7 +350,7 @@ public:
#define SFX_IMPL_TOOLBOX(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxToolbox*)GetWindow())->FillInfo( aInfo ); \
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 617ab7f..82e74fc 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -148,7 +148,7 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \
- SfxMenuControl* __EXPORT Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
+ SfxMenuControl* Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
{ return new Class(nId, rMenu, rBindings); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 778aa08..997a033 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -76,14 +76,14 @@ class SfxRequest;
class SfxItemSet;
#define SFX_EXEC_STUB( aShellClass, aExecMethod) \
- void __EXPORT SfxStub##aShellClass##aExecMethod( \
+ void SfxStub##aShellClass##aExecMethod( \
SfxShell *pShell, SfxRequest& rReq) \
{ \
(( aShellClass* ) pShell )->aExecMethod( rReq ); \
}
#define SFX_STATE_STUB( aShellClass, aStateMethod) \
- void __EXPORT SfxStub##aShellClass##aStateMethod( \
+ void SfxStub##aShellClass##aStateMethod( \
SfxShell *pShell, SfxItemSet& rSet) \
{ \
(( aShellClass* ) pShell )->aStateMethod( rSet ); \
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 24bdb80..ab8afd5 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -323,7 +323,7 @@ inline void SfxShell::SetPool
\
SfxInterface* Class::pInterface = 0; \
const SfxFormalArgument* Class::pSfxFormalArgs_Impl = a##Class##Args_Impl;\
- SfxInterface* __EXPORT Class::GetStaticInterface() \
+ SfxInterface* Class::GetStaticInterface() \
{ \
if ( !pInterface ) \
{ \
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 61b522f..0c792d0 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -298,14 +298,14 @@ public:
};
#define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx ); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
#define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx, Arg); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 37da5c0..1288661 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -126,7 +126,7 @@ public: \
#define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \
SfxViewFactory* Class::pFactory; \
- SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
+ SfxViewShell* Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
{ return new Class(pFrame, pOldView); } \
void Class::RegisterFactory( USHORT nPrio ) \
{ \
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx
index 33296db..a2feb61 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/stbitem.hxx
@@ -139,7 +139,7 @@ public:
static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \
- SfxStatusBarControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
+ SfxStatusBarControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
{ return new Class( nSlotId, nId, rStb ); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 9ecf000..d375baf 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -620,7 +620,7 @@ public:
// Hier kann die Applikation einen Handler setzen, der die auflaufenden
// UndoActions einsammelt. Der Handler hat folgendes Aussehen:
- // void __EXPORT NotifyUndoActionHdl(SfxUndoAction* pUndoAction);
+ // void NotifyUndoActionHdl(SfxUndoAction* pUndoAction);
// Beim Aufruf des Handlers findet eine Eigentumsuebereignung statt; die
// UndoAction gehoert somit dem Handler, nicht mehr dem SdrModel.
void SetNotifyUndoActionHdl(const Link& rLink) { aUndoLink=rLink; }
@@ -642,7 +642,7 @@ public:
// Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen
// wird und ungefaehre Auskunft ueber den Fortschreitungszustand der
// Funktion gibt. Der Handler muss folgendes Aussehen haben:
- // void __EXPORT class::IOProgressHdl(const USHORT& nPercent);
+ // void class::IOProgressHdl(const USHORT& nPercent);
// Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte
// mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99.
// Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei
More information about the Libreoffice-commits
mailing list