diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-16 18:57:44 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-16 18:57:44 -0800 |
commit | f417c6cad6608705d674610e99c17170a340f549 (patch) | |
tree | c7e98cb749312d8e4f861b094979cf0d81b01f9c | |
parent | a1a1c816de870bea49318a2dc3cef683394ff002 (diff) |
HC Cleanup - calc
25 files changed, 90 insertions, 343 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 61c8241c5016..afb572eab907 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -633,11 +633,12 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED )) ); + rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) ); + rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) ); + rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) ); + rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) ); } + bool PieChartDialogController::shouldShow_3DLookControl() const { return true; @@ -1047,9 +1048,11 @@ StockChartDialogController::StockChartDialogController() { bSupports3D = false; } + StockChartDialogController::~StockChartDialogController() { } + String StockChartDialogController::getName() { return String( SchResId( STR_TYPE_STOCK )); @@ -1058,6 +1061,7 @@ Image StockChartDialogController::getImage() { return Image( SchResId( IMG_TYPE_STOCK )); } + const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = @@ -1094,6 +1098,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController() { bSupports3D = false; } + CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() { if(m_pFT_NumberOfLines) @@ -1101,14 +1106,17 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() if(m_pMF_NumberOfLines) delete m_pMF_NumberOfLines; } + String CombiColumnLineChartDialogController::getName() { return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } -Image CombiColumnLineChartDialogController::getImage() + +Image CombiColumnLineChartDialogController::getImage( ) { - return Image( SchResId( IMG_TYPE_COLUMN_LINE )); + return Image( SchResId( IMG_TYPE_COLUMN_LINE ) ); } + const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 1b12ba57f1c5..736bc49a128f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -88,7 +88,6 @@ // with shift up/down, and entering non-editable cells would be problematic, // e.g. the first cell, or when being in read-only mode - using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -140,6 +139,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) : m_nStartColumn( 0 ), m_bShowWarningBox( false ) {} + SeriesHeaderEdit::~SeriesHeaderEdit() {} @@ -214,7 +214,8 @@ private: static Image GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis); + bool bSwapXAndYAxis + ); sal_Int32 m_nStartCol, m_nEndCol; sal_Int32 m_nWidth; @@ -305,7 +306,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth ) SetPos( m_aPos ); } - void SeriesHeader::SetPixelPosX( sal_Int32 nPos ) { Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT )); @@ -320,9 +320,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth ) void SeriesHeader::SetChartType( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis ) + bool bSwapXAndYAxis +) { - m_spSymbol->SetImage(GetChartTypeImage(xChartType, bSwapXAndYAxis)); + m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) ); } void SeriesHeader::SetSeriesName( const String & rName ) @@ -383,7 +384,8 @@ bool SeriesHeader::HasFocus() const Image SeriesHeader::GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis) + bool bSwapXAndYAxis +) { Image aResult; if( !xChartType.is()) @@ -392,40 +394,40 @@ Image SeriesHeader::GetChartTypeImage( if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA )) { - aResult = Image( SchResId( IMG_TYPE_AREA )); + aResult = Image( SchResId( IMG_TYPE_AREA ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )) { if( bSwapXAndYAxis ) - aResult = Image( SchResId( IMG_TYPE_BAR )); + aResult = Image( SchResId( IMG_TYPE_BAR ) ); else - aResult = Image( SchResId( IMG_TYPE_COLUMN )); + aResult = Image( SchResId( IMG_TYPE_COLUMN ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE )) { - aResult = Image( SchResId( IMG_TYPE_LINE )); + aResult = Image( SchResId( IMG_TYPE_LINE ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER )) { - aResult = Image( SchResId( IMG_TYPE_XY )); + aResult = Image( SchResId( IMG_TYPE_XY ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE )) { - aResult = Image( SchResId( IMG_TYPE_PIE )); + aResult = Image( SchResId( IMG_TYPE_PIE ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET ) || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) ) { - aResult = Image( SchResId( IMG_TYPE_NET )); + aResult = Image( SchResId( IMG_TYPE_NET ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK )) { // @todo: correct image for candle-stick type - aResult = Image( SchResId( IMG_TYPE_STOCK )); + aResult = Image( SchResId( IMG_TYPE_STOCK ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE )) { - aResult = Image( SchResId( IMG_TYPE_BUBBLE )); + aResult = Image( SchResId( IMG_TYPE_BUBBLE ) ); } return aResult; diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index df6f9e93e68b..cea3192bacab 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -42,7 +42,7 @@ namespace chart RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { - SetModeImage( Image( SchResId(IMG_SELECTRANGE) ) ); + SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) ); this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE)); } diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 2d94859f255e..f2073c4e52e8 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -115,8 +115,6 @@ DataEditor::DataEditor( SetOutputSizePixel( aWinSize ); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); - // allow travelling to toolbar with F6 notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::AddWindow )); } @@ -215,83 +213,11 @@ IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG ) return 0; } -// IMPL_LINK( DataEditor, BrowserColumnResized, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - -// IMPL_LINK( DataEditor, BrowserContentScrolled, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - void DataEditor::UpdateData() { m_apBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); } -// react on the change of the underlying document by displaying the new data -// void DataEditor::SFX_NOTIFY( -// SfxBroadcaster& rBC, -// const TypeId& rBCType, -// const SfxHint& rHint, -// const TypeId& rHintType ) -// { -// if( rHint.Type() == TYPE(SfxSimpleHint) ) -// { -// // note: if dynamic_cast works this should be changed -// switch( static_cast< const SfxSimpleHint & >( rHint ).GetId()) -// { -// case SFX_HINT_DOCCHANGED: -// UpdateData(); -// break; - -// case SFX_HINT_DYING: -// break; -// } -// } -// } - -// { -// BOOL bRet = TRUE; - -// // confirm changes currently made and not saved -// m_apBrwData->EndEditing(); - -// if( m_apBrwData->IsDirty() ) -// { -// QueryBox aSafetyQuery( this, WB_YES_NO_CANCEL | WB_DEF_YES, -// String( SchResId( STR_DIAGRAM_DATA_SAFETY_QUERY ))); -// long nQueryResult = aSafetyQuery.Execute(); - -// bRet = ( nQueryResult != RET_CANCEL ); - -// if( nQueryResult == RET_YES ) -// { -// // save changes -// ApplyChangesToModel(); -// } -// } - -// if( bRet ) -// { -// // close child window -// SfxBoolItem aItem( SID_DIAGRAM_DATA, FALSE ); -// if( m_pBindings ) -// { -// SfxDispatcher* pDisp = m_pBindings->GetDispatcher(); -// if( pDisp ) -// pDisp->Execute( SID_DIAGRAM_DATA, SFX_CALLMODE_ASYNCHRON, &aItem, 0L); -// else -// DBG_ERROR( "Couldn't dispatch command" ); -// } -// } - -// return ( bRet? SfxFloatingWindow::Close(): FALSE ); -// } - void DataEditor::AdaptBrowseBoxSize() { Size aSize( PixelToLogic( GetResizeOutputSizePixel(), MAP_APPFONT )); @@ -307,7 +233,6 @@ void DataEditor::Resize() { Dialog::Resize(); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); } BOOL DataEditor::Close() @@ -323,11 +248,7 @@ bool DataEditor::ApplyChangesToModel() return m_apBrwData->EndEditing(); } -/** - * sets the correct toolbar icons depending on the current mode (e.g. high contrast) - * FIXME: does not serve any purpose anymore, as the high contrast theme has been removed - * FIXME: check callers and see if we can do away with it - */ +// sets the correct toolbar icons depending on the current mode (e.g. high contrast) void DataEditor::ApplyImageList() { m_aTbxData.SetImageList( m_aToolboxImageList ); diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk index dfeb02800ac8..cc6927476e64 100644 --- a/chart2/source/controller/dialogs/makefile.mk +++ b/chart2/source/controller/dialogs/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ GEN_HID_OTHER=TRUE # i26518 the gcc-3.0.4 requires to enhance the template-depth # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore -.IF "$(COM)"=="GCC" +.IF "$(COM)"=="GCC" CFLAGS+=-ftemplate-depth-128 .ENDIF @@ -154,7 +154,7 @@ SRC1FILES= \ SRS1NAME=$(TARGET) # --- Targets ----------------------------------------------------------------- -LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc +LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc .INCLUDE: target.mk $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_DataLabel.hrc $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_LegendPosition.hrc @@ -191,9 +191,5 @@ $(SRS)$/chcdialogs.srs: \ tp_RangeChooser.hrc \ tp_Wizard_TitlesAndObjects.hrc -# res_DataLabel.hrc \ -# res_LegendPosition.hrc \ -# res_Statistic.hrc \ - #$(SRS)$/chcdialogs.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 6f8cd3118e8f..e6283dfecd1c 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -694,15 +694,15 @@ void ErrorBarResources::FillValueSets() { if( m_eErrorBarType == ERROR_BAR_Y ) { - m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN ))); - m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP ))); - m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI ))); + m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN ) ) ); + m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP ) ) ); + m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) ); } else if( m_eErrorBarType == ERROR_BAR_X ) { - m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT ))); - m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT ))); - m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI ))); + m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT ) ) ); + m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT ) ) ); + m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) ); } } diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 1af1e2c13e0d..dadfd998940a 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -81,21 +81,22 @@ enum StatTrendLine TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs, bool bNoneAvailable ) : m_aFLType( pParent, SchResId( FL_TYPE )), - m_aRBNone( pParent, SchResId( RB_NONE )), - m_aRBLinear( pParent, SchResId( RB_LINEAR )), + m_aRBNone( pParent, SchResId( RB_NONE )), + m_aRBLinear( pParent, SchResId( RB_LINEAR )), m_aRBLogarithmic( pParent, SchResId( RB_LOGARITHMIC )), m_aRBExponential( pParent, SchResId( RB_EXPONENTIAL )), - m_aRBPower( pParent, SchResId( RB_POWER )), + m_aRBPower( pParent, SchResId( RB_POWER )), - m_aFINone( pParent, SchResId( FI_NONE )), - m_aFILinear( pParent, SchResId( FI_LINEAR )), + m_aFINone( pParent, SchResId( FI_NONE )), + m_aFILinear( pParent, SchResId( FI_LINEAR )), m_aFILogarithmic( pParent, SchResId( FI_LOGARITHMIC )), m_aFIExponential( pParent, SchResId( FI_EXPONENTIAL )), - m_aFIPower( pParent, SchResId( FI_POWER )), + m_aFIPower( pParent, SchResId( FI_POWER )), - m_aFLEquation( pParent, SchResId( FL_EQUATION )), - m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), + m_aFLEquation( pParent, SchResId( FL_EQUATION )), + m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), m_aCBShowCorrelationCoeff( pParent, SchResId( CB_SHOW_CORRELATION_COEFF )), + m_eTrendLineType( CHREGRESS_NONE ), m_bNoneAvailable( bNoneAvailable ), m_bTrendLineUnique( true ) @@ -256,11 +257,11 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const void TrendlineResources::FillValueSets() { if( m_bNoneAvailable ) - m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE )) ); - m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR )) ); - m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG )) ); - m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP )) ); - m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER )) ); + m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE ) ) ); + m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR ) ) ); + m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG ) ) ); + m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP ) ) ); + m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER ) ) ); } void TrendlineResources::UpdateControlStates() diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 935e77370d46..dcf70f841db7 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -353,8 +353,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); - //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 597b20d4abe8..1ea3fe942b1b 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -77,7 +77,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ImageList m_aToolboxImageList; - ImageList m_aToolboxImageListHighContrast; /// handles actions of the toolbox DECL_LINK( ToolboxHdl, void* ); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 3eb69bed785e..4f315240d678 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1170,9 +1170,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors { uno::Sequence< datatransfer::DataFlavor > aRet(1); -// aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, -// C2U( "GDIMetaFile" ), -// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, C2U( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); @@ -1183,8 +1180,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (uno::RuntimeException) { -// return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || -// aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 9ee2050d4b73..864c9c9b6862 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -132,14 +132,6 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; // Oberhalb dieser Grenze liegen // die Indizes fuer DBBereiche -/* -#ifdef OS2 -#define PIXEL_PER_INCH 72.0 -#else -#define PIXEL_PER_INCH 96.0 -#endif -*/ - #define PIXEL_PER_INCH 96.0 #define CM_PER_INCH 2.54 diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4ac855b39b5b..014c44fa8bcc 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1437,15 +1437,9 @@ #define BMP_START (STR_END) // Navigator -// not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE -//#define RID_BMP_EXPAND (BMP_START) -//#define RID_BMP_COLLAPSE (BMP_START + 1) #define RID_IMG_DROP_URL (BMP_START + 2) #define RID_IMG_DROP_LINK (BMP_START + 3) #define RID_IMG_DROP_COPY (BMP_START + 4) -// free -// free -// free #define RID_IMG_SELECT_CURRENT (BMP_START + 8) #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9) diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index e503d3185401..faede3eb6482 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -658,8 +658,6 @@ void ScGlobal::Clear() DELETEZ(pEmbeddedBrushItem); DELETEZ(pProtectedBrushItem); DELETEZ(pOutlineBitmaps); -// DELETEZ(pAnchorBitmap); -// DELETEZ(pGrayAnchorBitmap); DELETEZ(pEnglishFormatter); DELETEZ(pCaseTransliteration); DELETEZ(pTransliteration); @@ -705,7 +703,6 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet ) else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865; -// else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM") ) return gsl_getSystemTextEncoding(); else return gsl_getSystemTextEncoding(); } @@ -1358,7 +1355,6 @@ ScFunctionList::ScFunctionList() : } } } -// pDesc->nHelpId = 0; aFunctionList.Insert(pDesc, LIST_APPEND); nStrLen = (*(pDesc->pFuncName)).Len(); @@ -1856,7 +1852,7 @@ String ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber ) { DBG_ERROR("Invalid category number!"); return String(); - } // if ( _nCategoryNumber >= SC_FUNCGROUP_COUNT ) + } ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) ); return String(ScResId((USHORT)_nCategoryNumber)); @@ -1875,7 +1871,7 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke return ScCompiler::GetNativeSymbol(ocArrayOpen).GetChar(0); case eArrayClose: return ScCompiler::GetNativeSymbol(ocArrayClose).GetChar(0); - } // switch(_eToken) + } return 0; } // ----------------------------------------------------------------------------- @@ -1950,7 +1946,7 @@ CollatorWrapper* ScGlobal::GetCollator() { pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); pCollator->loadDefaultCollator( *GetLocale(), SC_COLLATOR_IGNORES ); - } // if ( !pCollator ) + } return pCollator; } CollatorWrapper* ScGlobal::GetCaseCollator() @@ -1959,7 +1955,7 @@ CollatorWrapper* ScGlobal::GetCaseCollator() { pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); pCaseCollator->loadDefaultCollator( *GetLocale(), 0 ); - } // if ( !pCaseCollator ) + } return pCaseCollator; } ::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration() @@ -1969,7 +1965,7 @@ CollatorWrapper* ScGlobal::GetCaseCollator() const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage(); pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE ); pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage ); - } // if ( !pCaseTransliteration ) + } return pCaseTransliteration; } IntlWrapper* ScGlobal::GetScIntlWrapper() diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index f686ed36bf9b..d3830fce5bd8 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -1176,7 +1176,7 @@ bool XmlScPropHdl_JustifyMethod::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Int32 nVal1, nVal2; + sal_Int32 nVal1(0), nVal2(0); if((r1 >>= nVal1) && (r2 >>= nVal2)) return (nVal1 == nVal2); @@ -1214,7 +1214,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::exportXML( const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { - sal_Int32 nVal; + sal_Int32 nVal(0); bool bRetval = false; if (rValue >>= nVal) @@ -1597,7 +1597,7 @@ bool XmlScPropHdl_RotateReference::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Int32 aReference1, aReference2; + sal_Int32 aReference1(0), aReference2(0); if((r1 >>= aReference1) && (r2 >>= aReference2)) return (aReference1 == aReference2); @@ -1645,7 +1645,7 @@ sal_Bool XmlScPropHdl_RotateReference::exportXML( const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { - sal_Int32 nVal; + sal_Int32 nVal(0); sal_Bool bRetval(sal_False); if(rValue >>= nVal) @@ -1694,7 +1694,7 @@ bool XmlScPropHdl_VertJustify::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Int32 aReference1, aReference2; + sal_Int32 aReference1(0), aReference2(0); if((r1 >>= aReference1) && (r2 >>= aReference2)) return (aReference1 == aReference2); @@ -1748,7 +1748,7 @@ sal_Bool XmlScPropHdl_VertJustify::exportXML( const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { - sal_Int32 nVal; + sal_Int32 nVal(0); sal_Bool bRetval(sal_False); if(rValue >>= nVal) diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index a0d65c6e8727..a66d58b32553 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -91,7 +91,8 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, - hasBigImages() ); + hasBigImages() + ); GetToolBox().SetItemImage(GetId(), aImage); } } @@ -99,38 +100,22 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow() { -// USHORT nWinResId, nTbxResId; USHORT nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" )); createAndPositionSubToolBar( aInsertBarResStr ); -// nWinResId = RID_TBXCTL_INSERT; -// nTbxResId = RID_TOOLBOX_INSERT; } else if (nSlotId == SID_TBXCTL_INSCELLS) { rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" )); createAndPositionSubToolBar( aInsertCellsBarResStr ); -// nWinResId = RID_TBXCTL_INSCELLS; -// nTbxResId = RID_TOOLBOX_INSCELLS; } - else /* SID_TBXCTL_INSOBJ */ + else { rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" )); createAndPositionSubToolBar( aInsertObjectBarResStr ); -// nWinResId = RID_TBXCTL_INSOBJ; -// nTbxResId = RID_TOOLBOX_INSOBJ; } -/* - WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP; - ScTbxInsertPopup *pWin = new ScTbxInsertPopup( nSlotId, eNewAlign, - ScResId(nWinResId), ScResId(nTbxResId), GetBindings() ); - pWin->StartPopupMode(&GetToolBox(), TRUE); - pWin->StartSelection(); - pWin->Show(); - return pWin; -*/ return NULL; } @@ -154,80 +139,6 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ ) if ( pDispatch ) pDispatch->Execute(nLastSlotId); } -/* -//------------------------------------------------------------------ -// -// Popup - Window -// -//------------------------------------------------------------------ - -ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign, - const ResId& rRIdWin, const ResId& rRIdTbx, - SfxBindings& rBindings ) : - SfxPopupWindow ( nId, rRIdWin, rBindings), - aTbx ( this, GetBindings(), rRIdTbx ), - aRIdWinTemp(rRIdWin), - aRIdTbxTemp(rRIdTbx) -{ - aTbx.UseDefault(); - FreeResource(); - - aTbx.GetToolBox().SetAlign( eNewAlign ); - if (eNewAlign == WINDOWALIGN_LEFT || eNewAlign == WINDOWALIGN_RIGHT) - SetText( EMPTY_STRING ); - - Size aSize = aTbx.CalcWindowSizePixel(); - aTbx.SetPosSizePixel( Point(), aSize ); - SetOutputSizePixel( aSize ); - aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl)); - aTbxClickHdl = aTbx.GetToolBox().GetClickHdl(); - aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl)); -} - -ScTbxInsertPopup::~ScTbxInsertPopup() -{ -} - -SfxPopupWindow* __EXPORT ScTbxInsertPopup::Clone() const -{ - return new ScTbxInsertPopup( GetId(), aTbx.GetToolBox().GetAlign(), - aRIdWinTemp, aRIdTbxTemp, - (SfxBindings&) GetBindings() ); -} - -void ScTbxInsertPopup::StartSelection() -{ - aTbx.GetToolBox().StartSelection(); -} - -IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox) -{ - EndPopupMode(); - - USHORT nLastSlotId = pBox->GetCurItemId(); - SfxUInt16Item aItem( GetId(), nLastSlotId ); - SfxDispatcher* pDisp = GetBindings().GetDispatcher(); - pDisp->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); - pDisp->Execute( nLastSlotId, SFX_CALLMODE_ASYNCHRON ); - return 0; -} - -IMPL_LINK(ScTbxInsertPopup, TbxClickHdl, ToolBox*, pBox) -{ - USHORT nLastSlotId = pBox->GetCurItemId(); - SfxUInt16Item aItem( GetId(), nLastSlotId ); - GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); - if(aTbxClickHdl.IsSet()) - aTbxClickHdl.Call(pBox); - return 0; -} - -void __EXPORT ScTbxInsertPopup::PopupModeEnd() -{ - aTbx.GetToolBox().EndSelection(); - SfxPopupWindow::PopupModeEnd(); -} -*/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src index d2ac591fd455..f1a895ddea23 100644 --- a/sc/source/ui/dbgui/outline.src +++ b/sc/source/ui/dbgui/outline.src @@ -27,7 +27,6 @@ #include "sc.hrc" - // Imageliste hier, damit sie nicht in ui.src beim Zusammenbauen der // "echten" Imagelisten stoert diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 18013a089306..b3eff6dde692 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -529,9 +529,6 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { sal_uInt32 nOldDrawMode = aVD.GetDrawMode(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); Size aWndSize( GetSizePixel() ); Font aFont( aVD.GetFont() ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index ae10df13c469..e959211d10bb 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -397,8 +397,6 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) SetSizePixel( CalcWindowSizePixel() ); SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) ); SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY ); -// EnableItem( IID_UP, FALSE ); -// EnableItem( IID_DOWN, FALSE ); } //------------------------------------------------------------------------ @@ -447,7 +445,6 @@ void CommandToolBox::Select( USHORT nSelId ) case IID_DOWN: rDlg.EndOfDataArea(); break; - // IID_DROPMODE ist in Click case IID_CHANGEROOT: rDlg.aLbEntries.ToggleRoot(); UpdateButtons(); diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc index 3ca5bb07c130..97486c940a5f 100644 --- a/sc/source/ui/navipi/navipi.hrc +++ b/sc/source/ui/navipi/navipi.hrc @@ -41,7 +41,6 @@ #define STR_NOTACTIVE 11 #define STR_HIDDEN 12 #define STR_ACTIVEWIN 13 -//#define IMG_ENTRIES 14 #define STR_QHLP_SCEN_LISTBOX 15 #define STR_QHLP_SCEN_COMMENT 16 #define IL_CMD 17 @@ -56,5 +55,3 @@ #define IID_DROPMODE 9 #define IID_CHANGEROOT 10 #define IID_ZOOMOUT 11 - - diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index 917d2f8175d9..d461196ea14e 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -238,7 +238,6 @@ Window RID_SCDLG_NAVIGATOR }; - ImageList RID_IMAGELIST_NAVCONT { Prefix = "nc"; @@ -250,11 +249,13 @@ Image RID_IMG_DROP_URL ImageBitmap = Bitmap { File = "dropurl.bmp" ; }; MaskColor = STD_MASKCOLOR ; }; + Image RID_IMG_DROP_LINK { ImageBitmap = Bitmap { File = "droplink.bmp" ; }; MaskColor = STD_MASKCOLOR ; }; + Image RID_IMG_DROP_COPY { ImageBitmap = Bitmap { File = "dropcopy.bmp" ; }; @@ -267,38 +268,47 @@ String SCSTR_CONTENT_ROOT { Text [ en-US ] = "Contents" ; }; + String SCSTR_CONTENT_TABLE { Text [ en-US ] = "Sheets" ; }; + String SCSTR_CONTENT_RANGENAME { Text [ en-US ] = "Range names" ; }; + String SCSTR_CONTENT_DBAREA { Text [ en-US ] = "Database Ranges" ; }; + String SCSTR_CONTENT_GRAPHIC { Text [ en-US ] = "Graphics" ; }; + String SCSTR_CONTENT_OLEOBJECT { Text [ en-US ] = "OLE objects" ; }; + String SCSTR_CONTENT_NOTE { Text [ en-US ] = "Comments" ; }; + String SCSTR_CONTENT_AREALINK { Text [ en-US ] = "Linked areas" ; }; + String SCSTR_CONTENT_DRAWING { Text [ en-US ] = "Drawing objects"; }; + // PopupMenu ------------------------------------------------------------- Menu RID_POPUP_DROPMODE { @@ -324,6 +334,7 @@ Menu RID_POPUP_DROPMODE }; }; }; + Menu RID_POPUP_NAVIPI_SCENARIO { ItemList = @@ -342,45 +353,3 @@ Menu RID_POPUP_NAVIPI_SCENARIO }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 4e00378b4cec..56a37f438717 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -126,8 +126,8 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : aBtnTopDown ( this, ScResId( BTN_TOPDOWN ) ), aBtnLeftRight ( this, ScResId( BTN_LEFTRIGHT ) ), aBmpPageDir ( this, ScResId( BMP_PAGEDIR ) ), - aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ), - aImgTopDown ( ScResId( IMG_TOPDOWN ) ), + aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ), + aImgTopDown ( ScResId( IMG_TOPDOWN ) ), aBtnPageNo ( this, ScResId( BTN_PAGENO ) ), aEdPageNo ( this, ScResId( ED_PAGENO ) ), aFlPrint ( this, ScResId( FL_PRINT ) ), diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 84949a3a6f6a..a47069b26c93 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -5271,8 +5271,7 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run sal_Int32 nCol; sal_Int32 nMaxRows = 0; sal_Int32 nMaxColumns = 0; - sal_Bool bEof; -// sal_Bool bColName = sal_True; + sal_Bool bEof = sal_False; long lColCnt = 0; if (MaxColumns.hasValue()) { @@ -5410,11 +5409,6 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const ScUnoConversion::FillScRange( destRange, destAddress ); ScUnoConversion::FillScRange( sourceRange, thisAddress ); - - // source is valid -// if ( !sourceRange.In( destRange ) ) -// throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() ); - FillDir eDir = FILL_TO_BOTTOM; double fStep = 1.0; @@ -5667,8 +5661,8 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, // #TODO #FIXME this seems incredibly lame, this can't be right for (sal_Int32 i=1; i <= oRangeRowsImpl->getCount();i++) { - oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) ); - } + oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) ); + } } } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 8180c1b8ea1e..1fa995813d1b 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1331,8 +1331,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, return; // leer // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) - BOOL bCellContrast = bUseStyleColor && - Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + BOOL bCellContrast = bUseStyleColor; if ( pBackground && !bCellContrast ) { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 01877252b078..9fe099ebf327 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -45,7 +45,6 @@ ////////////////////// Umsetzen der Standard-Defines ////////////////////// -//#define _SVDDRAG_HXX // SdrDragStat #define _SVDPAGE_HXX // SdrPage #ifdef _SDR_NOSURROGATEOBJ @@ -116,13 +115,8 @@ #undef _SVDORECT_HXX #endif -//#ifdef _SDR_NOVIEWS -// #define _SVDDRAG_HXX -//#endif - ////////////////////// Ende der SVDRAW-Modifikationen ///////////////////// - // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" @@ -200,7 +194,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect ) BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); long nDarkX = bLayoutRTL ? 0 : nPosX; - if ( !bAdd && !rStyleSettings.GetHighContrastMode() ) + if ( !bAdd ) { // match the shaded look of column/row headers @@ -472,7 +466,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); } if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN ) @@ -481,7 +474,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); } UpdateShow(); @@ -491,13 +483,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize(); if (bVScroll) { -// nBarX = aVScrollBottom.GetSizePixel().Width(); nBarX = nScrollBarSize; nSizeX -= nBarX - nOverlap; } if (bHScroll) { -// nBarY = aHScrollLeft.GetSizePixel().Height(); nBarY = nScrollBarSize; nSizeY -= nBarY - nOverlap; } @@ -1015,11 +1005,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetPointer( rPointer ); - -/* ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - pGridWin[ePos]->SetPointer( rPointer ); -*/ } @@ -1750,7 +1735,6 @@ void ScTabView::DoHSplit(long nSplitPos) else { nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT ); -// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta ); long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); if ( nLeftWidth < 0 ) nLeftWidth = 0; nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT, @@ -2442,5 +2426,4 @@ void ScTabView::EnableRefInput(BOOL bFlag) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 4ffb4d6db889..ac96f2eb2329 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1086,8 +1086,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); ScModule* pScMod = SC_MOD(); - if ( aBackCol.GetTransparency() > 0 || - Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + if ( aBackCol.GetTransparency() > 0 ) { aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); } |