[Libreoffice-commits] .: svx/source vcl/source
Takeshi Abe
tabe at kemper.freedesktop.org
Wed Oct 26 09:31:33 PDT 2011
svx/source/form/filtnav.cxx | 1
svx/source/unodraw/unoshape.cxx | 4 -
vcl/source/control/field.cxx | 20 --------
vcl/source/gdi/cvtsvm.cxx | 93 ----------------------------------------
vcl/source/window/dockmgr.cxx | 2
vcl/source/window/toolbox.cxx | 8 ---
vcl/source/window/window.cxx | 79 ---------------------------------
7 files changed, 207 deletions(-)
New commits:
commit 87597b5d3d021be52f80639ef0487cf35a91ba85
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Oct 27 01:24:48 2011 +0900
removed dead code
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 2acbc95..67f2645 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -70,7 +70,6 @@
#include <functional>
-#define SYNC_DELAY 200
#define DROP_ACTION_TIMER_INITIAL_TICKS 10
// solange dauert es, bis das Scrollen anspringt
#define DROP_ACTION_TIMER_SCROLL_TICKS 3
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4fcce2a..e3bfaf3 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -118,10 +118,6 @@ using namespace ::com::sun::star::container;
using ::svx::PropertyValueProvider;
using ::svx::IPropertyValueProvider;
-#define QUERYINT( xint ) \
- if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
- aAny <<= uno::Reference< xint >(this)
-
class GDIMetaFile;
class SvStream;
sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream,
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index e34aa37..54e900c 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1112,26 +1112,6 @@ static XubString ImplMetricGetUnitText( const XubString& rStr )
}
}
return aStr;
-
-/*
- // MT: #90545# Preparation for translated strings...
- String aMetricText;
- for ( sal_uInt16 n = rStr.Len(); n; )
- {
- sal_Unicode c = rStr.GetChar( --n );
- sal_Int32 nType = xCharClass->getStringType( rStr, n, 1, rLocale );
-
- if ( CharClass::isLetterType( nType ) )
- {
- aMetricText.Insert( c, 0 );
- }
- else
- {
- if ( aMetricText.Len() )
- break;
- }
- }
-*/
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 69579c9..e3d027e 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -44,12 +44,6 @@
#include <rtl/strbuf.hxx>
// -----------
-// - Defines -
-// -----------
-
-#define CVTSVM_WRITE_SUBACTIONCOUNT 1
-
-// -----------
// - Inlines -
// -----------
@@ -1223,9 +1217,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaTransparentAction( aPolyPoly, nTrans ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1241,9 +1233,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaFloatTransparentAction( aMtf, aPos, aSize, aGradient ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1257,9 +1247,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaHatchAction( aPolyPoly, aHatch ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1273,9 +1261,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaRefPointAction( aRefPoint, bSet ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
// #106172# Track font relevant data in shadow VDev
if( bSet )
@@ -1295,9 +1281,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaTextLineColorAction( aColor, bSet ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1316,9 +1300,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
(FontUnderline) nUnderline,
UNDERLINE_NONE ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1332,9 +1314,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaGradientExAction( aPolyPoly, aGradient ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1360,9 +1340,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaCommentAction( aComment, nValue, pData, nDataSize ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -2205,9 +2183,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
ImplWritePopAction( rOStm );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
nCount += 15;
-#endif
}
nCount++;
@@ -2266,9 +2242,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm << (sal_Int32) nAddCount;
rOStm.Seek( nNewPos );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
nCount += nAddCount;
-#endif
}
nCount++;
@@ -2311,9 +2285,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm << (sal_Int32) nAddCount;
rOStm.Seek( nNewPos );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
nCount += nAddCount;
-#endif
}
nCount++;
@@ -2453,71 +2425,6 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
#endif
-
-/*
- case( META_TEXTRECT_ACTION ):
- {
- MetaTextRectAction* pAct = (MetaTextRectAction*) pAction;
-
- rOStm << ;
- rOStm << ;
-
- nCount++;
- }
- break;
-*/
-
-/*
- case( META_MASK_ACTION ):
- {
- MetaMaskAction* pAct = (MetaMaskAction*) pAction;
-
- rOStm << ;
- rOStm << ;
-
- nCount++;
- }
- break;
-*/
-
-/*
- case( META_MASKSCALE_ACTION ):
- {
- MetaMaskScaleAction* pAct = (MetaMaskScaleAction*) pAction;
-
- rOStm << ;
- rOStm << ;
-
- nCount++;
- }
- break;
-*/
-
-/*
- case( META_MASKSCALEPART_ACTION ):
- {
- MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
-
- rOStm << ;
- rOStm << ;
-
- nCount++;
- }
- break;
-*/
-
-/*
- case( META_ISECTREGIONCLIPREGION_ACTION ):
- {
- MetaISectRegionClipRegionAction* pAct = (MetaISectRegionClipRegionAction*) pAction;
-
- rOStm << ;
- rOStm << ;
-
- nCount++;
- }
- break;
-*/
}
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index aaad59f..ec62a4c 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -1337,9 +1337,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode )
mpParent,
mnFloatBits & ( WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) ?
mnFloatBits | WB_SYSTEMWINDOW
-//#ifdef __USE_OWNERDRAWDECORATION__
| WB_OWNERDRAWDECORATION
-//#endif
: mnFloatBits,
this );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 669bc93..87347e8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -72,8 +72,6 @@ DBG_NAMEEX( Window )
#define SMALLBUTTON_OFF_NORMAL_X 3
#define SMALLBUTTON_OFF_NORMAL_Y 3
-#define SMALLBUTTON_OFF_CHECKED_X 4
-#define SMALLBUTTON_OFF_CHECKED_Y 4
#define SMALLBUTTON_OFF_PRESSED_X 5
#define SMALLBUTTON_OFF_PRESSED_Y 5
@@ -84,10 +82,6 @@ DBG_NAMEEX( Window )
// -----------------------------------------------------------------------
-#define DEF_MIN_WIDTH 8
-#define DEF_MIN_HEIGHT 8
-#define DEF_TEXT_WIDTH 40
-
#define TB_TEXTOFFSET 2
#define TB_IMAGETEXTOFFSET 3
#define TB_LINESPACING 3
@@ -110,8 +104,6 @@ DBG_NAMEEX( Window )
#define TB_WBLINESIZING (WB_SIZEABLE | WB_DOCKABLE | WB_SCROLL)
-#define TB_MAX_GROUPS 100
-
#define DOCK_LINEHSIZE ((sal_uInt16)0x0001)
#define DOCK_LINEVSIZE ((sal_uInt16)0x0002)
#define DOCK_LINERIGHT ((sal_uInt16)0x1000)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8c974e7..f64a3a6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3305,16 +3305,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
}
}
-/* if ( nFlags & (WINDOW_POSSIZE_X|WINDOW_POSSIZE_Y) )
- {
- POINT aPt;
- aPt.x = mpWindowImpl->maPos.X();
- aPt.y = mpWindowImpl->maPos.Y();
- ClientToScreen( mpWindowImpl->mpFrame->maFrameData.mhWnd , &aPt );
- mpWindowImpl->maPos.X() = aPt.x;
- mpWindowImpl->maPos.Y() = aPt.y;
- }
-*/
if ( bNewPos || bNewSize )
{
sal_Bool bUpdateSysObjPos = sal_False;
@@ -3348,11 +3338,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
}
}
}
-// else
-// {
-// if ( mpWindowImpl->mpBorderWindow )
-// mpWindowImpl->maPos = mpWindowImpl->mpBorderWindow->mpWindowImpl->maPos;
-// }
// Move()/Resize() werden erst bei Show() gerufen, damit min. eins vor
// einem Show() kommt
@@ -6546,8 +6531,6 @@ void Window::Enable( bool bEnable, bool bChild )
mpWindowImpl->mbDisabled = !bEnable;
if ( mpWindowImpl->mpSysObj )
mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
-// if ( mpWindowImpl->mbFrame )
-// mpWindowImpl->mpFrame->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
StateChanged( STATE_CHANGE_ENABLE );
ImplCallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
@@ -6621,8 +6604,6 @@ void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
mpWindowImpl->mbInputDisabled = !bEnable;
if ( mpWindowImpl->mpSysObj )
mpWindowImpl->mpSysObj->Enable( !mpWindowImpl->mbDisabled && bEnable );
-// if ( mpWindowImpl->mbFrame )
-// mpWindowImpl->mpFrame->Enable( !mpWindowImpl->mbDisabled && bEnable );
}
}
@@ -8594,19 +8575,6 @@ Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16&
return NULL;
}
-/*
-Window* Window::GetAccessibleParentWindow() const
-{
- Window* pParent = GetParent();
- while ( pParent )
- if( pParent->ImplIsAccessibleCandidate() )
- break;
- else
- pParent = pParent->GetParent();
- return pParent;
-}
-*/
-
Window* Window::GetAccessibleParentWindow() const
{
if ( ImplIsAccessibleNativeFrame() )
@@ -8635,19 +8603,6 @@ Window* Window::GetAccessibleParentWindow() const
return pParent;
}
-/*
-sal_uInt16 Window::GetAccessibleChildWindowCount()
-{
- sal_uInt16 nChildren = ImplGetAccessibleCandidateChildWindowCount( WINDOW_FIRSTCHILD );
-
- // Search also for SystemWindows.
- Window* pOverlap = GetWindow( WINDOW_OVERLAP );
- nChildren += pOverlap->ImplGetAccessibleCandidateChildWindowCount( WINDOW_FIRSTOVERLAP );
-
- return nChildren;
-}
-*/
-
sal_uInt16 Window::GetAccessibleChildWindowCount()
{
sal_uInt16 nChildren = 0;
@@ -8695,21 +8650,6 @@ sal_uInt16 Window::GetAccessibleChildWindowCount()
return nChildren;
}
-/*
-Window* Window::GetAccessibleChildWindow( sal_uInt16 n )
-{
- sal_uInt16 nChildCount; // will be set in ImplGetAccessibleCandidateChild(...)
- Window* pChild = ImplGetAccessibleCandidateChild( n, nChildCount, WINDOW_FIRSTCHILD, sal_True );
- if ( !pChild && ( n >= nChildCount ) )
- {
- Window* pOverlap = GetWindow( WINDOW_OVERLAP );
- pChild = pOverlap->ImplGetAccessibleCandidateChild( n, nChildCount, WINDOW_FIRSTOVERLAP, sal_False );
- }
-
- return pChild;
-}
-*/
-
Window* Window::GetAccessibleChildWindow( sal_uInt16 n )
{
// report the menubarwindow as a the first child of THE workwindow
@@ -8932,11 +8872,6 @@ String Window::GetAccessibleName() const
{
switch ( GetType() )
{
-// case WINDOW_IMAGERADIOBUTTON:
-// case WINDOW_RADIOBUTTON:
-// case WINDOW_TRISTATEBOX:
-// case WINDOW_CHECKBOX:
-
case WINDOW_MULTILINEEDIT:
case WINDOW_PATTERNFIELD:
case WINDOW_NUMERICFIELD:
@@ -9238,20 +9173,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
SetLineColor( oldLineCol );
}
-/*
-void Window::DbgAssertNoEventListeners()
-{
- VclWindowEvent aEvent( this, 0, NULL );
- DBG_ASSERT( mpWindowImpl->maEventListeners.empty(), "Eventlistener: Who is still listening???" )
- if ( !mpWindowImpl->maEventListeners.empty() )
- mpWindowImpl->maEventListeners.Call( &aEvent );
-
- DBG_ASSERT( mpWindowImpl->maChildEventListeners.empty(), "ChildEventlistener: Who is still listening???" )
- if ( !mpWindowImpl->maChildEventListeners.empty() )
- mpWindowImpl->maChildEventListeners.Call( &aEvent );
-}
-*/
-
// controls should return the window that gets the
// focus by default, so keyevents can be sent to that window directly
Window* Window::GetPreferredKeyInputWindow()
More information about the Libreoffice-commits
mailing list