Kaydet (Commit) 12854c32 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

sal_Bool to bool.

üst 9c31884d
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
::cppu::OInterfaceContainerHelper maChangesListeners; ::cppu::OInterfaceContainerHelper maChangesListeners;
sal_Bool FillRenderMarkData( const com::sun::star::uno::Any& aSelection, bool FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions,
ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const; ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const;
com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter(); com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter();
......
...@@ -752,7 +752,7 @@ bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& r ...@@ -752,7 +752,7 @@ bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& r
return bRangeValid; return bRangeValid;
} }
sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
const uno::Sequence< beans::PropertyValue >& rOptions, const uno::Sequence< beans::PropertyValue >& rOptions,
ScMarkData& rMark, ScMarkData& rMark,
ScPrintSelectionStatus& rStatus, String& rPagesStr ) const ScPrintSelectionStatus& rStatus, String& rPagesStr ) const
...@@ -760,13 +760,13 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, ...@@ -760,13 +760,13 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
OSL_ENSURE( !rMark.IsMarked() && !rMark.IsMultiMarked(), "FillRenderMarkData: MarkData must be empty" ); OSL_ENSURE( !rMark.IsMarked() && !rMark.IsMultiMarked(), "FillRenderMarkData: MarkData must be empty" );
OSL_ENSURE( pDocShell, "FillRenderMarkData: DocShell must be set" ); OSL_ENSURE( pDocShell, "FillRenderMarkData: DocShell must be set" );
sal_Bool bDone = false; bool bDone = false;
uno::Reference<frame::XController> xView; uno::Reference<frame::XController> xView;
// defaults when no options are passed: all sheets, include empty pages // defaults when no options are passed: all sheets, include empty pages
sal_Bool bSelectedSheetsOnly = false; sal_Bool bSelectedSheetsOnly = false;
sal_Bool bIncludeEmptyPages = sal_True; sal_Bool bIncludeEmptyPages = true;
bool bHasPrintContent = false; bool bHasPrintContent = false;
sal_Int32 nPrintContent = 0; // all sheets / selected sheets / selected cells sal_Int32 nPrintContent = 0; // all sheets / selected sheets / selected cells
...@@ -813,8 +813,8 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, ...@@ -813,8 +813,8 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
uno::Reference< drawing::XShapes > xShapes( xInterface, uno::UNO_QUERY ); uno::Reference< drawing::XShapes > xShapes( xInterface, uno::UNO_QUERY );
if ( pSelObj && pSelObj->GetDocShell() == pDocShell ) if ( pSelObj && pSelObj->GetDocShell() == pDocShell )
{ {
sal_Bool bSheet = ( ScTableSheetObj::getImplementation( xInterface ) != NULL ); bool bSheet = ( ScTableSheetObj::getImplementation( xInterface ) != NULL );
sal_Bool bCursor = pSelObj->IsCursorOnly(); bool bCursor = pSelObj->IsCursorOnly();
const ScRangeList& rRanges = pSelObj->GetRangeList(); const ScRangeList& rRanges = pSelObj->GetRangeList();
rMark.MarkFromRangeList( rRanges, false ); rMark.MarkFromRangeList( rRanges, false );
...@@ -843,7 +843,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, ...@@ -843,7 +843,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
rStatus.SetMode( SC_PRINTSEL_RANGE ); rStatus.SetMode( SC_PRINTSEL_RANGE );
rStatus.SetRanges( rRanges ); rStatus.SetRanges( rRanges );
bDone = sal_True; bDone = true;
} }
// multi selection isn't supported // multi selection isn't supported
} }
...@@ -872,7 +872,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, ...@@ -872,7 +872,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
if( rMark.IsMarked() && !rMark.IsMultiMarked() ) if( rMark.IsMarked() && !rMark.IsMultiMarked() )
{ {
rStatus.SetMode( SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS ); rStatus.SetMode( SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS );
bDone = sal_True; bDone = true;
} }
} }
} }
...@@ -888,7 +888,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, ...@@ -888,7 +888,7 @@ sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
for (SCTAB nTab = 0; nTab < nTabCount; nTab++) for (SCTAB nTab = 0; nTab < nTabCount; nTab++)
rMark.SelectTable( nTab, sal_True ); rMark.SelectTable( nTab, sal_True );
rStatus.SetMode( SC_PRINTSEL_DOCUMENT ); rStatus.SetMode( SC_PRINTSEL_DOCUMENT );
bDone = sal_True; bDone = true;
} }
// other selection types aren't supported // other selection types aren't supported
} }
......
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