[Libreoffice-commits] core.git: 63 commits - formula/source include/formula reportdesign/source sc/inc sc/source
Noel Grandin
noel at peralex.com
Wed Feb 19 12:06:10 CET 2014
formula/source/ui/dlg/FormulaHelper.cxx | 8
formula/source/ui/dlg/formula.cxx | 56 +++---
include/formula/formdata.hxx | 14 -
include/formula/formula.hxx | 14 -
include/formula/formulahelper.hxx | 14 -
reportdesign/source/ui/dlg/Formula.cxx | 2
sc/inc/scmod.hxx | 30 +--
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 4
sc/source/ui/app/inputwin.cxx | 38 ++--
sc/source/ui/app/scmod.cxx | 52 +++---
sc/source/ui/app/seltrans.cxx | 4
sc/source/ui/app/transobj.cxx | 4
sc/source/ui/app/uiitems.cxx | 2
sc/source/ui/attrdlg/tabpages.cxx | 4
sc/source/ui/cctrl/popmenu.cxx | 2
sc/source/ui/dbgui/imoptdlg.cxx | 6
sc/source/ui/dbgui/scendlg.cxx | 2
sc/source/ui/dbgui/scuiimoptdlg.cxx | 8
sc/source/ui/dbgui/tpsort.cxx | 4
sc/source/ui/dbgui/validate.cxx | 8
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 4
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/olinefun.cxx | 66 +++----
sc/source/ui/docshell/pagedata.cxx | 6
sc/source/ui/docshell/servobj.cxx | 20 +-
sc/source/ui/docshell/sizedev.cxx | 2
sc/source/ui/drawfunc/fuconstr.cxx | 2
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/formdlg/privsplt.cxx | 10 -
sc/source/ui/inc/gridmerg.hxx | 4
sc/source/ui/inc/gridwin.hxx | 8
sc/source/ui/inc/imoptdlg.hxx | 10 -
sc/source/ui/inc/inputwin.hxx | 46 ++---
sc/source/ui/inc/inscodlg.hxx | 30 +--
sc/source/ui/inc/mvtabdlg.hxx | 4
sc/source/ui/inc/navipi.hxx | 12 -
sc/source/ui/inc/navsett.hxx | 6
sc/source/ui/inc/notemark.hxx | 12 -
sc/source/ui/inc/olinefun.hxx | 24 +-
sc/source/ui/inc/optsolver.hxx | 14 -
sc/source/ui/inc/output.hxx | 46 ++---
sc/source/ui/inc/pagedata.hxx | 14 -
sc/source/ui/inc/pfuncache.hxx | 4
sc/source/ui/inc/pntlock.hxx | 22 +-
sc/source/ui/inc/popmenu.hxx | 4
sc/source/ui/inc/prevloc.hxx | 34 ++--
sc/source/ui/inc/prevwsh.hxx | 4
sc/source/ui/inc/printfun.hxx | 92 +++++-----
sc/source/ui/inc/privsplt.hxx | 4
sc/source/ui/inc/redcom.hxx | 2
sc/source/ui/inc/reffact.hxx | 6
sc/source/ui/inc/refundo.hxx | 2
sc/source/ui/inc/rfindlst.hxx | 2
sc/source/ui/inc/scendlg.hxx | 4
sc/source/ui/inc/scuiimoptdlg.hxx | 8
sc/source/ui/inc/select.hxx | 16 -
sc/source/ui/inc/seltrans.hxx | 2
sc/source/ui/inc/servobj.hxx | 2
sc/source/ui/inc/shtabdlg.hxx | 2
sc/source/ui/inc/simpref.hxx | 14 -
sc/source/ui/inc/sizedev.hxx | 4
sc/source/ui/inc/solvrdlg.hxx | 4
sc/source/ui/inc/sortdlg.hxx | 12 -
sc/source/ui/inc/tabcont.hxx | 8
sc/source/ui/inc/tabopdlg.hxx | 2
sc/source/ui/inc/tabpages.hxx | 12 -
sc/source/ui/inc/tabvwsh.hxx | 102 ++++++------
sc/source/ui/inc/tpsort.hxx | 4
sc/source/ui/inc/tpusrlst.hxx | 8
sc/source/ui/inc/transobj.hxx | 10 -
sc/source/ui/inc/uiitems.hxx | 6
sc/source/ui/inc/undobase.hxx | 2
sc/source/ui/inc/undoblk.hxx | 120 +++++++-------
sc/source/ui/inc/undocell.hxx | 36 ++--
sc/source/ui/inc/undodat.hxx | 68 ++++----
sc/source/ui/inc/undoolk.hxx | 2
sc/source/ui/inc/undotab.hxx | 22 +-
sc/source/ui/inc/validate.hxx | 6
sc/source/ui/inc/viewdata.hxx | 66 +++----
sc/source/ui/inc/viewfunc.hxx | 152 +++++++++---------
sc/source/ui/inc/viewutil.hxx | 6
sc/source/ui/miscdlgs/anyrefdg.cxx | 4
sc/source/ui/miscdlgs/inscodlg.cxx | 16 -
sc/source/ui/miscdlgs/mvtabdlg.cxx | 4
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/redcom.cxx | 2
sc/source/ui/miscdlgs/shtabdlg.cxx | 2
sc/source/ui/miscdlgs/simpref.cxx | 6
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/navipi/navipi.cxx | 12 -
sc/source/ui/optdlg/tpusrlst.cxx | 8
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/undo/refundo.cxx | 2
sc/source/ui/undo/undobase.cxx | 6
sc/source/ui/undo/undoblk.cxx | 44 ++---
sc/source/ui/undo/undoblk2.cxx | 2
sc/source/ui/undo/undoblk3.cxx | 54 +++---
sc/source/ui/undo/undocell.cxx | 28 +--
sc/source/ui/undo/undodat.cxx | 52 +++---
sc/source/ui/undo/undoolk.cxx | 2
sc/source/ui/undo/undotab.cxx | 28 +--
sc/source/ui/unoobj/celllistsource.cxx | 2
sc/source/ui/unoobj/celllistsource.hxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 14 -
sc/source/ui/unoobj/cellvaluebinding.cxx | 4
sc/source/ui/unoobj/cellvaluebinding.hxx | 6
sc/source/ui/unoobj/docuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/excelvbahelper.cxx | 4
sc/source/ui/vba/excelvbahelper.hxx | 2
sc/source/ui/vba/vbaassistant.hxx | 4
sc/source/ui/vba/vbaaxis.cxx | 6
sc/source/ui/vba/vbaaxis.hxx | 4
sc/source/ui/vba/vbacharacters.cxx | 2
sc/source/ui/vba/vbacharacters.hxx | 4
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/vba/vbaformat.hxx | 4
sc/source/ui/vba/vbarange.cxx | 8
sc/source/ui/vba/vbarange.hxx | 12 -
sc/source/ui/vba/vbatextboxshape.cxx | 2
sc/source/ui/vba/vbatextframe.cxx | 2
sc/source/ui/view/cellsh1.cxx | 6
sc/source/ui/view/cellsh3.cxx | 4
sc/source/ui/view/cellsh4.cxx | 4
sc/source/ui/view/colrowba.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 12 -
sc/source/ui/view/drawview.cxx | 16 -
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/gridmerg.cxx | 2
sc/source/ui/view/gridwin.cxx | 26 +--
sc/source/ui/view/gridwin2.cxx | 26 +--
sc/source/ui/view/gridwin3.cxx | 2
sc/source/ui/view/gridwin4.cxx | 28 +--
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/notemark.cxx | 2
sc/source/ui/view/olinewin.cxx | 4
sc/source/ui/view/output.cxx | 80 ++++-----
sc/source/ui/view/output2.cxx | 218 +++++++++++++-------------
sc/source/ui/view/pfuncache.cxx | 4
sc/source/ui/view/prevloc.cxx | 54 +++---
sc/source/ui/view/prevwsh.cxx | 8
sc/source/ui/view/printfun.cxx | 150 ++++++++---------
sc/source/ui/view/reffact.cxx | 10 -
sc/source/ui/view/select.cxx | 86 +++++-----
sc/source/ui/view/tabcont.cxx | 4
sc/source/ui/view/tabview.cxx | 12 -
sc/source/ui/view/tabview2.cxx | 2
sc/source/ui/view/tabvwsh2.cxx | 18 +-
sc/source/ui/view/tabvwsh3.cxx | 38 ++--
sc/source/ui/view/tabvwsh4.cxx | 156 +++++++++---------
sc/source/ui/view/tabvwsh5.cxx | 10 -
sc/source/ui/view/tabvwsha.cxx | 12 -
sc/source/ui/view/tabvwshb.cxx | 16 -
sc/source/ui/view/tabvwshe.cxx | 4
sc/source/ui/view/tabvwshh.cxx | 6
sc/source/ui/view/viewdata.cxx | 130 +++++++--------
sc/source/ui/view/viewfun2.cxx | 166 +++++++++----------
sc/source/ui/view/viewfun3.cxx | 66 +++----
sc/source/ui/view/viewfun4.cxx | 38 ++--
sc/source/ui/view/viewfun5.cxx | 32 +--
sc/source/ui/view/viewfun7.cxx | 28 +--
sc/source/ui/view/viewutil.cxx | 15 -
166 files changed, 1690 insertions(+), 1687 deletions(-)
New commits:
commit bd71519642fa88b7fd294af8aedb2156750bf1dd
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:27:07 2014 +0200
sal_Bool->bool
Change-Id: Ia988881bc597ce4c66c889cecc437dd565aefd9e
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index da3e1a7..4867a63 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -419,7 +419,7 @@ namespace calc
// range. In this case, we need to fire a change in our CellRange property, and additionally
// notify our XListEntryListeners
- m_bInitialized = sal_True;
+ m_bInitialized = true;
}
//.........................................................................
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index 469eb10f..ffc4e63 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -68,7 +68,7 @@ namespace calc
m_xRange; /// the range of cells we're bound to
::cppu::OInterfaceContainerHelper
m_aListEntryListeners; /// our listeners
- sal_Bool m_bInitialized; /// has XInitialization::initialize been called?
+ bool m_bInitialized; /// has XInitialization::initialize been called?
public:
OCellListSource(
commit f8aca00c11194e26fc7baf86bde3b6c3c14c5061
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:25:16 2014 +0200
sal_Bool->bool
Change-Id: I326e23e4ed5fdc47b1cde22a95a5e77c3be93d7f
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index b72e1f0..2236bac 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -73,7 +73,7 @@ namespace calc
#endif
//---------------------------------------------------------------------
- OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, sal_Bool _bListPos )
+ OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos )
:OCellValueBinding_Base( m_aMutex )
,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper )
,m_xDocument( _rxDocument )
@@ -630,7 +630,7 @@ namespace calc
// TODO: be an XModifyBroadcaster, so that changes in our cell can be notified
// to the BindableValue which is/will be bound to this instance.
- m_bInitialized = sal_True;
+ m_bInitialized = true;
// TODO: place your code here
}
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 10d12ca..c70be0e 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -72,13 +72,13 @@ namespace calc
m_xCellText; /// the cell we're bound to, for text access
::cppu::OInterfaceContainerHelper
m_aModifyListeners; /// our modify listeners
- sal_Bool m_bInitialized; /// has XInitialization::initialize been called?
- sal_Bool m_bListPos; /// constructed as ListPositionCellBinding?
+ bool m_bInitialized; /// has XInitialization::initialize been called?
+ bool m_bListPos; /// constructed as ListPositionCellBinding?
public:
OCellValueBinding(
const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument,
- sal_Bool _bListPos
+ bool _bListPos
);
using OCellValueBinding_PBase::getFastPropertyValue;
commit 6086f30e9b5d308f3b9601ee6c4f899822cbce15
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:23:32 2014 +0200
sal_Bool->bool
Change-Id: Ia5ecfe267692c91e8468b48efb05942506060899
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 1550c0c..7fa1863 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -189,7 +189,7 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
}
}
-void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bTranspose)
{
PasteCellsWarningReseter resetWarningBox;
sal_Bool bAsLink(false), bOtherDoc(false);
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index aa3114d..057f306 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -43,7 +43,7 @@ void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_I
void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
void implnPaste ( const css::uno::Reference< css::frame::XModel>& xModel );
void implnCut( const css::uno::Reference< css::frame::XModel>& xModel );
-void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
+void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bTranspose);
ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext );
commit 935b4309aa55630358169881fb571ce2b0f8b842
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:19:40 2014 +0200
sal_Bool->bool
Change-Id: I6b546f907ae306f51be718e6657c1702a8343dc6
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index 20c75c7..c318166 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -33,10 +33,10 @@ typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
class ScVbaAssistant : public ScVbaAssistantImpl_BASE
{
private:
- sal_Bool m_bIsVisible;
+ bool m_bIsVisible;
sal_Int32 m_nPointsLeft;
sal_Int32 m_nPointsTop;
- OUString m_sName;
+ OUString m_sName;
sal_Int32 m_nAnimation;
public:
ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext );
commit dd5a736a29daae2a591091f4de07534b257307a4
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:19:04 2014 +0200
sal_Bool->bool
Change-Id: Ieb1f4d55dec800d053f41f906280e172eefa3b6e
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 67b39bc..b6eadbd 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -42,14 +42,14 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
return pChart;
}
-sal_Bool
+bool
ScVbaAxis::isValueAxis() throw( script::BasicErrorException )
{
if ( getType() == xlCategory )
{
DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
}
- return sal_True;
+ return true;
}
ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ) : ScVbaAxis_BASE( xParent, xContext ), mxPropertySet( _xPropertySet ), mnType( _nType ), mnGroup( _nGroup ), bCrossesAreCustomized( false )
@@ -136,7 +136,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio
bCrossesAreCustomized = false;
break;
default: //xlAxisCrossesCustom
- bCrossesAreCustomized = sal_True;
+ bCrossesAreCustomized = true;
break;
}
mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny(false) );
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 9f081b6..c235a56 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -31,9 +31,9 @@ class ScVbaAxis : public ScVbaAxis_BASE
css::uno::Reference< css::beans::XPropertySet > mxPropertySet;
sal_Int32 mnType;
sal_Int32 mnGroup;
- sal_Bool bCrossesAreCustomized;
+ bool bCrossesAreCustomized;
ScVbaChart* getChartPtr() throw( css::uno::RuntimeException );
- sal_Bool isValueAxis() throw( css::script::BasicErrorException );
+ bool isValueAxis() throw( css::script::BasicErrorException );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
SAL_WNODEPRECATED_DECLARATIONS_POP
commit 759bbba7cca909a46cc642f4804ec27e09c0ba67
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:17:43 2014 +0200
sal_Bool->bool
Change-Id: I9475da82598d5c9190cc711709db7cbc6610bbca
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index b73818b..32de0be 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -25,7 +25,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, sal_Bool Replace ) throw ( css::lang::IllegalArgumentException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace )
+ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) throw ( css::lang::IllegalArgumentException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace )
{
Start >>= nStart;
if ( nStart < 1 )
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 4e3121d..81d60e4 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -38,9 +38,9 @@ private:
sal_Int16 nLength;
sal_Int16 nStart;
// Add because of MSO has diferent behavior.
- sal_Bool bReplace;
+ bool bReplace;
public:
- ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, sal_Bool bReplace = false ) throw ( css::lang::IllegalArgumentException );
+ ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false ) throw ( css::lang::IllegalArgumentException );
virtual ~ScVbaCharacters() {}
// Attributes
diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx
index be666a2..db7a77d 100644
--- a/sc/source/ui/vba/vbatextboxshape.cxx
+++ b/sc/source/ui/vba/vbatextboxshape.cxx
@@ -54,7 +54,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t
uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW );
ScVbaPalette aPalette( pDoc->GetDocumentShell() );
- return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length, sal_True );
+ return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length, true );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx
index be9718a..0f2e6eb 100644
--- a/sc/source/ui/vba/vbatextframe.cxx
+++ b/sc/source/ui/vba/vbatextframe.cxx
@@ -37,7 +37,7 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException)
ScVbaPalette aPalette( SfxObjectShell::Current() );
uno::Any aStart( sal_Int32( 1 ) );
uno::Any aLength(sal_Int32( -1 ) );
- return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) );
+ return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, true ) ) );
}
OUString
commit 24a0063ae4c12251a27ec7e87e16b4ae092b263d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:15:34 2014 +0200
sal_Bool->bool
Change-Id: I8c5258b01a98c4ed66999a45a2a2e0efc3f9b123
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 270386d..a026bfd 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
#define LOCALE "Locale"
template< typename Ifc1 >
-ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False )
+ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( false )
{
try
{
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index b227381..7e90f3d 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -45,8 +45,8 @@ protected:
css::uno::Reference< css::util::XNumberFormatTypes > xNumberFormatTypes;
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::beans::XPropertyState > xPropertyState;
- sal_Bool mbCheckAmbiguoity;
- sal_Bool mbAddIndent;
+ bool mbCheckAmbiguoity;
+ bool mbAddIndent;
//NumberFormatter oNumberFormatter = null;
css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory;
bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException );
commit d492135b4db08a4be139ddb76a5f8317da005eb7
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:13:11 2014 +0200
sal_Bool->bool
Change-Id: Ia832bd43c04ce5527b278f47dd5bbc816cc27258
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index dfb9294..0decef1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1459,7 +1459,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns );
}
-ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, sal_Bool bIsRows, sal_Bool bIsColumns ) throw( lang::IllegalArgumentException )
+ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) throw( lang::IllegalArgumentException )
: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ),
mbIsRows( bIsRows ),
mbIsColumns( bIsColumns )
@@ -1474,7 +1474,7 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const
}
-ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges, sal_Bool bIsRows, sal_Bool bIsColumns ) throw ( lang::IllegalArgumentException )
+ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows, bool bIsColumns ) throw ( lang::IllegalArgumentException )
: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns )
{
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index f5213d1..2452427 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -84,8 +84,8 @@ class ScVbaRange : public ScVbaRange_BASE
css::uno::Reference< ov::XCollection > m_Borders;
css::uno::Reference< css::table::XCellRange > mxRange;
css::uno::Reference< css::sheet::XSheetCellRangeContainer > mxRanges;
- sal_Bool mbIsRows;
- sal_Bool mbIsColumns;
+ bool mbIsRows;
+ bool mbIsColumns;
css::uno::Reference< ov::excel::XValidation > m_xValidation;
double getCalcColWidth(const css::table::CellRangeAddress&)
throw (css::uno::RuntimeException, std::exception);
@@ -120,8 +120,8 @@ protected:
virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
virtual SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException );
public:
- ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, sal_Bool bIsRows = false, sal_Bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException );
- ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, sal_Bool bIsRows = false, sal_Bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException );
+ ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException );
+ ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException );
ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
ScDocument* getScDocument() throw (css::uno::RuntimeException);
@@ -196,8 +196,8 @@ public:
virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException);
virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException);
// Methods
- sal_Bool IsRows() const { return mbIsRows; }
- sal_Bool IsColumns() const { return mbIsColumns; }
+ bool IsRows() const { return mbIsRows; }
+ bool IsColumns() const { return mbIsColumns; }
virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Clear() throw (css::uno::RuntimeException);
virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException);
commit 78efd44998c5b77ed1697c35a02a96b76657c620
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:07:42 2014 +0200
sal_Bool->bool
Change-Id: I3afc6103e210316cb5c6dc4242c69b0ac47259be
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 1d309c3..ce1f6f7 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -930,7 +930,7 @@ bool ScValidationDlg::SetupRefDlg()
return false;
}
-bool ScValidationDlg::RemoveRefDlg( sal_Bool bRestoreModal /* = sal_True */ )
+bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ )
{
bool bVisLock = false;
bool bFreeWindowLock = false;
@@ -951,7 +951,7 @@ bool ScValidationDlg::RemoveRefDlg( sal_Bool bRestoreModal /* = sal_True */ )
m_bOwnRefHdlr = false;
if( bRestoreModal )
- SetModal( sal_True );
+ SetModal( true );
}
if ( SfxChildWindow* pWnd = pTabVwSh->GetViewFrame()->GetChildWindow( SID_VALIDITY_REFERENCE ) )
@@ -977,12 +977,12 @@ void ScTPValidationValue::OnClick( Button *pBtn )
SetupRefDlg();
}
-sal_Bool ScValidationDlg::IsChildFocus()
+bool ScValidationDlg::IsChildFocus()
{
if ( const Window *pWin = Application::GetFocusWindow() )
while( NULL != ( pWin = pWin->GetParent() ) )
if( pWin == this )
- return sal_True;
+ return true;
return false;
}
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 5c3094c..eed4883 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -111,9 +111,9 @@ public:
}
bool SetupRefDlg();
- bool RemoveRefDlg( sal_Bool bRestoreModal = sal_True );
+ bool RemoveRefDlg( bool bRestoreModal = true );
- virtual void SetModal( sal_Bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
+ virtual void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc )
{
@@ -168,7 +168,7 @@ public:
(m_pHandler->*m_pRefInputDonePostHdl)();
}
- sal_Bool IsChildFocus();
+ bool IsChildFocus();
enum { SLOTID = SID_VALIDITY_REFERENCE };
commit 76a38b85507dcf80733bcec878623d7348f53845
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 12:04:33 2014 +0200
sal_Bool->bool
Change-Id: I1269075218632a2fe6979c85c395e267ddd80008
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 8691ac6..c164040 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -176,7 +176,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const
mpViewShell->GetViewData()->GetMergeSizePixel(
maCellAddress.Col(), maCellAddress.Row(), nSizeX, nSizeY);
aCellRect.SetSize(Size(nSizeX, nSizeY));
- aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, sal_True));
+ aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, true));
Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos);
if (pWindow)
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 5fa62bd..b644e1a 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -97,8 +97,8 @@ Rectangle ScViewForwarder::GetVisArea() const
SC_SPLIT_TOP : SC_SPLIT_BOTTOM;
Point aBaseCellPos(mpViewShell->GetViewData()->GetScrPos(mpViewShell->GetViewData()->GetPosX(eWhichH),
- mpViewShell->GetViewData()->GetPosY(eWhichV), meSplitPos, sal_True));
- Point aCellPos(mpViewShell->GetViewData()->GetScrPos(maCellPos.Col(), maCellPos.Row(), meSplitPos, sal_True));
+ mpViewShell->GetViewData()->GetPosY(eWhichV), meSplitPos, true));
+ Point aCellPos(mpViewShell->GetViewData()->GetScrPos(maCellPos.Col(), maCellPos.Row(), meSplitPos, true));
aVisArea.SetPos(aCellPos - aBaseCellPos);
}
}
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index ab70eef..fa6d53b 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -91,7 +91,7 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point& rInOutPos )
ScSplitPos eWhich = pViewData->GetActivePart();
ScGridWindow* pGridWin = (ScGridWindow*)pViewData->GetActiveWin();
// and equiv screen pos
- Point aScreenPos = pViewShell->GetViewData()->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True );
+ Point aScreenPos = pViewShell->GetViewData()->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true );
MapMode aDrawMode = pGridWin->GetDrawMapMode();
Point aCurPosHmm = pGridWin->PixelToLogic(aScreenPos, aDrawMode );
Point aOff = ( rInOutPos - aCurPosHmm );
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 64b92d5..87c380e 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -248,9 +248,9 @@ public:
Window* GetDialogParent(); // forwarded from tabvwsh
Window* GetActiveWin(); // from View
ScDrawView* GetScDrawView(); // from View
- sal_Bool IsMinimized(); // from View
+ bool IsMinimized(); // from View
- void UpdateInputHandler( sal_Bool bForce = false, sal_Bool bStopEditing = sal_True );
+ void UpdateInputHandler( bool bForce = false, bool bStopEditing = true );
void WriteUserData(OUString& rData);
void ReadUserData(const OUString& rData);
@@ -339,10 +339,10 @@ public:
ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
void GetMultiArea( ScRangeListRef& rRange ) const;
- sal_Bool SimpleColMarked();
- sal_Bool SimpleRowMarked();
+ bool SimpleColMarked();
+ bool SimpleRowMarked();
- sal_Bool IsMultiMarked();
+ bool IsMultiMarked();
void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
@@ -350,18 +350,18 @@ public:
void GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
SCCOL& rEndCol, SCROW& rEndRow );
void ResetFillMode();
- sal_Bool IsAnyFillMode() { return nFillMode != SC_FILL_NONE; }
- sal_Bool IsFillMode() { return nFillMode == SC_FILL_FILL; }
- sal_uInt8 GetFillMode() { return nFillMode; }
+ bool IsAnyFillMode() { return nFillMode != SC_FILL_NONE; }
+ bool IsFillMode() { return nFillMode == SC_FILL_FILL; }
+ sal_uInt8 GetFillMode() { return nFillMode; }
// TRUE: Cell is merged
- bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) const;
- sal_Bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+ bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) const;
+ bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
SCsCOL& rPosX, SCsROW& rPosY,
- sal_Bool bTestMerge = sal_True, sal_Bool bRepair = false,
- sal_Bool bNextIfLarge = sal_True );
+ bool bTestMerge = true, bool bRepair = false,
+ bool bNextIfLarge = true );
void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
- SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop );
+ SCsCOL nPosX, SCsROW nPosY, bool& rLeft, bool& rTop );
bool IsRefMode() const { return bIsRefMode; }
ScRefType GetRefType() const { return eRefType; }
@@ -390,20 +390,20 @@ public:
const ScViewOptions& GetOptions() const { return *pOptions; }
void SetOptions( const ScViewOptions& rOpt );
- sal_Bool IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); }
- void SetGridMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); }
- sal_Bool IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); }
- void SetSyntaxMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
- sal_Bool IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); }
- void SetHeaderMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); }
- sal_Bool IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); }
- void SetTabMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
- sal_Bool IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); }
- void SetVScrollMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
- sal_Bool IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); }
- void SetHScrollMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
- sal_Bool IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); }
- void SetOutlineMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
+ bool IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); }
+ void SetGridMode ( bool bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); }
+ bool IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); }
+ void SetSyntaxMode ( bool bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
+ bool IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); }
+ void SetHeaderMode ( bool bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); }
+ bool IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); }
+ void SetTabMode ( bool bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
+ bool IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); }
+ void SetVScrollMode ( bool bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
+ bool IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); }
+ void SetHScrollMode ( bool bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
+ bool IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); }
+ void SetOutlineMode ( bool bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
void KillEditView();
void ResetEditView();
@@ -417,7 +417,7 @@ public:
{ return pEditView[eWhich]; }
void EditGrowX();
- void EditGrowY( sal_Bool bInitial = false );
+ void EditGrowY( bool bInitial = false );
ScSplitPos GetEditActivePart() const { return eEditActivePart; }
SCCOL GetEditViewCol() const { return nEditCol; }
@@ -428,13 +428,13 @@ public:
SCROW GetEditEndRow() const { return nEditEndRow; }
Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin,
- const ScPatternAttr* pPattern, sal_Bool bForceToTop );
+ const ScPatternAttr* pPattern, bool bForceToTop );
void SetTabNo( SCTAB nNewTab );
void SetActivePart( ScSplitPos eNewActive );
Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
- sal_Bool bAllowNeg = false ) const;
+ bool bAllowNeg = false ) const;
Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const;
Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const;
@@ -446,7 +446,7 @@ public:
SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Cells on the preceding page
SCROW PrevCellsY( ScVSplitPos eWhichY ) const;
- sal_Bool IsOle();
+ bool IsOle();
void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
void SetScreen( const Rectangle& rVisArea );
void SetScreenPos( const Point& rVisAreaStart );
@@ -466,8 +466,8 @@ public:
Point GetMousePosPixel();
- sal_Bool UpdateFixX(SCTAB nTab = MAXTAB+1);
- sal_Bool UpdateFixY(SCTAB nTab = MAXTAB+1);
+ bool UpdateFixX(SCTAB nTab = MAXTAB+1);
+ bool UpdateFixY(SCTAB nTab = MAXTAB+1);
SCCOL GetTabStartCol() const { return nTabStartCol; }
void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index c2cfb4a..f54eba6 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1721,7 +1721,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow
aWinStart = pWin->GetPosPixel();
ScViewData* pViewData = pViewSh->GetViewData();
- Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, sal_True ));
+ Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, true ));
aSplit += aWinStart;
pViewSh->SplitAtPixel( aSplit, true, true );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index ffca266..89d227e 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -939,7 +939,7 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
aOldPos.X() = sc::TwipsToHMM( aOldPos.X() );
aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() );
// find position of same point on the screen ( e.g. grid )
- Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True );
+ Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true );
Point aCurPosHmm = pGridWin->PixelToLogic(aCurPos, aDrawMode );
Point aGridOff = ( aCurPosHmm - aOldPos );
// fdo#63878 Fix the X position for RTL Sheet
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9020afd..3202560 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2860,7 +2860,7 @@ static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Wind
{
SCCOL nCol = pViewData->GetCurX();
SCROW nRow = pViewData->GetCurY();
- Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, sal_True );
+ Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, true );
aEditArea.Right() = aEditArea.Left();
aEditArea = pWin->PixelToLogic( aEditArea );
pWin->SetCursorRect( &aEditArea );
@@ -3081,7 +3081,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
SCCOL nCurX = pViewData->GetCurX();
SCROW nCurY = pViewData->GetCurY();
- aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, sal_True );
+ aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, true );
long nSizeXPix;
long nSizeYPix;
pViewData->GetMergeSizePixel( nCurX, nCurY, nSizeXPix, nSizeYPix );
@@ -4582,7 +4582,7 @@ void ScGridWindow::UpdateEditViewPos()
else
{
// bForceToTop = sal_True for editing
- Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, sal_True );
+ Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, true );
Point aScrPos = PixelToLogic( aPixRect.TopLeft(), pViewData->GetLogicMode() );
Rectangle aRect = pView->GetOutputArea();
@@ -5358,12 +5358,12 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
if ( bTextBelow )
{
aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aEnd.Row()+1,
- eWhich, sal_True );
+ eWhich, true );
}
else
{
aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aStart.Row(),
- eWhich, sal_True );
+ eWhich, true );
aButtonPos.Y() -= nBHeight;
}
if ( bLayoutRTL )
@@ -5734,7 +5734,7 @@ void ScGridWindow::UpdateCursorOverlay()
if ( bVis && !bOverlapped && !pViewData->HasEditView(eWhich) && pViewData->IsActive() )
{
- Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
+ Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
// completely right of/below the screen?
@@ -5894,7 +5894,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
ScDocument* pDoc = pViewData->GetDocument();
sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
- Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
+ Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, true );
long nSizeXPix;
long nSizeYPix;
pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index ef4d511..6cbcff7 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -282,8 +282,8 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove )
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY );
- sal_Bool bMouseLeft;
- sal_Bool bMouseTop;
+ bool bMouseLeft;
+ bool bMouseTop;
pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop );
ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() );
@@ -851,7 +851,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
- sal_Bool bLeft, bTop;
+ bool bLeft, bTop;
pViewData->GetMouseQuadrant( aPos, eWhich, nPosX, nPosY, bLeft, bTop );
if ( !bLeft ) ++nPosX;
if ( !bTop ) ++nPosY;
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index a151035..b9a400d 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -302,7 +302,7 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres
if(rOpts.GetOption( VOPT_ANCHOR ))
{
sal_Bool bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() );
- Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, sal_True );
+ Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, true );
aPos = PixelToLogic(aPos);
rHdl.AddHdl(new SdrHdl(aPos, bNegativePage ? HDL_ANCHOR_TR : HDL_ANCHOR));
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7c2040d1..c0f9456 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -215,9 +215,9 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S
if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button?
{
Point aStartPos = pViewData->GetScrPos(
- aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True );
+ aRange.aStart.Col(), aRange.aStart.Row(), eWhich, true );
Point aEndPos = pViewData->GetScrPos(
- aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, sal_True );
+ aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, true );
// on the grid:
aStartPos.X() -= nLayoutSign;
aStartPos.Y() -= 1;
@@ -966,9 +966,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
pContentDev->SetFillColor( aManual );
Point aStart = pViewData->GetScrPos(
- aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True );
+ aRange.aStart.Col(), aRange.aStart.Row(), eWhich, true );
Point aEnd = pViewData->GetScrPos(
- aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, sal_True );
+ aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, true );
aStart.X() -= 2;
aStart.Y() -= 2;
@@ -1002,7 +1002,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
else
pContentDev->SetFillColor( aAutomatic );
Point aBreak = pViewData->GetScrPos(
- nBreak, aRange.aStart.Row(), eWhich, sal_True );
+ nBreak, aRange.aStart.Row(), eWhich, true );
pContentDev->DrawRect( Rectangle( aBreak.X()-1, aStart.Y(), aBreak.X(), aEnd.Y() ) );
}
}
@@ -1021,7 +1021,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
else
pContentDev->SetFillColor( aAutomatic );
Point aBreak = pViewData->GetScrPos(
- aRange.aStart.Col(), nBreak, eWhich, sal_True );
+ aRange.aStart.Col(), nBreak, eWhich, true );
pContentDev->DrawRect( Rectangle( aStart.X(), aBreak.Y()-1, aEnd.X(), aBreak.Y() ) );
}
}
@@ -1041,9 +1041,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if ( nPrEndX >= nX1 && nPrStartX <= nX2 )
{
Point aPageStart = pViewData->GetScrPos(
- nPrStartX, nPrStartY, eWhich, sal_True );
+ nPrStartX, nPrStartY, eWhich, true );
Point aPageEnd = pViewData->GetScrPos(
- nPrEndX+1,nPrEndY+1, eWhich, sal_True );
+ nPrEndX+1,nPrEndY+1, eWhich, true );
long nPageNo = rData.GetFirstPage();
if ( rData.IsTopDown() )
@@ -1301,7 +1301,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
if ( nCellSizeY < aBtnSize.Height() )
aBtnSize.Height() = nCellSizeY;
- Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, sal_True );
+ Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, true );
aPos.X() += nCellSizeX * nLayoutSign; // start of next cell
if (!bNextCell)
aPos.X() -= aBtnSize.Width() * nLayoutSign; // right edge of cell if next cell not available
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 219fa4b..182eec7 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -221,7 +221,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() );
// get screen pos in hmm for aCellPos
// and equiv screen pos
- Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(), aCellPos.Row(), eWhich, sal_True );
+ Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(), aCellPos.Row(), eWhich, true );
MapMode aDrawMode = GetDrawMapMode();
Point aCurPosHmm = PixelToLogic(aScreenPos, aDrawMode );
Point aGridOff = aCurPosHmm -aOldPos;
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index a6de25b..2ca1ceb 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -257,8 +257,8 @@ size_t ScOutlineWindow::GetLevelFromPos( long nLevelPos ) const
long ScOutlineWindow::GetColRowPos( SCCOLROW nColRowIndex ) const
{
long nDocPos = mbHoriz ?
- mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, sal_True ).X() :
- mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, sal_True ).Y();
+ mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, true ).X() :
+ mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, true ).Y();
return mnMainFirstPos + nDocPos;
}
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index fd7e35c..008954f 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -329,13 +329,13 @@ sal_Bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(),
- nPosX, nPosY, sal_True, sal_True ); // with Repair
+ nPosX, nPosY, true, true ); // with Repair
// for Autofill switch in the center of cell
// thereby don't prevent scrolling to bottom/right
if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX )
{
- sal_Bool bLeft, bTop;
+ bool bLeft, bTop;
pViewData->GetMouseQuadrant( aEffPos, GetWhich(), nPosX, nPosY, bLeft, bTop );
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index e4c7ae7..3a53aa0 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1980,14 +1980,14 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
SCsROW nPosY;
// bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters
aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, true, false, false );
- sal_Bool bLeft;
- sal_Bool bTop;
+ bool bLeft;
+ bool bTop;
aViewData.GetMouseQuadrant( aMouse, ePos, nPosX, nPosY, bLeft, bTop );
if (!bLeft)
++nPosX;
if (!bTop)
++nPosY;
- aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, sal_True );
+ aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, true );
rScreenPosPixel = pWin->OutputToNormalizedScreenPixel( aMouse );
}
@@ -2024,8 +2024,8 @@ void ScTabView::FreezeSplitters( bool bFreeze )
aSplit.Y() = aViewData.GetVSplitPos() - aWinStart.Y();
aViewData.GetPosFromPixel( aSplit.X(), aSplit.Y(), ePos, nPosX, nPosY );
- sal_Bool bLeft;
- sal_Bool bTop;
+ bool bLeft;
+ bool bTop;
aViewData.GetMouseQuadrant( aSplit, ePos, nPosX, nPosY, bLeft, bTop );
if (!bLeft)
++nPosX;
@@ -2126,7 +2126,7 @@ void ScTabView::SplitAtCursor()
SCCOL nPosX = aViewData.GetCurX();
SCROW nPosY = aViewData.GetCurY();
- Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, sal_True );
+ Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, true );
if ( nPosX > 0 )
DoHSplit( aSplit.X() + aWinStart.X() );
else
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f0ac6a7..7b764c3 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -71,7 +71,7 @@ using namespace com::sun::star;
#define TAG_TABBARWIDTH "tw:"
-static sal_Bool bMoveArea = false; //! Member?
+static bool bMoveArea = false; //! Member?
sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; //! Member !!!
ScViewDataTable::ScViewDataTable() :
@@ -317,13 +317,13 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
{
mpMarkData->SelectOneTable(0); // Sync with nTabNo.
- SetGridMode ( sal_True );
+ SetGridMode ( true );
SetSyntaxMode ( false );
- SetHeaderMode ( sal_True );
- SetTabMode ( sal_True );
- SetVScrollMode ( sal_True );
- SetHScrollMode ( sal_True );
- SetOutlineMode ( sal_True );
+ SetHeaderMode ( true );
+ SetTabMode ( true );
+ SetVScrollMode ( true );
+ SetHScrollMode ( true );
+ SetOutlineMode ( true );
aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ),
(long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) );
@@ -555,7 +555,7 @@ void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
{
- sal_Bool bAll = ( tabs.empty() );
+ bool bAll = ( tabs.empty() );
if ( !bAll ) // create associated table data
CreateTabData( tabs );
@@ -595,7 +595,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, bool bAll )
void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs )
{
- sal_Bool bAll = ( tabs.empty() );
+ bool bAll = ( tabs.empty() );
if ( !bAll ) // create associated table data
CreateTabData( tabs );
Fraction aFrac20( 1,5 );
@@ -762,7 +762,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
ScMarkData aNewMark(*mpMarkData); // use a local copy for MarkToSimple
- sal_Bool bMulti = aNewMark.IsMultiMarked();
+ bool bMulti = aNewMark.IsMultiMarked();
if (bMulti)
{
aNewMark.MarkToSimple();
@@ -782,7 +782,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
}
}
-sal_Bool ScViewData::SimpleColMarked()
+bool ScViewData::SimpleColMarked()
{
SCCOL nStartCol;
SCROW nStartRow;
@@ -792,12 +792,12 @@ sal_Bool ScViewData::SimpleColMarked()
SCTAB nEndTab;
if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE)
if (nStartRow==0 && nEndRow==MAXROW)
- return sal_True;
+ return true;
return false;
}
-sal_Bool ScViewData::SimpleRowMarked()
+bool ScViewData::SimpleRowMarked()
{
SCCOL nStartCol;
SCROW nStartRow;
@@ -807,12 +807,12 @@ sal_Bool ScViewData::SimpleRowMarked()
SCTAB nEndTab;
if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE)
if (nStartCol==0 && nEndCol==MAXCOL)
- return sal_True;
+ return true;
return false;
}
-sal_Bool ScViewData::IsMultiMarked()
+bool ScViewData::IsMultiMarked()
{
// Test for "real" multi selection, calling MarkToSimple on a local copy,
// and taking filtered in simple area marks into account.
@@ -885,9 +885,9 @@ void ScViewData::ResetOldCursor()
Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY,
Window* pWin, const ScPatternAttr* pPattern,
- sal_Bool bForceToTop )
+ bool bForceToTop )
{
- return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,sal_True),
+ return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,true),
pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ).
GetEditArea( pPattern, bForceToTop );
}
@@ -896,16 +896,16 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
ScEditEngineDefaulter* pNewEngine,
Window* pWin, SCCOL nNewX, SCROW nNewY )
{
- sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
+ bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
ScHSplitPos eHWhich = WhichH(eWhich);
- sal_Bool bWasThere = false;
+ bool bWasThere = false;
if (pEditView[eWhich])
{
// Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert
if (bEditActive[eWhich])
- bWasThere = sal_True;
+ bWasThere = true;
else
pEditView[eWhich]->SetEditEngine(pNewEngine);
@@ -934,10 +934,10 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue();
- sal_Bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) ||
+ bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) ||
((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue();
- sal_Bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler
+ bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler
Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich),
pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ).
@@ -971,9 +971,9 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
// For growing use only the alignment value from the attribute, numbers
// (existing or started) with default aligment extend to the right.
- sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
- sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
- sal_Bool bGrowBackwards = bGrowToLeft; // logical left
+ bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
+ bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
+ bool bGrowBackwards = bGrowToLeft; // logical left
if ( bLayoutRTL )
bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
if ( bAsianVertical )
@@ -1032,7 +1032,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
else if ( nEditAdjust == SVX_ADJUST_CENTER )
{
aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2;
- bMoveArea = sal_True; // always
+ bMoveArea = true; // always
}
else
{
@@ -1049,11 +1049,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich]->SetVisArea(aVis);
// UpdateMode has been disabled in ScInputHandler::StartTable
// must be enabled before EditGrowY (GetTextHeight)
- pNewEngine->SetUpdateMode( sal_True );
+ pNewEngine->SetUpdateMode( true );
pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) );
- EditGrowY( sal_True ); // adjust to existing text content
+ EditGrowY( true ); // adjust to existing text content
EditGrowX();
Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0);
@@ -1115,7 +1115,7 @@ void ScViewData::EditGrowX()
if ( !pCurView || !bEditActive[eWhich])
return;
- sal_Bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo );
+ bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo );
ScEditEngineDefaulter* pEngine =
(ScEditEngineDefaulter*) pCurView->GetEditEngine();
@@ -1131,22 +1131,22 @@ void ScViewData::EditGrowX()
// Margin ist schon bei der urspruenglichen Breite beruecksichtigt
long nTextWidth = pEngine->CalcTextWidth();
- sal_Bool bChanged = false;
- sal_Bool bAsianVertical = pEngine->IsVertical();
+ bool bChanged = false;
+ bool bAsianVertical = pEngine->IsVertical();
// get bGrow... variables the same way as in SetEditEngine
const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo );
SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue();
- sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
- sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
- sal_Bool bGrowBackwards = bGrowToLeft; // logical left
+ bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
+ bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
+ bool bGrowBackwards = bGrowToLeft; // logical left
if ( bLayoutRTL )
bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
if ( bAsianVertical )
bGrowCentered = bGrowToLeft = bGrowBackwards = false; // keep old behavior for asian mode
- sal_Bool bUnevenGrow = false;
+ bool bUnevenGrow = false;
if ( bGrowCentered )
{
while (aArea.GetWidth() + 0 < nTextWidth && ( nEditStartCol > nLeft || nEditEndCol < nRight ) )
@@ -1177,9 +1177,9 @@ void ScViewData::EditGrowX()
aArea.Right() = nCenter + aSize.Width() - nHalf - 1;
}
- bChanged = sal_True;
+ bChanged = true;
if ( nLogicLeft != nLogicRight )
- bUnevenGrow = sal_True;
+ bUnevenGrow = true;
}
}
else if ( bGrowBackwards )
@@ -1202,7 +1202,7 @@ void ScViewData::EditGrowX()
aArea.Right() = aArea.Left() + aSize.Width() - 1;
}
- bChanged = sal_True;
+ bChanged = true;
}
}
else
@@ -1225,7 +1225,7 @@ void ScViewData::EditGrowX()
aArea.Right() = aArea.Left() + aSize.Width() - 1;
}
- bChanged = sal_True;
+ bChanged = true;
}
}
@@ -1286,7 +1286,7 @@ void ScViewData::EditGrowX()
}
}
-void ScViewData::EditGrowY( sal_Bool bInitial )
+void ScViewData::EditGrowY( bool bInitial )
{
ScSplitPos eWhich = GetActivePart();
ScVSplitPos eVWhich = WhichV(eWhich);
@@ -1332,8 +1332,8 @@ void ScViewData::EditGrowY( sal_Bool bInitial )
nAllowedExtra = SC_GROWY_BIG_EXTRA;
}
- sal_Bool bChanged = false;
- sal_Bool bMaxReached = false;
+ bool bChanged = false;
+ bool bMaxReached = false;
while (aArea.GetHeight() + nAllowedExtra < nTextHeight && nEditEndRow < nBottom && !bMaxReached)
{
++nEditEndRow;
@@ -1344,10 +1344,10 @@ void ScViewData::EditGrowY( sal_Bool bInitial )
if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 )
{
aArea.Bottom() = aArea.Top() + aSize.Height() - 1;
- bMaxReached = sal_True; // don't occupy more cells beyond paper size
+ bMaxReached = true; // don't occupy more cells beyond paper size
}
- bChanged = sal_True;
+ bChanged = true;
nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row
}
@@ -1472,7 +1472,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich )
}
Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
- sal_Bool bAllowNeg ) const
+ bool bAllowNeg ) const
{
ScHSplitPos eWhichX = SC_SPLIT_LEFT;
ScVSplitPos eWhichY = SC_SPLIT_BOTTOM;
@@ -1606,12 +1606,12 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_
else
nX = nPosX-1; // rueckwaerts
- sal_Bool bOut = false;
+ bool bOut = false;
for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) )
{
SCsCOL nColNo = nX;
if ( nColNo < 0 || nColNo > MAXCOL )
- bOut = sal_True;
+ bOut = true;
else
{
sal_uInt16 nTSize = pDoc->GetColWidth( nColNo, nTabNo );
@@ -1728,9 +1728,9 @@ bool ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
}
}
-sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
SCsCOL& rPosX, SCsROW& rPosY,
- sal_Bool bTestMerge, sal_Bool bRepair, sal_Bool bNextIfLarge )
+ bool bTestMerge, bool bRepair, bool bNextIfLarge )
{
// special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint
@@ -1838,12 +1838,12 @@ sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWh
}
void ScViewData::GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
- SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop )
+ SCsCOL nPosX, SCsROW nPosY, bool& rLeft, bool& rTop )
{
- sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
+ bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
long nLayoutSign = bLayoutRTL ? -1 : 1;
- Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, sal_True );
+ Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, true );
long nSizeX;
long nSizeY;
GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY );
@@ -1997,7 +1997,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
long nSize;
long nTwips;
long nAdd;
- sal_Bool bEnd;
+ bool bEnd;
nSize = 0;
nTwips = (long) (rVisAreaStart.X() / HMM_PER_TWIPS);
@@ -2014,7 +2014,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
++nX1;
}
else
- bEnd = sal_True;
+ bEnd = true;
}
nSize = 0;
@@ -2030,7 +2030,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
++nY1;
}
else
- bEnd = sal_True;
+ bEnd = true;
}
SetActivePart( SC_SPLIT_BOTTOMLEFT );
@@ -2104,7 +2104,7 @@ ScDrawView* ScViewData::GetScDrawView()
return pView->GetScDrawView();
}
-sal_Bool ScViewData::IsMinimized()
+bool ScViewData::IsMinimized()
{
OSL_ENSURE( pView, "IsMinimized() ohne View" );
return pView->IsMinimized();
@@ -2715,7 +2715,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
sal_Int32 nCount(rSettings.getLength());
sal_Int32 nTemp32(0);
sal_Int16 nTemp16(0);
- sal_Bool bPageMode(false);
+ bool bPageMode(false);
EnsureTabDataSize(GetDocument()->GetTableCount()-1);
@@ -2883,11 +2883,11 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
void ScViewData::SetOptions( const ScViewOptions& rOpt )
{
// if visibility of horiz. ScrollBar is changed, TabBar may have to be resized...
- sal_Bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
+ bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
// if graphics are turned on or off, animation has to be started or stopped
// graphics are controlled by VOBJ_TYPE_OLE
- sal_Bool bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
+ bool bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
rOpt.GetObjMode(VOBJ_TYPE_OLE) );
*pOptions = rOpt;
@@ -2905,18 +2905,18 @@ Point ScViewData::GetMousePosPixel()
return pView->GetMousePosPixel();
}
-void ScViewData::UpdateInputHandler( sal_Bool bForce, sal_Bool bStopEditing )
+void ScViewData::UpdateInputHandler( bool bForce, bool bStopEditing )
{
if (pViewShell)
pViewShell->UpdateInputHandler( bForce, bStopEditing );
}
-sal_Bool ScViewData::IsOle()
+bool ScViewData::IsOle()
{
return pDocShell && pDocShell->IsOle();
}
-sal_Bool ScViewData::UpdateFixX( SCTAB nTab ) // sal_True = Wert geaendert
+bool ScViewData::UpdateFixX( SCTAB nTab ) // true = Wert geaendert
{
if (!ValidTab(nTab)) // Default
nTab=nTabNo; // akuelle Tabelle
@@ -2945,13 +2945,13 @@ sal_Bool ScViewData::UpdateFixX( SCTAB nTab ) // sal_True = Wert g
maTabData[nTab]->nHSplitPos = nNewPos;
if (nTab == nTabNo)
RecalcPixPos(); //! sollte nicht noetig sein !!!
- return sal_True;
+ return true;
}
return false;
}
-sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert geaendert
+bool ScViewData::UpdateFixY( SCTAB nTab ) // true = Wert geaendert
{
if (!ValidTab(nTab)) // Default
nTab=nTabNo; // akuelle Tabelle
@@ -2980,7 +2980,7 @@ sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert g
maTabData[nTab]->nVSplitPos = nNewPos;
if (nTab == nTabNo)
RecalcPixPos(); //! sollte nicht noetig sein !!!
- return sal_True;
+ return true;
}
return false;
commit ab5c5702ba88da92649e9d8937bbd00dd9afb599
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 19 11:34:59 2014 +0200
sal_Bool->bool
Change-Id: I2dad64e3d7ba90a9d2f4779697a02272b9ccad9f
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 9b64c82..160deb2 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -288,7 +288,7 @@ void ScSelectionTransferObj::CreateCellData()
// bApi = sal_True -> no error messages
// #i18364# bStopEdit = sal_False -> don't end edit mode
// (this may be called from pasting into the edit line)
- sal_Bool bCopied = pViewData->GetView()->CopyToClip( pClipDoc, false, sal_True, sal_True, false );
+ sal_Bool bCopied = pViewData->GetView()->CopyToClip( pClipDoc, false, true, true, false );
ScDrawLayer::SetGlobalDrawPersist(NULL);
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index daad48e..9ef8671 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -61,7 +61,7 @@ class ScViewFunc : public ScTabView
private:
ScAddress aFormatSource; // for automatic extension of formatting
ScRange aFormatArea;
- sal_Bool bFormatValid;
+ bool bFormatValid;
public:
ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
@@ -71,9 +71,9 @@ public:
void GetSelectionFrame ( SvxBoxItem& rLineOuter,
SvxBoxInfoItem& rLineInner );
- sal_uInt8 GetSelectionScriptType();
+ sal_uInt8 GetSelectionScriptType();
- sal_Bool GetAutoSumArea(ScRangeList& rRangeList);
+ bool GetAutoSumArea(ScRangeList& rRangeList);
void EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr);
bool AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue );
OUString GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr );
@@ -94,11 +94,11 @@ public:
void EnterDataAtCursor( const OUString& rString ); //! Not used?
- SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, sal_Bool bIncludeObjects = false );
- SC_DLLPUBLIC sal_Bool CopyToClip( ScDocument* pClipDoc = NULL, sal_Bool bCut = false, sal_Bool bApi = false,
- sal_Bool bIncludeObjects = false, sal_Bool bStopEdit = true );
- SC_DLLPUBLIC sal_Bool CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange, sal_Bool bCut = false,
- sal_Bool bApi = false, sal_Bool bIncludeObjects = false, sal_Bool bStopEdit = true, sal_Bool bUseRangeForVBA = true );
+ SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, bool bIncludeObjects = false );
+ SC_DLLPUBLIC bool CopyToClip( ScDocument* pClipDoc = NULL, bool bCut = false, bool bApi = false,
+ bool bIncludeObjects = false, bool bStopEdit = true );
+ SC_DLLPUBLIC bool CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange, bool bCut = false,
+ bool bApi = false, bool bIncludeObjects = false, bool bStopEdit = true, bool bUseRangeForVBA = true );
ScTransferObj* CopyToTransferable();
SC_DLLPUBLIC bool PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
sal_uInt16 nFunction = PASTE_NOFUNC, bool bSkipEmpty = false,
@@ -107,34 +107,34 @@ public:
sal_uInt16 nUndoExtraFlags = IDF_NONE,
bool bAllowDialogs = false );
- void FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, sal_Bool bSkipEmpty, sal_Bool bAsLink );
+ void FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink );
SC_DLLPUBLIC void PasteFromSystem();
- SC_DLLPUBLIC sal_Bool PasteFromSystem( sal_uLong nFormatId, sal_Bool bApi = false );
+ SC_DLLPUBLIC bool PasteFromSystem( sal_uLong nFormatId, bool bApi = false );
void PasteFromTransferable( const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable );
void PasteDraw();
void PasteDraw( const Point& rLogicPos, SdrModel* pModel,
- sal_Bool bGroup = false, sal_Bool bSameDocClipboard = false );
+ bool bGroup = false, bool bSameDocClipboard = false );
- sal_Bool PasteOnDrawObjectLinked(
- const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
- SdrObject& rHitObj);
+ bool PasteOnDrawObjectLinked(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
+ SdrObject& rHitObj);
- sal_Bool PasteDataFormat( sal_uLong nFormatId,
+ bool PasteDataFormat( sal_uLong nFormatId,
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable,
SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL,
- sal_Bool bLink = false, sal_Bool bAllowDialogs = false );
+ bool bLink = false, bool bAllowDialogs = false );
- sal_Bool PasteFile( const Point&, const OUString&, sal_Bool bLink=false );
- sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
- sal_Bool PasteBitmapEx( const Point&, const BitmapEx& );
- sal_Bool PasteMetaFile( const Point&, const GDIMetaFile& );
- sal_Bool PasteGraphic( const Point& rPos, const Graphic& rGraphic,
+ bool PasteFile( const Point&, const OUString&, bool bLink=false );
+ bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
+ bool PasteBitmapEx( const Point&, const BitmapEx& );
+ bool PasteMetaFile( const Point&, const GDIMetaFile& );
+ bool PasteGraphic( const Point& rPos, const Graphic& rGraphic,
const OUString& rFile, const OUString& rFilter );
- sal_Bool PasteBookmark( sal_uLong nFormatId,
+ bool PasteBookmark( sal_uLong nFormatId,
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable,
SCCOL nPosX, SCROW nPosY );
@@ -143,17 +143,17 @@ public:
void InsertBookmark( const OUString& rDescription, const OUString& rURL,
SCCOL nPosX, SCROW nPosY, const OUString* pTarget = NULL,
- sal_Bool bTryReplace = false );
- bool HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
+ bool bTryReplace = false );
+ bool HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
long DropRequestHdl( Exchange* pExchange );
- sal_Bool MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
- sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
+ bool MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
+ bool bCut, bool bRecord, bool bPaint, bool bApi );
- sal_Bool LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_Bool bApi );
+ bool LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, bool bApi );
void CreateNames( sal_uInt16 nFlags );
- sal_uInt16 GetCreateNameFlags();
+ sal_uInt16 GetCreateNameFlags();
void InsertNameList();
bool InsertName( const OUString& rName, const OUString& rSymbol,
const OUString& rType );
@@ -170,11 +170,12 @@ public:
void ApplyUserItemSet( const SfxItemSet& rItemSet );
- const SfxStyleSheet* GetStyleSheetFromMarked();
- void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
+ const SfxStyleSheet*
+ GetStyleSheetFromMarked();
+ void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
bool bRecord = true );
- void RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
- void UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
+ void RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
+ void UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
void SetNumberFormat( short nFormatType, sal_uLong nAdd = 0 );
void SetNumFmtByStr( const OUString& rCode );
@@ -201,65 +202,67 @@ public:
ScMarkData* pMarkData = NULL );
void SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips,
bool bRecord = true, bool bPaint = true );
- void ShowMarkedColumns( sal_Bool bShow, sal_Bool bRecord = sal_True );
- void ShowMarkedRows( sal_Bool bShow, sal_Bool bRecord = sal_True );
+ void ShowMarkedColumns( bool bShow, bool bRecord = true );
+ void ShowMarkedRows( bool bShow, bool bRecord = true );
- sal_Bool AdjustBlockHeight( sal_Bool bPaint = sal_True, ScMarkData* pMarkData = NULL );
- sal_Bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bPaint = sal_True );
+ bool AdjustBlockHeight( bool bPaint = true, ScMarkData* pMarkData = NULL );
+ bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint = true );
void ModifyCellSize( ScDirection eDir, bool bOptimal );
- SC_DLLPUBLIC void InsertPageBreak( sal_Bool bColumn, sal_Bool bRecord = sal_True,
+ SC_DLLPUBLIC void
+ InsertPageBreak( bool bColumn, bool bRecord = true,
const ScAddress* pPos = NULL,
- sal_Bool bSetModified = sal_True );
- SC_DLLPUBLIC void DeletePageBreak( sal_Bool bColumn, sal_Bool bRecord = sal_True,
+ bool bSetModified = true );
+ SC_DLLPUBLIC void
+ DeletePageBreak( bool bColumn, bool bRecord = true,
const ScAddress* pPos = NULL,
- sal_Bool bSetModified = sal_True );
+ bool bSetModified = true );
void RemoveManualBreaks();
void SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages);
void AdjustPrintZoom();
- sal_Bool TestMergeCells();
- sal_Bool TestRemoveMerge();
+ bool TestMergeCells();
+ bool TestRemoveMerge();
- sal_Bool MergeCells( sal_Bool bApi, sal_Bool& rDoContents, sal_Bool bRecord = true, sal_Bool bCenter = false );
- sal_Bool RemoveMerge( sal_Bool bRecord = true );
+ bool MergeCells( bool bApi, bool& rDoContents, bool bRecord = true, bool bCenter = false );
+ bool RemoveMerge( bool bRecord = true );
void FillSimple( FillDir eDir, bool bRecord = true );
void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
- double fStart, double fStep, double fMax, sal_Bool bRecord = sal_True );
+ double fStart, double fStep, double fMax, bool bRecord = true );
void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
- SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, sal_Bool bRecord = sal_True );
+ SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord = true );
void FillCrossDblClick();
void TransliterateText( sal_Int32 nType );
ScAutoFormatData* CreateAutoFormatData();
- void AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord = sal_True );
+ void AutoFormat( sal_uInt16 nFormatNo, bool bRecord = true );
- sal_Bool SearchAndReplace( const SvxSearchItem* pSearchItem,
- sal_Bool bAddUndo, sal_Bool bIsApi );
+ bool SearchAndReplace( const SvxSearchItem* pSearchItem,
+ bool bAddUndo, bool bIsApi );
void Solve( const ScSolveParam& rParam );
- void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True );
+ void TabOp( const ScTabOpParam& rParam, bool bRecord = true );
- sal_Bool InsertTable( const OUString& rName, SCTAB nTabNr, sal_Bool bRecord = sal_True );
- sal_Bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True);
+ bool InsertTable( const OUString& rName, SCTAB nTabNr, bool bRecord = true );
+ bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, bool bRecord = true);
- sal_Bool AppendTable( const OUString& rName, sal_Bool bRecord = sal_True );
+ bool AppendTable( const OUString& rName, bool bRecord = true );
- sal_Bool DeleteTable( SCTAB nTabNr, sal_Bool bRecord = true );
- sal_Bool DeleteTables(const std::vector<SCTAB>& TheTabs, sal_Bool bRecord = true );
+ bool DeleteTable( SCTAB nTabNr, bool bRecord = true );
+ bool DeleteTables(const std::vector<SCTAB>& TheTabs, bool bRecord = true );
bool DeleteTables(SCTAB nTab, SCTAB nSheets);
- sal_Bool RenameTable( const OUString& rName, SCTAB nTabNr );
- void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName = NULL );
+ bool RenameTable( const OUString& rName, SCTAB nTabNr );
+ void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName = NULL );
void ImportTables( ScDocShell* pSrcShell,
SCTAB nCount, const SCTAB* pSrcTabs,
- sal_Bool bLink,SCTAB nTab);
+ bool bLink,SCTAB nTab);
bool SetTabBgColor( const Color& rColor, SCTAB nTabNr );
bool SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList );
@@ -287,22 +290,22 @@ public:
void InsertDraw();
void SetSelectionFrameLines( const ::editeng::SvxBorderLine* pLine,
- sal_Bool bColorOnly );
+ bool bColorOnly );
void SetNoteText( const ScAddress& rPos, const OUString& rNoteText );
void ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate );
- void DoRefConversion( sal_Bool bRecord = sal_True );
+ void DoRefConversion( bool bRecord = true );
- void DoHangulHanjaConversion( sal_Bool bRecord = true );
- void DoThesaurus( sal_Bool bRecord = true );
+ void DoHangulHanjaConversion( bool bRecord = true );
+ void DoThesaurus( bool bRecord = true );
/** Generic implementation of sheet conversion functions. */
- void DoSheetConversion( const ScConversionParam& rParam, sal_Bool bRecord = sal_True );
+ void DoSheetConversion( const ScConversionParam& rParam, bool bRecord = true );
- void SetPrintRanges( sal_Bool bEntireSheet,
+ void SetPrintRanges( bool bEntireSheet,
const OUString* pPrint,
const OUString* pRepCol, const OUString* pRepRow,
- sal_Bool bAddPrint );
+ bool bAddPrint );
void DetectiveAddPred();
void DetectiveDelPred();
@@ -324,18 +327,19 @@ public:
void ForgetFormatArea() { bFormatValid = false; }
bool SelectionEditable( bool* pOnlyNotBecauseOfMatrix = NULL );
- SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow ,
- SCROW nStartRow , SCCOL nStartCol ,
- SCROW nEndRow , SCCOL nEndCol ,
- boost::ptr_vector<boost::nullable<Edit> >& aEdits,
- sal_uInt16 aColLength );
+ SC_DLLPUBLIC void
+ DataFormPutData( SCROW nCurrentRow ,
+ SCROW nStartRow , SCCOL nStartCol ,
+ SCROW nEndRow , SCCOL nEndCol ,
+ boost::ptr_vector<boost::nullable<Edit> >& aEdits,
+ sal_uInt16 aColLength );
void UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr = NULL );
// Internal helper functions
protected:
void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine,
const ::editeng::SvxBorderLine* pDestLine,
const ::editeng::SvxBorderLine* pSrcLine,
- sal_Bool bColor );
+ bool bColor );
private:
@@ -343,17 +347,17 @@ private:
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable );
- bool PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
+ bool PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs,
InsCellCmd eMoveMode, sal_uInt16 nUndoFlags );
- bool PasteFromClipToMultiRanges( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
+ bool PasteFromClipToMultiRanges( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs,
InsCellCmd eMoveMode, sal_uInt16 nUndoFlags );
void PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMarkData& rMark);
- sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, bool bFormula );
+ sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, bool bFormula );
void StartFormatArea();
bool TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bAttrChanged );
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index c11285d..1fdf7d15 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -826,7 +826,7 @@ void ScUndoCut::Redo()
void ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, true );
}
bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index e5c1628..a23cf09 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -621,7 +621,7 @@ void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget)
rViewShell.FillSimple( eFillDir, true );
else
rViewShell.FillSeries( eFillDir, eFillCmd, eFillDateCmd,
- fStartValue, fStepValue, fMaxValue, sal_True );
+ fStartValue, fStepValue, fMaxValue, true );
}
}
@@ -745,8 +745,8 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget)
if (rTarget.ISA(ScTabViewTarget))
{
ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
- sal_Bool bCont = false;
- rViewShell.MergeCells( false, bCont, sal_True );
+ bool bCont = false;
+ rViewShell.MergeCells( false, bCont, true );
}
}
@@ -896,7 +896,7 @@ void ScUndoAutoFormat::Redo()
void ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, true );
}
bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1052,7 +1052,7 @@ void ScUndoReplace::Redo()
{
SetViewMarkData( aMarkData );
- pViewShell->SearchAndReplace( pSearchItem, false, sal_True );
+ pViewShell->SearchAndReplace( pSearchItem, false, true );
}
}
else if (pSearchItem->GetPattern() &&
@@ -1065,7 +1065,7 @@ void ScUndoReplace::Redo()
}
else
if (pViewShell)
- pViewShell->SearchAndReplace( pSearchItem, false, sal_True );
+ pViewShell->SearchAndReplace( pSearchItem, false, true );
SetChangeTrack();
@@ -1075,7 +1075,7 @@ void ScUndoReplace::Redo()
void ScUndoReplace::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, sal_True, false );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, true, false );
}
bool ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1257,7 +1257,7 @@ void ScUndoConversion::Redo()
void ScUndoConversion::Repeat( SfxRepeatTarget& rTarget )
{
if( rTarget.ISA( ScTabViewTarget ) )
- ((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, true );
}
bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index a211500..9f60f46 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -565,9 +565,9 @@ void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget)
ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
if (bInsert)
- rViewShell.InsertPageBreak(bColumn, sal_True);
+ rViewShell.InsertPageBreak(bColumn, true);
else
- rViewShell.DeletePageBreak(bColumn, sal_True);
+ rViewShell.DeletePageBreak(bColumn, true);
}
}
@@ -769,7 +769,7 @@ void ScUndoThesaurus::Redo()
void ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( true );
}
bool ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 498d463..7740bd8 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -413,7 +413,7 @@ void ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget)
if (rTarget.ISA(ScTabViewTarget))
{
ScTabViewShell* pViewShell = ((ScTabViewTarget&)rTarget).GetViewShell();
- pViewShell->DeleteTable( pViewShell->GetViewData()->GetTabNo(), sal_True );
+ pViewShell->DeleteTable( pViewShell->GetViewData()->GetTabNo(), true );
}
}
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index a50834c..1550c0c 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -180,7 +180,7 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
ScTabViewShell* pViewShell = getBestViewShell( xModel );
if ( pViewShell )
{
- pViewShell->CutToClip( NULL, sal_True );
+ pViewShell->CutToClip( NULL, true );
// mark the copied transfer object so it is used in ScVbaRange::Insert
ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( NULL );
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 45163a2..dfb9294 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4093,9 +4093,9 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
{
ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
- pViewShell->InsertPageBreak( bColumn, sal_True, &aAddr);
+ pViewShell->InsertPageBreak( bColumn, true, &aAddr);
else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
- pViewShell->DeletePageBreak( bColumn, sal_True, &aAddr);
+ pViewShell->DeletePageBreak( bColumn, true, &aAddr);
}
}
}
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f11be50..6a7932e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1502,7 +1502,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( bDraw && nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
pTabViewShell->PasteDraw();
else
- bRet = pTabViewShell->PasteFromSystem(nFormat, sal_True); // TRUE: no error messages
+ bRet = pTabViewShell->PasteFromSystem(nFormat, true); // TRUE: no error messages
}
if ( bRet )
@@ -1590,7 +1590,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
case FID_INS_COLBRK:
- pTabViewShell->InsertPageBreak( sal_True );
+ pTabViewShell->InsertPageBreak( true );
rReq.Done();
break;
@@ -1600,7 +1600,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
case FID_DEL_COLBRK:
- pTabViewShell->DeletePageBreak( sal_True );
+ pTabViewShell->DeletePageBreak( true );
rReq.Done();
break;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index f7f1a0b..d9acade 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -756,7 +756,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
if( bMerge )
{
// merge - check if to move contents of covered cells
- sal_Bool bMoveContents = false;
+ bool bMoveContents = false;
sal_Bool bApi = rReq.IsAPI();
const SfxPoolItem* pItem;
if ( pReqArgs &&
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 1fb5941..8f371fb 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1767,7 +1767,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
if ( pDefLine )
{
pDefLine->SetColor( rColor );
- pTabViewShell->SetSelectionFrameLines( pDefLine, sal_True );
+ pTabViewShell->SetSelectionFrameLines( pDefLine, true );
}
else
{
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c19c743..9020afd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4157,12 +4157,12 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
if ( bIsLink )
{
// call with bApi = sal_True to avoid error messages in drop handler
- bDone = pView->LinkBlock( aSource, aDest.aStart, sal_True /*bApi*/ );
+ bDone = pView->LinkBlock( aSource, aDest.aStart, true /*bApi*/ );
}
else
{
// call with bApi = sal_True to avoid error messages in drop handler
- bDone = pView->MoveBlockTo( aSource, aDest.aStart, bIsMove, sal_True /*bRecord*/, sal_True /*bPaint*/, sal_True /*bApi*/ );
+ bDone = pView->MoveBlockTo( aSource, aDest.aStart, bIsMove, true /*bRecord*/, true /*bPaint*/, true /*bApi*/ );
}
}
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index a0bd112..ef4d511 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -958,12 +958,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL)
{
ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab );
- pViewFunc->DeletePageBreak( sal_True, sal_True, &aOldAddr, false );
+ pViewFunc->DeletePageBreak( true, true, &aOldAddr, false );
}
if ( !bHide && !bToEnd ) // am Ende nicht
{
ScAddress aNewAddr( static_cast<SCCOL>(nNew), nPosY, nTab );
- pViewFunc->InsertPageBreak( sal_True, sal_True, &aNewAddr, false );
+ pViewFunc->InsertPageBreak( true, true, &aNewAddr, false );
}
if ( bGrow )
{
@@ -972,7 +972,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak )
{
ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab );
- pViewFunc->InsertPageBreak( sal_True, sal_True, &aPrev, false );
+ pViewFunc->InsertPageBreak( true, true, &aPrev, false );
}
if (!pDocSh->AdjustPrintZoom( ScRange(
@@ -985,12 +985,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list