Skip to content

C
core
Kaydet (Commit) d5d2e280 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

bool improvements 

Change-Id: I4fb554a0b703b29cb2dc70fc11111a4f2fa9af8e
üst c68a8f45
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 72 deletions
chart2/qa/extras/chart2export.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -478,7 +478,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
uno::Sequence<beans::PropertyValue> aGrabBag(0);
xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
bool bEmbeddings = sal_False;
bool bEmbeddings = false;
const char* testEmbeddedFileNames[3] = {"word/embeddings/Microsoft_Excel_Worksheet3.xlsx",
"word/embeddings/Microsoft_Excel_Worksheet2.xlsx",
"word/embeddings/Microsoft_Excel_Worksheet1.xlsx"};
......@@ -486,7 +486,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
{
if (aGrabBag[i].Name == "OOXEmbeddings")
{
bEmbeddings = sal_True;
bEmbeddings = true;
uno::Sequence<beans::PropertyValue> aEmbeddingsList(0);
uno::Reference<io::XInputStream> aEmbeddingXlsxStream;
OUString aEmbeddedfileName;
......
chart2/source/controller/dialogs/dlg_DataSource.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -193,7 +193,7 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
if( ! (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid ))
{
m_pBtnOK->Enable( sal_False );
m_pBtnOK->Enable( false );
OSL_ASSERT( m_pTabControl );
// note: there seems to be no suitable mechanism to address pages by
// identifier, at least it is unclear what the page identifiers are.
......@@ -215,7 +215,7 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage )
if( m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid )
{
m_pBtnOK->Enable( sal_True );
m_pBtnOK->Enable( true );
OSL_ASSERT( m_pTabControl );
m_pTabControl->EnableTabToggling();
}
......
chart2/source/controller/dialogs/res_DataLabel.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -324,7 +324,7 @@ sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
{
// default state
m_pCBSymbol->Enable( sal_False );
m_pCBSymbol->Enable( false );
lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_NUMBER, *m_pCBNumber );
lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_PERCENTAGE, *m_pCBPercent );
......
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -106,7 +106,7 @@ LightSourceInfo::LightSourceInfo()
{
aLightSource.nDiffuseColor = 0xffffff; // white
aLightSource.aDirection = drawing::Direction3D(1,1,1);
aLightSource.bIsEnabled = sal_False;
aLightSource.bIsEnabled = false;
}
void LightSourceInfo::initButtonFromSource()
......
chart2/source/controller/dialogs/tp_AxisLabel.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -64,7 +64,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn
get(m_pFtABCD,"labelABCD");
m_pCtrlDial->SetText(m_pFtABCD->GetText());
m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
m_pOrientHlp->Enable( sal_True );
m_pOrientHlp->Enable( true );
m_pCbStacked->EnableTriState( sal_False );
......
chart2/source/controller/dialogs/tp_AxisPositions.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -204,7 +204,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
else
{
m_pLB_CrossesAt->SetNoSelection();
m_pED_CrossesAt->Enable( sal_False );
m_pED_CrossesAt->Enable( false );
}
// Labels
......
chart2/source/controller/dialogs/tp_PolarOptions.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -81,7 +81,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pFL_StartingAngle->Show(sal_False);
m_pFL_StartingAngle->Show(false);
}
if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, sal_True, &pPoolItem) == SFX_ITEM_SET)
{
......@@ -90,7 +90,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pCB_Clockwise->Show(sal_False);
m_pCB_Clockwise->Show(false);
}
if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
{
......@@ -99,7 +99,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pFL_PlotOptions->Show(sal_False);
m_pFL_PlotOptions->Show(false);
}
}
......
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -165,7 +165,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pCBAxisSideBySide->Show(sal_False);
m_pCBAxisSideBySide->Show(false);
}
//missing value treatment
......@@ -176,19 +176,19 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,sal_True, &pPoolItem) == SFX_ITEM_SET)
{
m_pRB_DontPaint->Enable(sal_False);
m_pRB_AssumeZero->Enable(sal_False);
m_pRB_ContinueLine->Enable(sal_False);
m_pRB_DontPaint->Enable(false);
m_pRB_AssumeZero->Enable(false);
m_pRB_ContinueLine->Enable(false);
for( sal_Int32 nN =0; nN<aMissingValueTreatments.getLength(); nN++ )
{
sal_Int32 nVal = aMissingValueTreatments[nN];
if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
m_pRB_DontPaint->Enable(sal_True);
m_pRB_DontPaint->Enable(true);
else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
m_pRB_AssumeZero->Enable(sal_True);
m_pRB_AssumeZero->Enable(true);
else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
m_pRB_ContinueLine->Enable(sal_True);
m_pRB_ContinueLine->Enable(true);
}
long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
......@@ -201,7 +201,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pGridPlotOptions->Show(sal_False);
m_pGridPlotOptions->Show(false);
}
}
......@@ -213,8 +213,8 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
}
else
{
m_pCBIncludeHiddenCells->Show(sal_False);
m_pGridPlotOptions->Show(sal_False);
m_pCBIncludeHiddenCells->Show(false);
m_pGridPlotOptions->Show(false);
}
AdaptControlPositionsAndVisibility();
......@@ -239,7 +239,7 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility()
if( !m_pMTGap->IsVisible() && !m_pMTOverlap->IsVisible() )
{
m_pGrpBar->Show(sal_False);
m_pGrpBar->Show(false);
}
}
} //namespace chart
......
chart2/source/controller/dialogs/tp_TitleRotation.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -47,7 +47,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
m_pCbStacked->EnableTriState( sal_False );
m_pOrientHlp->Enable( sal_True );
m_pOrientHlp->Enable( true );
m_pOrientHlp->AddDependentWindow( *m_pFtRotate, STATE_CHECK );
if( !bWithRotation )
......
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -162,7 +162,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
SdrModel* pModel = new SdrModel();
pModel->GetItemPool().FreezeIdRanges();
SdrPage* pPage = new SdrPage( *pModel, sal_False );
SdrPage* pPage = new SdrPage( *pModel, false );
pPage->SetSize(Size(1000,1000));
pModel->InsertPage( pPage, 0 );
SdrView* pView = new SdrView( pModel, &aVDev );
......
chart2/source/controller/main/ChartController.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -891,7 +891,7 @@ void SAL_CALL ChartController::notifyClosing(
bool ChartController::impl_releaseThisModel(
const uno::Reference< uno::XInterface > & xModel )
{
bool bReleaseModel = sal_False;
bool bReleaseModel = false;
{
::osl::Guard< ::osl::Mutex > aGuard( m_aModelMutex );
if( m_aModel.is() && m_aModel->getModel() == xModel )
......
chart2/source/controller/main/ChartController_TextEdit.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -163,10 +163,10 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
OSL_ENSURE( pFact, "No dialog factory" );
SfxAllItemSet aSet( m_pDrawModelWrapper->GetItemPool() );
aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
aSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
//set fixed current font
aSet.Put( SfxBoolItem( FN_PARAM_2, sal_True ) ); //maybe not necessary in future
aSet.Put( SfxBoolItem( FN_PARAM_2, true ) ); //maybe not necessary in future
Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
......
chart2/source/tools/ChartTypeHelper.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -441,9 +441,9 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC
{
OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_True;
return true;
}
return sal_False;
return false;
}
sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::Reference< chart2::XChartType >& xChartType )
......
chart2/source/tools/DiagramHelper.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -148,7 +148,7 @@ void DiagramHelper::setVertical(
bool bChanged = false;
if( xProp.is() )
{
bool bOldSwap = sal_False;
bool bOldSwap = false;
if( !(xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bOldSwap)
|| bVertical != bOldSwap )
bChanged = true;
......
chart2/source/tools/LifeTime.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -60,9 +60,9 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
OSL_FAIL( "This component is already disposed " );
(void)(bAssert);
}
return sal_True;
return true;
}
return sal_False;
return false;
}
sal_Bool LifeTimeManager
::impl_canStartApiCall()
......@@ -178,7 +178,7 @@ CloseableLifeTimeManager::~CloseableLifeTimeManager()
bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
{
if( impl_isDisposed( bAssert ) )
return sal_True;
return true;
if( m_bClosed )
{
......@@ -187,9 +187,9 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
OSL_FAIL( "This object is already closed" );
(void)(bAssert);//avoid warnings
}
return sal_True;
return true;
}
return sal_False;
return false;
}
sal_Bool CloseableLifeTimeManager
......
chart2/source/tools/MediaDescriptorHelper.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -32,7 +32,7 @@ if(rProp.Name.equals(#MediaName)) \
{ \
if( rProp.Value >>= MediaName ) \
ISSET_##MediaName = sal_True; \
if(nFlags & FLAG_DEPRECATED) \
if((nFlags & FLAG_DEPRECATED) != 0) \
{ \
m_aDeprecatedProperties[nDeprecatedCount]=rProp;\
nDeprecatedCount++; \
......@@ -41,7 +41,7 @@ if(rProp.Name.equals(#MediaName)) \
{ \
m_aRegularProperties[nRegularCount]=rProp; \
nRegularCount++; \
if( nFlags & FLAG_MODEL) \
if((nFlags & FLAG_MODEL) != 0) \
{ \
m_aModelProperties[nModelCount]=rProp; \
nModelCount++; \
......
chart2/source/view/axes/ScaleAutomatism.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -254,7 +254,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
rExplicitScale.Maximum = rExplicitScale.Minimum + 1.0;
// default increment settings
rExplicitIncrement.PostEquidistant = sal_True; // does not matter anyhow
rExplicitIncrement.PostEquidistant = true; // does not matter anyhow
rExplicitIncrement.Distance = 1.0; // category axis always have a main increment of 1
rExplicitIncrement.BaseValue = 0.0; // category axis always have a base of 0
......@@ -289,7 +289,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
{
//scaling dependent
aExplicitSubIncrement.PostEquidistant = sal_False;
aExplicitSubIncrement.PostEquidistant = false;
}
rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
}
......@@ -311,7 +311,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
// set automatic PostEquidistant to true (maybe scaling dependent?)
// Note: scaling with PostEquidistant==false is untested and needs review
if( !(m_aSourceScale.IncrementData.PostEquidistant >>= rExplicitIncrement.PostEquidistant) )
rExplicitIncrement.PostEquidistant = sal_True;
rExplicitIncrement.PostEquidistant = true;
/* All following scaling code will operate on the logarithms of the source
values. In the last step, the original values will be restored. */
......@@ -550,7 +550,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
{
//scaling dependent
aExplicitSubIncrement.PostEquidistant = sal_False;
aExplicitSubIncrement.PostEquidistant = false;
}
rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
}
......@@ -563,7 +563,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
{
Date aMinDate(m_aNullDate); aMinDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Minimum));
Date aMaxDate(m_aNullDate); aMaxDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Maximum));
rExplicitIncrement.PostEquidistant = sal_False;
rExplicitIncrement.PostEquidistant = false;
if( aMinDate > aMaxDate )
{
......@@ -760,7 +760,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
// set automatic PostEquidistant to true (maybe scaling dependent?)
if( !(m_aSourceScale.IncrementData.PostEquidistant >>= rExplicitIncrement.PostEquidistant) )
rExplicitIncrement.PostEquidistant = sal_True;
rExplicitIncrement.PostEquidistant = true;
/* If range is invalid (minimum greater than maximum), change one of the
variable limits to validate the range. In this step, a zero-sized range
......@@ -992,7 +992,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
{
//scaling dependent
aExplicitSubIncrement.PostEquidistant = sal_False;
aExplicitSubIncrement.PostEquidistant = false;
}
rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
}
......
chart2/source/view/charttypes/Splines.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -122,7 +122,7 @@ lcl_SplineCalculation::lcl_SplineCalculation(
m_nKHigh( rSortedPoints.size() - 1 ),
m_fLastInterpolatedValue(0.0)
{
::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
::rtl::math::setInf( &m_fLastInterpolatedValue, false );
Calculate();
}
......@@ -135,7 +135,7 @@ lcl_SplineCalculation::lcl_SplineCalculation(
m_nKHigh( rSortedPoints.size() - 1 ),
m_fLastInterpolatedValue(0.0)
{
::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
::rtl::math::setInf( &m_fLastInterpolatedValue, false );
CalculatePeriodic();
}
......@@ -608,7 +608,7 @@ void SplineCalculater::CalculateCubicSplines(
else // generate the kind "natural spline"
{
double fInfty;
::rtl::math::setInf( &fInfty, sal_False );
::rtl::math::setInf( &fInfty, false );
fXDerivation = fInfty;
fYDerivation = fInfty;
aSplineX = new lcl_SplineCalculation( aInputX, fXDerivation, fXDerivation );
......
chart2/source/view/main/ChartItemPool.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -57,11 +57,11 @@ ChartItemPool::ChartItemPool():
//legend
ppPoolDefaults[SCHATTR_LEGEND_POS - SCHATTR_START] = new SfxInt32Item(SCHATTR_LEGEND_POS, ::com::sun::star::chart2::LegendPosition_LINE_END );
ppPoolDefaults[SCHATTR_LEGEND_SHOW - SCHATTR_START] = new SfxBoolItem(SCHATTR_LEGEND_SHOW, sal_True);
ppPoolDefaults[SCHATTR_LEGEND_SHOW - SCHATTR_START] = new SfxBoolItem(SCHATTR_LEGEND_SHOW, true);
//text
ppPoolDefaults[SCHATTR_TEXT_DEGREES - SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0);
ppPoolDefaults[SCHATTR_TEXT_STACKED - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,sal_False);
ppPoolDefaults[SCHATTR_TEXT_STACKED - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,false);
//statistic
ppPoolDefaults[SCHATTR_STAT_AVERAGE - SCHATTR_START] = new SfxBoolItem (SCHATTR_STAT_AVERAGE);
......@@ -75,13 +75,13 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, OUString());
ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true);
ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0);
ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 0);
ppPoolDefaults[SCHATTR_STYLE_VERTICAL - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_VERTICAL, 0);
ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, false);
ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, false);
ppPoolDefaults[SCHATTR_STYLE_VERTICAL - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_VERTICAL, false);
ppPoolDefaults[SCHATTR_STYLE_BASETYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_STYLE_BASETYPE, 0);
ppPoolDefaults[SCHATTR_STYLE_LINES - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_LINES, 0);
ppPoolDefaults[SCHATTR_STYLE_PERCENT - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_PERCENT, 0);
ppPoolDefaults[SCHATTR_STYLE_STACKED - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_STACKED, 0);
ppPoolDefaults[SCHATTR_STYLE_LINES - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_LINES, false);
ppPoolDefaults[SCHATTR_STYLE_PERCENT - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_PERCENT, false);
ppPoolDefaults[SCHATTR_STYLE_STACKED - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_STACKED, false);
ppPoolDefaults[SCHATTR_STYLE_SPLINES - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SPLINES, 0); //Bug: was Bool! test ->Fileformat (touches only 5's)
ppPoolDefaults[SCHATTR_STYLE_SYMBOL - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SYMBOL, 0);
ppPoolDefaults[SCHATTR_STYLE_SHAPE - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SHAPE, 0);
......@@ -90,7 +90,7 @@ ChartItemPool::ChartItemPool():
//axis scale
ppPoolDefaults[SCHATTR_AXISTYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_REALNUMBER);
ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0);
ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,false);
ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN);
ppPoolDefaults[SCHATTR_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN);
ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX);
......@@ -119,43 +119,43 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_AXIS_MARK_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MARK_POSITION,0);
//axis label
ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0);
ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,false);
ppPoolDefaults[SCHATTR_AXIS_LABEL_ORDER - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_AXIS_LABEL_ORDER);
ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,sal_False);
ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, sal_False );
ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,false);
ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, false );
//--
ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH);
ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0);
ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0);
ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,false);
ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,false);
ppPoolDefaults[SCHATTR_SYMBOL_SIZE - SCHATTR_START] = new SvxSizeItem(SCHATTR_SYMBOL_SIZE,Size(0,0));
// new for New Chart
ppPoolDefaults[SCHATTR_BAR_OVERLAP - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0);
ppPoolDefaults[SCHATTR_BAR_GAPWIDTH - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0);
ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, sal_False);
ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, false);
ppPoolDefaults[SCHATTR_NUM_OF_LINES_FOR_BAR - SCHATTR_START] = new SfxInt32Item( SCHATTR_NUM_OF_LINES_FOR_BAR, 0 );
ppPoolDefaults[SCHATTR_SPLINE_ORDER - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 );
ppPoolDefaults[SCHATTR_SPLINE_RESOLUTION - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 );
ppPoolDefaults[SCHATTR_DIAGRAM_STYLE - SCHATTR_START] = new SvxChartStyleItem( CHSTYLE_2D_COLUMN, SCHATTR_DIAGRAM_STYLE );
ppPoolDefaults[SCHATTR_GROUP_BARS_PER_AXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, sal_False);
ppPoolDefaults[SCHATTR_GROUP_BARS_PER_AXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, false);
ppPoolDefaults[SCHATTR_STARTING_ANGLE - SCHATTR_START] = new SfxInt32Item( SCHATTR_STARTING_ANGLE, 90 );
ppPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, sal_False );
ppPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false );
ppPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0);
ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, ::std::vector < sal_Int32 >() );
ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True);
ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, true);
ppPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0);
ppPoolDefaults[SCHATTR_REGRESSION_TYPE - SCHATTR_START] = new SvxChartRegressItem (CHREGRESS_NONE, SCHATTR_REGRESSION_TYPE);
ppPoolDefaults[SCHATTR_REGRESSION_SHOW_EQUATION - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_EQUATION, 0);
ppPoolDefaults[SCHATTR_REGRESSION_SHOW_COEFF - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_COEFF, 0);
ppPoolDefaults[SCHATTR_REGRESSION_SHOW_EQUATION - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_EQUATION, false);
ppPoolDefaults[SCHATTR_REGRESSION_SHOW_COEFF - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_COEFF, false);
ppPoolDefaults[SCHATTR_REGRESSION_DEGREE - SCHATTR_START] = new SfxInt32Item(SCHATTR_REGRESSION_DEGREE, 2);
ppPoolDefaults[SCHATTR_REGRESSION_PERIOD - SCHATTR_START] = new SfxInt32Item(SCHATTR_REGRESSION_PERIOD, 2);
ppPoolDefaults[SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD);
ppPoolDefaults[SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD);
ppPoolDefaults[SCHATTR_REGRESSION_SET_INTERCEPT - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SET_INTERCEPT, sal_False);
ppPoolDefaults[SCHATTR_REGRESSION_SET_INTERCEPT - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SET_INTERCEPT, false);
ppPoolDefaults[SCHATTR_REGRESSION_INTERCEPT_VALUE - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_REGRESSION_INTERCEPT_VALUE);
ppPoolDefaults[SCHATTR_REGRESSION_CURVE_NAME - SCHATTR_START] = new SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, OUString());
......
chart2/source/view/main/ChartView.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -2381,7 +2381,7 @@ void ChartView::createShapes()
{
SolarMutexGuard aSolarGuard;
// #i12587# support for shapes in chart
m_pDrawModelWrapper->getSdrModel().EnableUndo( sal_False );
m_pDrawModelWrapper->getSdrModel().EnableUndo( false );
m_pDrawModelWrapper->clearMainDrawPage();
}
......@@ -2621,7 +2621,7 @@ void ChartView::impl_updateView()
void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ )
throw (uno::RuntimeException)
{
m_bViewDirty = sal_True;
m_bViewDirty = true;
if( m_bInViewUpdate )
m_bViewUpdatePending = true;
......
chart2/source/view/main/DrawModelWrapper.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -116,7 +116,7 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>
SfxItemPool* pMasterPool = &GetItemPool();
pMasterPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, sal_True) );
pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, true) );
pMasterPool->SetPoolDefaultItem(Svx3DPercentDiagonalItem (5));
SfxItemPool* pPool = pMasterPool;
......
chart2/source/view/main/VLegend.cxx
Dosyayı görüntüle @ d5d2e280
......@@ -801,7 +801,7 @@ void VLegend::setDefaultWritingMode( sal_Int16 nDefaultWritingMode )
bool VLegend::isVisible( const Reference< XLegend > & xLegend )
{
if( ! xLegend.is())
return sal_False;
return false;
sal_Bool bShow = sal_False;
try
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment