summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/core/tool/detfunc.cxx8
-rw-r--r--sc/source/filter/excel/fontbuff.cxx15
-rw-r--r--sc/source/ui/app/inputwin.cxx54
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx12
-rw-r--r--sc/source/ui/drawfunc/fumark.cxx8
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx8
-rw-r--r--sc/source/ui/inc/acredlin.hxx7
-rw-r--r--sc/source/ui/inc/filtdlg.hxx7
-rw-r--r--sc/source/ui/inc/highred.hxx7
-rw-r--r--sc/source/ui/inc/inputwin.hxx10
-rw-r--r--sc/source/ui/inc/namedlg.hxx7
-rw-r--r--sc/source/ui/inc/navipi.hxx12
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx14
-rw-r--r--sc/source/ui/navipi/navipi.cxx74
-rw-r--r--sc/source/ui/view/hdrcont.cxx8
-rw-r--r--sc/source/ui/view/prevwsh.cxx9
-rw-r--r--sc/source/ui/view/tabview.cxx29
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx9
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx9
19 files changed, 41 insertions, 266 deletions
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index f1e3ca9360e2..f2542b0ac2dc 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: detfunc.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: nn $ $Date: 2001-03-02 21:09:53 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:39:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -248,11 +248,7 @@ ScCommentData::ScCommentData( ScDocument* pDoc, SdrModel* pModel ) :
aCaptionSet.Put( XLineStartWidthItem( 200 ) );
aCaptionSet.Put( XLineStartCenterItem( FALSE ) );
aCaptionSet.Put( XFillStyleItem( XFILL_SOLID ) );
-#ifdef VCL
Color aYellow( 255,255,192 ); // hellgelb
-#else
- Color aYellow( 65535,65535,49152 ); // hellgelb
-#endif
aCaptionSet.Put( XFillColorItem( String(), aYellow ) );
// shadow
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 107350f187e8..679194871327 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fontbuff.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: gt $ $Date: 2001-08-13 10:53:10 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:39:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -213,10 +213,6 @@ static const ColBuffEntry pDefArrayBiff8[] = {
};
-#ifndef VCL
-const UINT16 ColorBuffer::nColCorrect = 257;
-#endif
-
const UINT16 ColorBuffer::nIndCorrect = 8;
const UINT16 LotusFontBuffer::nSize = 8;
@@ -269,14 +265,7 @@ BOOL ColorBuffer::NewColor( UINT16 nR, UINT16 nG, UINT16 nB )
{
if( nCount < nMax )
{
-#ifdef VCL
pArray[ nCount ] = new SvxColorItem( Color( ( UINT8 ) nR, ( UINT8 ) nG, ( UINT8 ) nB) );
-#else
- pArray[ nCount ] = new SvxColorItem( Color(
- nR * nColCorrect,
- nG * nColCorrect,
- nB * nColCorrect ) );
-#endif
nCount++;
return TRUE;
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1f51d9a2d3e1..a03fc19fbe71 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inputwin.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: nn $ $Date: 2001-08-03 15:50:05 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:33:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1272,12 +1272,8 @@ void ScPosWnd::DoEnter()
ReleaseFocus_Impl();
}
-#ifdef VCL
-
long __EXPORT ScPosWnd::Notify( NotifyEvent& rNEvt )
{
- // VCL geht ohne Acceleratoren - AccelSelectHdl kann demnaechst raus
-
ComboBox::Notify( rNEvt );
long nHandled = 0;
@@ -1303,52 +1299,6 @@ long __EXPORT ScPosWnd::Notify( NotifyEvent& rNEvt )
return nHandled;
}
-#else
-
-void __EXPORT ScPosWnd::GetFocus()
-{
- DBG_ASSERT( !pAccel, "Accelerator not deleted!" );
- pAccel = new Accelerator;
- pAccel->InsertItem( 1, KeyCode( KEY_RETURN ) );
- pAccel->InsertItem( 2, KeyCode( KEY_ESCAPE ) );
- pAccel->PushSelectHdl( LINK( this, ScPosWnd, AccelSelectHdl ) );
-
- Application::InsertAccel( pAccel, ACCEL_ALWAYS );
-}
-
-void __EXPORT ScPosWnd::LoseFocus()
-{
- DBG_ASSERT( pAccel, "Accelerator not found!" );
- Application::RemoveAccel( pAccel );
- delete pAccel;
- pAccel = NULL;
-}
-
-#endif
-
-IMPL_LINK( ScPosWnd, AccelSelectHdl, Accelerator *, pAccel )
-{
- if ( !pAccel )
- return 0;
-
- switch ( pAccel->GetCurKeyCode().GetCode() )
- {
- case KEY_RETURN:
- DoEnter();
- break;
-
- case KEY_ESCAPE:
- if (!bFormulaMode)
- SetText( aPosStr );
- ReleaseFocus_Impl();
- break;
-
- default:
- break;
- }
- return TRUE;
-}
-
void ScPosWnd::ReleaseFocus_Impl()
{
SfxViewShell* pCurSh = SfxViewShell::Current();
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 719f0d0b0e8c..cdeabcd8244b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fudraw.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:37:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -352,11 +352,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
if ( !pView->IsAction() )
{
-#ifdef VCL
Point aPosPixel = pWindow->GetPointerPosPixel();
-#else
- Point aPosPixel = pWindow->ScreenToOutputPixel( Pointer::GetPosPixel() );
-#endif
BOOL bAlt = pMEvt && pMEvt->IsMod2();
Point aPnt = pWindow->PixelToLogic( aPosPixel );
SdrHdl* pHdl = pView->HitHandle(aPnt, *pWindow);
@@ -389,11 +385,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
}
else if ( IsDetectiveHit( aPnt ) )
-#ifdef VCL
pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
-#else
- pViewShell->SetActivePointer( ScResId( RID_SCPTR_DETECTIVE ) );
-#endif
else
pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin?
}
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 5da84f712551..d522b6b5579a 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fumark.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:37:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -315,11 +315,7 @@ void FuMarkRect::Deactivate()
void FuMarkRect::ForcePointer(const MouseEvent* pMEvt)
{
-#ifdef VCL
pViewShell->SetActivePointer( Pointer( POINTER_CHART ) );
-#else
- pViewShell->SetActivePointer( ScResId( RID_SCPTR_CHART ) );
-#endif
}
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index b48b061ff249..fca5adc5d0cb 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fupoor.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:37:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -382,11 +382,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, pTimer )
{
-#ifdef VCL
Point aPosPixel = pWindow->GetPointerPosPixel();
-#else
- Point aPosPixel = pWindow->ScreenToOutputPixel( Pointer::GetPosPixel() );
-#endif
MouseMove(MouseEvent(aPosPixel));
return 0;
}
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 034a53d379a6..92651fc7c8a3 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: acredlin.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2001-03-14 14:34:29 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,9 +62,6 @@
#ifndef SC_ACREDLIN_HXX
#define SC_ACREDLIN_HXX
-#ifndef VCL
-#endif
-
#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
#endif
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 016fe7e0f336..01ae11926d2b 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: filtdlg.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dr $ $Date: 2001-05-21 09:22:55 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,9 +62,6 @@
#ifndef SC_FILTDLG_HXX
#define SC_FILTDLG_HXX
-#ifndef VCL
-#endif
-
#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
#endif
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 985d09e3478e..af2a30650a75 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: highred.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dr $ $Date: 2001-06-11 13:33:00 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,9 +62,6 @@
#ifndef SC_HIGHRED_HXX
#define SC_HIGHRED_HXX
-#ifndef VCL
-#endif
-
#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
#endif
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 04a07c491026..a7f1d37436fa 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inputwin.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mba $ $Date: 2001-06-11 08:29:22 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -160,12 +160,7 @@ public:
protected:
virtual void Select();
-#ifdef VCL
virtual long Notify( NotifyEvent& rNEvt );
-#else
- virtual void GetFocus();
- virtual void LoseFocus();
-#endif
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
@@ -176,7 +171,6 @@ private:
void DoEnter();
void ReleaseFocus_Impl();
- DECL_LINK( AccelSelectHdl, Accelerator * );
};
//========================================================================
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 5d6451e6671f..81e9606afbc8 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: namedlg.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dr $ $Date: 2001-05-17 15:18:39 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,9 +62,6 @@
#ifndef SC_NAMEDLG_HXX
#define SC_NAMEDLG_HXX
-#ifndef VCL
-#endif
-
#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
#endif
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 53769d269f76..7b5efab97a71 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: navipi.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: nn $ $Date: 2001-07-02 14:09:10 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -178,11 +178,7 @@ public:
void SetCol( USHORT nColNo );
protected:
-#ifdef VCL
virtual long Notify( NotifyEvent& rNEvt );
-#else
- virtual void KeyInput( const KeyEvent& rKEvt );
-#endif
virtual void LoseFocus();
virtual void Up();
virtual void Down();
@@ -215,11 +211,7 @@ public:
void SetRow( USHORT nRow ){ SetValue( nRow ); }
protected:
-#ifdef VCL
virtual long Notify( NotifyEvent& rNEvt );
-#else
- virtual void KeyInput( const KeyEvent& rKEvt );
-#endif
virtual void LoseFocus();
private:
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index aad4326c70a0..f50ed424267a 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: anyrefdg.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: nn $ $Date: 2001-07-05 14:12:33 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:36:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -823,16 +823,10 @@ void ScAnyRefDlg::RefInputStart( ScRefEdit* pEdit, ScRefButton* pButton )
{
pHiddenMarks[i] = FALSE;
Window* pWin = GetChild(i);
-#ifdef VCL
pWin = pWin->GetWindow( WINDOW_CLIENT );
-#endif
if (pWin == (Window*)pRefEdit)
{
-#ifdef VCL
sNewDialogText += GetChild(i-1)->GetWindow( WINDOW_CLIENT )->GetText();
-#else
- sNewDialogText += GetChild(i-1)->GetText();
-#endif
}
else if (pWin == (Window*)pRefBtn)
; // do nothing
@@ -914,11 +908,7 @@ void ScAnyRefDlg::RefInputDone( BOOL bForced )
for ( USHORT i = 0; i < nChildren; i++ )
if (pHiddenMarks[i])
{
-#ifdef VCL
GetChild(i)->GetWindow( WINDOW_CLIENT )->Show();
-#else
- GetChild(i)->Show();
-#endif
}
delete [] pHiddenMarks;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index a322ea8e5eef..3ab878322a67 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: navipi.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: nn $ $Date: 2001-07-02 14:08:13 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:38:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -141,8 +141,6 @@ __EXPORT ColumnEdit::~ColumnEdit()
//------------------------------------------------------------------------
-#ifdef VCL
-
long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt )
{
SpinField::Notify( rNEvt );
@@ -174,53 +172,6 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt )
return nHandled;
}
-#else
-
-void __EXPORT ColumnEdit::KeyInput( const KeyEvent& rKEvt )
-{
- KeyCode aCode = rKEvt.GetKeyCode();
- USHORT nGroup = aCode.GetGroup();
- USHORT nLen = GetText().Len();
- BOOL bSel = (GetSelection().Len() > 0);
-
- if ( aCode.IsMod1() || aCode.IsMod2() )
- {
- SpinField::KeyInput( rKEvt );
- }
- else if ( aCode == KEY_RETURN )
- {
- ScNavigatorDlg::ReleaseFocus();
- ExecuteCol();
- }
- else if ( nGroup == KEYGROUP_NUM || nGroup == KEYGROUP_ALPHA )
- {
- if ( nLen == 0 || bSel ) // neue Eingabe: nur KeyGroup merken
- {
- nKeyGroup = nGroup;
- ReplaceSelected( rKEvt.GetCharCode() );
- }
- else
- {
- // Abhaengig von aktueller Gruppe und Laenge Eingabe zulassen
-
- if ( nKeyGroup == KEYGROUP_NUM && nGroup == KEYGROUP_NUM )
- {
- if ( nLen < 3 )
- SpinField::KeyInput( rKEvt );
- }
- else if ( nKeyGroup == KEYGROUP_ALPHA && nGroup == KEYGROUP_ALPHA )
- {
- if ( nLen < 2 )
- SpinField::KeyInput( rKEvt );
- }
- }
- }
- else
- SpinField::KeyInput( rKEvt );
-}
-
-#endif
-
//------------------------------------------------------------------------
void __EXPORT ColumnEdit::LoseFocus()
@@ -423,8 +374,6 @@ __EXPORT RowEdit::~RowEdit()
//------------------------------------------------------------------------
-#ifdef VCL
-
long __EXPORT RowEdit::Notify( NotifyEvent& rNEvt )
{
NumericField::Notify( rNEvt );
@@ -445,25 +394,6 @@ long __EXPORT RowEdit::Notify( NotifyEvent& rNEvt )
return nHandled;
}
-#else
-
-void __EXPORT RowEdit::KeyInput( const KeyEvent& rKEvt )
-{
- KeyCode aCode = rKEvt.GetKeyCode();
-
- if ( aCode.IsMod1() || aCode.IsMod2() || aCode != KEY_RETURN )
- {
- NumericField::KeyInput( rKEvt );
- }
- else // if ( rKEvt.GetKeyCode() == KEY_RETURN )
- {
- ScNavigatorDlg::ReleaseFocus();
- ExecuteRow();
- }
-}
-
-#endif
-
//------------------------------------------------------------------------
void __EXPORT RowEdit::LoseFocus()
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 52f24f4f1159..14a4ae69c833 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hdrcont.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2001-04-18 10:42:15 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:34:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -744,11 +744,7 @@ void ScHeaderControl::ShowDragHelp()
Point aPos = OutputToScreenPixel( Point(0,0) );
Size aSize = GetSizePixel();
-#ifdef VCL
Point aMousePos = OutputToScreenPixel(GetPointerPosPixel());
-#else
- Point aMousePos = Pointer::GetPosPixel();
-#endif
Rectangle aRect;
USHORT nAlign;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index e0f9c3a607f1..ca98452ed753 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: prevwsh.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: nn $ $Date: 2001-06-08 12:44:08 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:34:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -424,12 +424,7 @@ PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent )
const long nCurPage = pPreview->GetPageNo()+1;
const long nDocPageMax = pPreview->GetTotalPages();
-#ifndef VCL
- PrintDialog* pDlg = new PrintDialog( pParent,
- WinBits(WB_SVLOOK|WB_STDMODAL) );
-#else
PrintDialog* pDlg = new PrintDialog( pParent );
-#endif
// wenn zu langsam wieder einbauen
// if ( pPreview->AllTested() )
// nPageMax = pPreview->GetTotalPages();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 9f7fcaddbb27..12cc7824fe10 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabview.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: nn $ $Date: 2001-08-24 12:35:14 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:34:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1019,18 +1019,7 @@ void ScTabView::SetActivePointer( const Pointer& rPointer )
void ScTabView::SetActivePointer( const ResId& rId )
{
-#ifdef VCL
DBG_ERRORFILE( "keine Pointer mit ResId!" );
-#else
- for (USHORT i=0; i<4; i++)
- if (pGridWin[i])
- pGridWin[i]->SetPointer( rId );
-
-/* ScSplitPos ePos = aViewData.GetActivePart();
- if (pGridWin[ePos])
- pGridWin[ePos]->SetPointer( rId );
-*/
-#endif
}
void ScTabView::ActiveGrabFocus()
@@ -1213,11 +1202,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
if (Help::IsQuickHelpEnabled())
{
-#ifdef VCL
Point aMousePos = pScroll->OutputToScreenPixel(pScroll->GetPointerPosPixel());
-#else
- Point aMousePos = Pointer::GetPosPixel();
-#endif
long nScrollMin = 0; // RangeMin simulieren
if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight )
nScrollMin = aViewData.GetFixPosX();
@@ -1381,10 +1366,9 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
// nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl.
// mit schon geaenderter Pos. gepainted werden -
// darum vorher einmal Update am Col-/RowBar
-#ifdef VCL
+
if (pColBar[eWhich])
pColBar[eWhich]->Update();
-#endif
long nOldPos = aViewData.GetScrPos( nTrackX, 0, eWhich ).X();
aViewData.SetPosX( eWhich, (USHORT) nNewX );
@@ -1476,10 +1460,9 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
#ifdef MAC
pGridWin[SC_SPLIT_BOTTOMLEFT]->Update();
#endif
-#ifdef VCL
+
if (pRowBar[eWhich])
pRowBar[eWhich]->Update();
-#endif
long nOldPos = aViewData.GetScrPos( 0, nTrackY, eWhich ).Y();
aViewData.SetPosY( eWhich, (USHORT) nNewY );
@@ -1593,9 +1576,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const USHORT* pPos
RepeatResize();
// auf VCL gibt's Update ohne Ende (jedes Update gilt fuer alle Fenster)
-#ifndef VCL
- aCornerButton.Update(); // der bekommt sonst nie ein Update
-#endif
+ //aCornerButton.Update(); // der bekommt sonst nie ein Update
bInUpdateHeader = FALSE;
}
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index fdbd141f2613..068828835425 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabvwsh3.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: er $ $Date: 2001-07-04 17:17:52 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:34:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,13 +77,8 @@
#include <svtools/ptitem.hxx>
#include <svtools/stritem.hxx>
-#ifdef VCL /* Comp.- Mode */
#include <vcl/msgbox.hxx>
#include <vcl/fonttype.hxx>
-#else
-#include <vcl/msgbox.hxx>
-#include <vcl/gdiobj.hxx>
-#endif
#include "globstr.hrc"
#include "scmod.hxx"
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 84d0eb709395..870936dea961 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabvwsh4.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: er $ $Date: 2001-09-05 12:24:52 $
+ * last change: $Author: nn $ $Date: 2001-09-24 17:34:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1044,12 +1044,7 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent )
SfxPrinter* pPrinter = GetPrinter();
String aStrRange;
-#ifndef VCL
- PrintDialog* pDlg = new PrintDialog( pParent,
- WinBits(WB_SVLOOK|WB_STDMODAL) );
-#else
PrintDialog* pDlg = new PrintDialog( pParent);
-#endif
USHORT i;
USHORT nTabCount = pDoc->GetTableCount();
long nDocPageMax = 0;
generated by cgit (git 2.34.1) at 2024-07-08 04:40:53 +0000