diff options
-rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 40 | ||||
-rw-r--r-- | sw/source/core/txtnode/atrflyin.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww1/fltshell.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/fldui/changedb.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/insrule.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/ribbar/drawbase.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/ribbar/inputwin.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/table/chartins.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewprt.cxx | 10 |
23 files changed, 71 insertions, 71 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 4cafe1110970..1ad830b919da 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -296,7 +296,7 @@ void SwVisCrsr::Hide() #ifdef SW_CRSR_TIMER -void __EXPORT SwVisCrsr::Timeout() +void SwVisCrsr::Timeout() { OSL_ENSURE( !bIsDragCrsr, "Timer vorher abschalten" ); if( bIsVisible ) diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index c76baa5e5b86..ee952ecdf97f 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -159,19 +159,19 @@ SwFlyDrawObj::~SwFlyDrawObj() |* *************************************************************************/ -UINT32 __EXPORT SwFlyDrawObj::GetObjInventor() const +UINT32 SwFlyDrawObj::GetObjInventor() const { return SWGInventor; } -UINT16 __EXPORT SwFlyDrawObj::GetObjIdentifier() const +UINT16 SwFlyDrawObj::GetObjIdentifier() const { return SwFlyDrawObjIdentifier; } -UINT16 __EXPORT SwFlyDrawObj::GetObjVersion() const +UINT16 SwFlyDrawObj::GetObjVersion() const { return SwDrawFirst; } @@ -520,7 +520,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const |* *************************************************************************/ -void __EXPORT SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const +void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const { rInfo.bSelectAllowed = rInfo.bMoveAllowed = rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = TRUE; @@ -551,38 +551,38 @@ void SwVirtFlyDrawObj::SetRect() const } -const Rectangle& __EXPORT SwVirtFlyDrawObj::GetCurrentBoundRect() const +const Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const { SetRect(); return aOutRect; } -const Rectangle& __EXPORT SwVirtFlyDrawObj::GetLastBoundRect() const +const Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const { return GetCurrentBoundRect(); } -void __EXPORT SwVirtFlyDrawObj::RecalcBoundRect() +void SwVirtFlyDrawObj::RecalcBoundRect() { SetRect(); } -void __EXPORT SwVirtFlyDrawObj::RecalcSnapRect() +void SwVirtFlyDrawObj::RecalcSnapRect() { SetRect(); } -const Rectangle& __EXPORT SwVirtFlyDrawObj::GetSnapRect() const +const Rectangle& SwVirtFlyDrawObj::GetSnapRect() const { SetRect(); return aOutRect; } -void __EXPORT SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) +void SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) { Rectangle aTmp( GetLastBoundRect() ); SetRect(); @@ -593,20 +593,20 @@ void __EXPORT SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) } -void __EXPORT SwVirtFlyDrawObj::NbcSetSnapRect(const Rectangle& ) +void SwVirtFlyDrawObj::NbcSetSnapRect(const Rectangle& ) { SetRect(); } -const Rectangle& __EXPORT SwVirtFlyDrawObj::GetLogicRect() const +const Rectangle& SwVirtFlyDrawObj::GetLogicRect() const { SetRect(); return aOutRect; } -void __EXPORT SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) +void SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) { Rectangle aTmp( GetLastBoundRect() ); SetRect(); @@ -617,7 +617,7 @@ void __EXPORT SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) } -void __EXPORT SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& ) +void SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& ) { SetRect(); } @@ -643,7 +643,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& ) |* *************************************************************************/ -void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz) +void SwVirtFlyDrawObj::NbcMove(const Size& rSiz) { MoveRect( aOutRect, rSiz ); const Point aOldPos( GetFlyFrm()->Frm().Pos() ); @@ -779,7 +779,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz) } -void __EXPORT SwVirtFlyDrawObj::NbcResize(const Point& rRef, +void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { ResizeRect( aOutRect, rRef, xFact, yFact ); @@ -881,7 +881,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcResize(const Point& rRef, } -void __EXPORT SwVirtFlyDrawObj::Move(const Size& rSiz) +void SwVirtFlyDrawObj::Move(const Size& rSiz) { NbcMove( rSiz ); SetChanged(); @@ -889,7 +889,7 @@ void __EXPORT SwVirtFlyDrawObj::Move(const Size& rSiz) } -void __EXPORT SwVirtFlyDrawObj::Resize(const Point& rRef, +void SwVirtFlyDrawObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { NbcResize( rRef, xFact, yFact ); @@ -898,14 +898,14 @@ void __EXPORT SwVirtFlyDrawObj::Resize(const Point& rRef, } -Pointer __EXPORT SwVirtFlyDrawObj::GetMacroPointer( +Pointer SwVirtFlyDrawObj::GetMacroPointer( const SdrObjMacroHitRec& ) const { return Pointer( POINTER_REFHAND ); } -bool __EXPORT SwVirtFlyDrawObj::HasMacro() const +bool SwVirtFlyDrawObj::HasMacro() const { const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL(); return rURL.GetMap() || rURL.GetURL().Len(); diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index bd765b43e937..547e391520f8 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -55,7 +55,7 @@ SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt ) { } -int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const +int SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return( pTxtAttr && ((SwFmtFlyCnt&)rAttr).pTxtAttr && @@ -63,7 +63,7 @@ int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const pFmt == ((SwFmtFlyCnt&)rAttr).GetFrmFmt() ); } -SfxPoolItem* __EXPORT SwFmtFlyCnt::Clone( SfxItemPool* ) const +SfxPoolItem* SwFmtFlyCnt::Clone( SfxItemPool* ) const { return new SwFmtFlyCnt( pFmt ); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 0a273d34a1f7..d2f460ed13a7 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -523,7 +523,7 @@ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ ) return 0; } -SvParserState __EXPORT SwHTMLParser::CallParser() +SvParserState SwHTMLParser::CallParser() { // einen temporaeren Index anlegen, auf Pos 0 so wird er nicht bewegt! pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() ); @@ -581,7 +581,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser() return eRet; } -void __EXPORT SwHTMLParser::Continue( int nToken ) +void SwHTMLParser::Continue( int nToken ) { #if OSL_DEBUG_LEVEL > 1 OSL_ENSURE( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" ); @@ -958,7 +958,7 @@ void SwHTMLParser::DocumentDetected() } // wird fuer jedes Token gerufen, das in CallParser erkannt wird -void __EXPORT SwHTMLParser::NextToken( int nToken ) +void SwHTMLParser::NextToken( int nToken ) { if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() ) || 1 == pDoc->getReferenceCount() ) diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 8ea2525b75d4..5656f7278acb 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -762,7 +762,7 @@ int SwFltAnchor::operator==(const SfxPoolItem& rItem) const return pFrmFmt == ((SwFltAnchor&)rItem).pFrmFmt; } -SfxPoolItem* __EXPORT SwFltAnchor::Clone(SfxItemPool*) const +SfxPoolItem* SwFltAnchor::Clone(SfxItemPool*) const { return new SwFltAnchor(*this); } @@ -879,7 +879,7 @@ int SwFltSection::operator==(const SfxPoolItem& rItem) const return m_pSection == ((SwFltSection&)rItem).m_pSection; } -SfxPoolItem* __EXPORT SwFltSection::Clone(SfxItemPool*) const +SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const { return new SwFltSection(*this); } diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 9ba0feff4c3c..75f27446cddb 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -181,7 +181,7 @@ __EXPORT SwParaDlg::~SwParaDlg() } -void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage) +void SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage) { SwWrtShell& rSh = rView.GetWrtShell(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 408c9df6379e..e8ea464701ee 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -147,7 +147,7 @@ __EXPORT SwCondCollPage::~SwCondCollPage() } -int __EXPORT SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) +int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) FillItemSet(*_pSet); @@ -160,7 +160,7 @@ Page: Factory ****************************************************************************/ -SfxTabPage* __EXPORT SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwCondCollPage(pParent, rSet); } @@ -170,7 +170,7 @@ Page: FillItemSet-Overload ****************************************************************************/ -BOOL __EXPORT SwCondCollPage::FillItemSet(SfxItemSet &rSet) +BOOL SwCondCollPage::FillItemSet(SfxItemSet &rSet) { BOOL bModified = TRUE; SwCondCollItem aCondItem; @@ -188,7 +188,7 @@ Page: Reset-Overload ****************************************************************************/ -void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) +void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) { if(bNewTemplate) aConditionCB.Enable(); @@ -231,7 +231,7 @@ void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) } -USHORT* __EXPORT SwCondCollPage::GetRanges() +USHORT* SwCondCollPage::GetRanges() { return aPageRg; } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 3de0abb8b5cf..2526ee82aa3f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -153,7 +153,7 @@ SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, return new SwLoadOptPage(pParent, rAttrSet ); } -BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) +BOOL SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { BOOL bRet = FALSE; SwModule* pMod = SW_MOD(); @@ -231,7 +231,7 @@ BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) return bRet; } -void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) +void SwLoadOptPage::Reset( const SfxItemSet& rSet) { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(FALSE); const SfxPoolItem* pItem; diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index e59868232826..f5129c827105 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -503,19 +503,19 @@ void SwEnvFmtPage::SetMinMax() aSizeHeightField.Reformat(); } -SfxTabPage* __EXPORT SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet) { return new SwEnvFmtPage(pParent, rSet); } -void __EXPORT SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) +void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); aSet.Put(GetParent()->aEnvItem); Reset(aSet); } -int __EXPORT SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) +int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet(*_pSet); @@ -546,14 +546,14 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem) } } -BOOL __EXPORT SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) +BOOL SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) { FillItem(GetParent()->aEnvItem); rSet.Put(GetParent()->aEnvItem); return TRUE; } -void __EXPORT SwEnvFmtPage::Reset(const SfxItemSet& rSet) +void SwEnvFmtPage::Reset(const SfxItemSet& rSet) { const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 4275bb362abe..afbe8d8e57e7 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -213,7 +213,7 @@ __EXPORT SwChangeDBDlg::~SwChangeDBDlg() /*-------------------------------------------------------------------- Beschreibung: Schliessen --------------------------------------------------------------------*/ -void __EXPORT SwChangeDBDlg::Apply() +void SwChangeDBDlg::Apply() { UpdateFlds(); } diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 143f9f225f37..268110c6c98d 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -88,7 +88,7 @@ __EXPORT SwFldDBPage::~SwFldDBPage() /*-------------------------------------------------------------------- Beschreibung: TabPage initialisieren --------------------------------------------------------------------*/ -void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) +void SwFldDBPage::Reset(const SfxItemSet&) { Init(); // Allgemeine initialisierung @@ -191,7 +191,7 @@ void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) } } -BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) +BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) { String sTableName, sColumnName; SwDBData aData; @@ -260,7 +260,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, +SfxTabPage* SwFldDBPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDBPage( pParent, rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 7efe4d911726..90a74e686801 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -99,7 +99,7 @@ __EXPORT SwFldDokInfPage::~SwFldDokInfPage() { } -void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& ) +void SwFldDokInfPage::Reset(const SfxItemSet& ) { Init(); // Allgemeine initialisierung @@ -429,7 +429,7 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) return nSize; } -BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) +BOOL SwFldDokInfPage::FillItemSet(SfxItemSet& ) { if (!pSelEntry || (USHORT)(ULONG)pSelEntry->GetUserData() == USHRT_MAX) return FALSE; @@ -466,7 +466,7 @@ BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, +SfxTabPage* SwFldDokInfPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokInfPage( pParent, rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 1796eca2ddbc..666e2d3085cf 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -90,7 +90,7 @@ __EXPORT SwFldDokPage::~SwFldDokPage() { } -void __EXPORT SwFldDokPage::Reset(const SfxItemSet& ) +void SwFldDokPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); Init(); // Allgemeine initialisierung @@ -553,7 +553,7 @@ IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) return 0; } -BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) +BOOL SwFldDokPage::FillItemSet(SfxItemSet& ) { BOOL bPage = FALSE; USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -647,7 +647,7 @@ BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) return FALSE; } -SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, +SfxTabPage* SwFldDokPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokPage( pParent, rAttrSet ) ); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 54cbd6a80ebf..e00695bdf1be 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -165,7 +165,7 @@ SwGlossaryGroupDlg::~SwGlossaryGroupDlg() } -void __EXPORT SwGlossaryGroupDlg::Apply() +void SwGlossaryGroupDlg::Apply() { if(aNewPB.IsEnabled()) NewHdl(&aNewPB); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index b536b4f3d651..c786f8372dab 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -59,7 +59,7 @@ static BOOL bFootnote = TRUE; Beschreibung: Einfuegen der Fussnote durch OK ------------------------------------------------------------------------*/ -void __EXPORT SwInsFootNoteDlg::Apply() +void SwInsFootNoteDlg::Apply() { String aStr; diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index d1cf53c4c55f..1d0dd0d8119b 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -119,7 +119,7 @@ SwRulerValueSet::~SwRulerValueSet() { } -void __EXPORT SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt ) +void SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Rectangle aRect = rUDEvt.GetRect(); OutputDevice* pDev = rUDEvt.GetDevice(); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 3919ea85f317..eb948ef50a10 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -125,7 +125,7 @@ SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItem return new SwLineNumberingPage( pParent, rSet ); } -void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& ) +void SwLineNumberingPage::Reset( const SfxItemSet& ) { const SwLineNumberInfo &rInf = pSh->GetLineNumberInfo(); IDocumentStylePoolAccess* pIDSPA = pSh->getIDocumentStylePoolAccess(); @@ -228,7 +228,7 @@ IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG ) return 0; } -BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& ) +BOOL SwLineNumberingPage::FillItemSet( SfxItemSet& ) { SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index e93c6f8258a8..45cac63bdf0a 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -511,7 +511,7 @@ void SwDrawBase::Activate(const USHORT nSlot) \************************************************************************/ -void __EXPORT SwDrawBase::Deactivate() +void SwDrawBase::Deactivate() { SdrView *pSdrView = m_pSh->GetDrawView(); pSdrView->SetOrtho(FALSE); diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index fd8c88f25dfe..6587755e5521 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -163,7 +163,7 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) //================================================================== -void __EXPORT SwInputWindow::Resize() +void SwInputWindow::Resize() { ToolBox::Resize(); @@ -340,7 +340,7 @@ IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG ) //================================================================== -void __EXPORT SwInputWindow::Click( ) +void SwInputWindow::Click( ) { USHORT nCurID = GetCurItemId(); EndSelection(); // setzt CurItemId zurueck ! @@ -519,7 +519,7 @@ void SwInputWindow::DelBoxCntnt() //================================================================== -void __EXPORT InputEdit::KeyInput(const KeyEvent& rEvent) +void InputEdit::KeyInput(const KeyEvent& rEvent) { const KeyCode aCode = rEvent.GetKeyCode(); if(aCode == KEY_RETURN || aCode == KEY_F2 ) @@ -532,7 +532,7 @@ void __EXPORT InputEdit::KeyInput(const KeyEvent& rEvent) //================================================================== -void __EXPORT InputEdit::UpdateRange(const String& rBoxes, +void InputEdit::UpdateRange(const String& rBoxes, const String& rName ) { if( !rBoxes.Len() ) @@ -650,7 +650,7 @@ __EXPORT SwInputChild::~SwInputChild() } -SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const +SfxChildWinInfo SwInputChild::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ return aInfo; diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 928635f89c45..86ab912b2a91 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -266,7 +266,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) } -void __EXPORT AutoEdit::KeyInput( const KeyEvent& rEvt ) +void AutoEdit::KeyInput( const KeyEvent& rEvt ) { USHORT nCode = rEvt.GetKeyCode().GetCode(); if( nCode != KEY_SPACE ) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 46eaddef7809..d3e0694e129f 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -892,7 +892,7 @@ void AutoFmtPreview::PaintCells() //------------------------------------------------------------------------ -void __EXPORT AutoFmtPreview::Init() +void AutoFmtPreview::Init() { SetBorderStyle( GetBorderStyle() | WINDOW_BORDER_MONO ); maArray.Initialize( 5, 5 ); @@ -1021,7 +1021,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) //------------------------------------------------------------------------ -void __EXPORT AutoFmtPreview::Paint( const Rectangle& rRect ) +void AutoFmtPreview::Paint( const Rectangle& rRect ) { DoPaint( rRect ); } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 447405a634b8..c3aa03c74dcb 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -484,7 +484,7 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq ) return bReturn; } -void __EXPORT SwView::Execute(SfxRequest &rReq) +void SwView::Execute(SfxRequest &rReq) { USHORT nSlot = rReq.GetSlot(); const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index d0e25c2071c4..4123c303717f 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -95,7 +95,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- Beschreibung: Drucker an Sfx uebergeben --------------------------------------------------------------------*/ -SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate ) +SfxPrinter* SwView::GetPrinter( BOOL bCreate ) { const IDocumentDeviceAccess* pIDDA = GetWrtShell().getIDocumentDeviceAccess(); SfxPrinter *pOld = pIDDA->getPrinter( false ); @@ -131,7 +131,7 @@ void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb ) } } -USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) +USHORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) { SwWrtShell &rSh = GetWrtShell(); SfxPrinter* pOld = rSh.getIDocumentDeviceAccess()->getPrinter( false ); @@ -170,7 +170,7 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) /*-------------------------------------------------------------------- Beschreibung: TabPage fuer applikationsspezifische Druckoptionen --------------------------------------------------------------------*/ -SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, +SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent, const SfxItemSet& rSet) { return ::CreatePrintOptionsPage( pParent, rSet, FALSE ); @@ -196,7 +196,7 @@ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) return pDlg; } -PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent ) +PrintDialog* SwView::CreatePrintDialog( Window* pParent ) { // AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden, // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie @@ -207,7 +207,7 @@ PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent ) /*-------------------------------------------------------------------- Beschreibung: Print-Dispatcher --------------------------------------------------------------------*/ -void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) +void SwView::ExecutePrint(SfxRequest& rReq) { BOOL bWeb = 0 != PTR_CAST(SwWebView, this); ::SetAppPrintOptions( &GetWrtShell(), bWeb ); |