[Libreoffice-commits] core.git: 6 commits - sc/inc sc/source
Noel Grandin
noel at peralex.com
Thu Jan 16 23:17:21 PST 2014
sc/inc/appoptio.hxx | 28 ++++++++++++++--------------
sc/inc/cellsuno.hxx | 6 +++---
sc/source/core/tool/appoptio.cxx | 4 ++--
sc/source/ui/app/scmod.cxx | 4 ++--
sc/source/ui/inc/viewdata.hxx | 4 ++--
sc/source/ui/unoobj/cellsuno.cxx | 2 +-
sc/source/ui/unoobj/viewuno.cxx | 4 ++--
sc/source/ui/view/tabview.cxx | 2 +-
sc/source/ui/view/tabvwsh3.cxx | 4 ++--
sc/source/ui/view/tabvwsh4.cxx | 8 ++++----
sc/source/ui/view/viewdata.cxx | 4 ++--
11 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 342d9a34a55ca40250e2e9a18a34c9fff994b9c8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 15:52:23 2014 +0200
sal_Bool->bool
Change-Id: Ibc90c5b25b7dfe4b03f92ea61d4a435edfa4f8aa
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 75c2147..12d5c15 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -73,18 +73,18 @@ public:
void SetDefaultObjectSizeHeight(sal_Int32 nNew) { nDefaultObjectSizeHeight = nNew; }
sal_Int32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; }
- void SetShowSharedDocumentWarning( sal_Bool bNew ) { mbShowSharedDocumentWarning = bNew; }
- sal_Bool GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; }
+ void SetShowSharedDocumentWarning( bool bNew ) { mbShowSharedDocumentWarning = bNew; }
+ bool GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; }
ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return meKeyBindingType; }
void SetKeyBindingType( ScOptionsUtil::KeyBindingType e ) { meKeyBindingType = e; }
const ScAppOptions& operator= ( const ScAppOptions& rOpt );
private:
- FieldUnit eMetric;
+ FieldUnit eMetric;
sal_uInt16 nLRUFuncCount;
sal_uInt16* pLRUList;
- SvxZoomType eZoomType;
+ SvxZoomType eZoomType;
sal_uInt16 nZoom;
bool bSynchronizeZoom;
sal_uInt16 nStatusFunc;
@@ -97,7 +97,7 @@ private:
ScLkUpdMode eLinkMode;
sal_Int32 nDefaultObjectSizeWidth;
sal_Int32 nDefaultObjectSizeHeight;
- sal_Bool mbShowSharedDocumentWarning;
+ bool mbShowSharedDocumentWarning;
ScOptionsUtil::KeyBindingType meKeyBindingType;
};
commit a9aa6d96d2cdf0d99e47d9b509dc6efcbcc79163
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 15:49:55 2014 +0200
sal_Bool->bool
Change-Id: If5aa8e345d301d24b29dd19b19fc40978d83c347
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 9269a5c..75c2147 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -53,8 +53,8 @@ public:
sal_uInt16 GetStatusFunc() const { return nStatusFunc; }
void SetAutoComplete( bool bNew ) { bAutoComplete = bNew; }
bool GetAutoComplete() const { return bAutoComplete; }
- void SetDetectiveAuto( sal_Bool bNew ) { bDetectiveAuto = bNew; }
- sal_Bool GetDetectiveAuto() const { return bDetectiveAuto; }
+ void SetDetectiveAuto( bool bNew ) { bDetectiveAuto = bNew; }
+ bool GetDetectiveAuto() const { return bDetectiveAuto; }
void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; }
sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; }
@@ -89,7 +89,7 @@ private:
bool bSynchronizeZoom;
sal_uInt16 nStatusFunc;
bool bAutoComplete;
- sal_Bool bDetectiveAuto;
+ bool bDetectiveAuto;
sal_uInt32 nTrackContentColor;
sal_uInt32 nTrackInsertColor;
sal_uInt32 nTrackDeleteColor;
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index a48ef53..28012c1 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -63,7 +63,7 @@ void ScAppOptions::SetDefaults()
bSynchronizeZoom = sal_True;
nStatusFunc = SUBTOTAL_FUNC_SUM;
bAutoComplete = true;
- bDetectiveAuto = sal_True;
+ bDetectiveAuto = true;
delete [] pLRUList;
pLRUList = new sal_uInt16[5]; // sinnvoll vorbelegen
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 5ea9b4b..d5ab38f0 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -459,7 +459,7 @@ void ScModule::Execute( SfxRequest& rReq )
case SID_DETECTIVE_AUTO:
{
ScAppOptions aNewOpts( GetAppOptions() );
- sal_Bool bNew = !aNewOpts.GetDetectiveAuto();
+ bool bNew = !aNewOpts.GetDetectiveAuto();
SFX_REQUEST_ARG( rReq, pAuto, SfxBoolItem, SID_DETECTIVE_AUTO, false );
if ( pAuto )
bNew = pAuto->GetValue();
commit d07b5fd742995d2d0ea645c70e51b8a27f7804fa
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 15:41:35 2014 +0200
sal_Bool->bool
Change-Id: I56a9e51dabc94fa9f2965c0a070c62a18298435d
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 68bd62e..9269a5c 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -51,8 +51,8 @@ public:
const sal_uInt16 nCount );
void SetStatusFunc( sal_uInt16 nNew ) { nStatusFunc = nNew; }
sal_uInt16 GetStatusFunc() const { return nStatusFunc; }
- void SetAutoComplete( sal_Bool bNew ) { bAutoComplete = bNew; }
- sal_Bool GetAutoComplete() const { return bAutoComplete; }
+ void SetAutoComplete( bool bNew ) { bAutoComplete = bNew; }
+ bool GetAutoComplete() const { return bAutoComplete; }
void SetDetectiveAuto( sal_Bool bNew ) { bDetectiveAuto = bNew; }
sal_Bool GetDetectiveAuto() const { return bDetectiveAuto; }
@@ -88,7 +88,7 @@ private:
sal_uInt16 nZoom;
bool bSynchronizeZoom;
sal_uInt16 nStatusFunc;
- sal_Bool bAutoComplete;
+ bool bAutoComplete;
sal_Bool bDetectiveAuto;
sal_uInt32 nTrackContentColor;
sal_uInt32 nTrackInsertColor;
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 7479c45..a48ef53 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -62,7 +62,7 @@ void ScAppOptions::SetDefaults()
eZoomType = SVX_ZOOM_PERCENT;
bSynchronizeZoom = sal_True;
nStatusFunc = SUBTOTAL_FUNC_SUM;
- bAutoComplete = sal_True;
+ bAutoComplete = true;
bDetectiveAuto = sal_True;
delete [] pLRUList;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 4ff50e6..5ea9b4b 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -446,7 +446,7 @@ void ScModule::Execute( SfxRequest& rReq )
case FID_AUTOCOMPLETE:
{
ScAppOptions aNewOpts( GetAppOptions() );
- sal_Bool bNew = !aNewOpts.GetAutoComplete();
+ bool bNew = !aNewOpts.GetAutoComplete();
aNewOpts.SetAutoComplete( bNew );
SetAppOptions( aNewOpts );
ScInputHandler::SetAutoComplete( bNew );
commit 13df6667565421550a884b58af29b3ce4cc745c3
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 15:29:31 2014 +0200
sal_Bool->bool
Change-Id: Ie0849ac28cba7b0d00c7793019d9829d2d0001b0
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e4a245f..74cd07c 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -188,7 +188,7 @@ private:
sal_Int64 nObjectId;
sal_Bool bChartColAsHdr;
sal_Bool bChartRowAsHdr;
- sal_Bool bCursorOnly;
+ bool bCursorOnly;
sal_Bool bGotDataChangedHint;
XModifyListenerArr_Impl aValueListeners;
@@ -255,8 +255,8 @@ public:
void SetNewRange(const ScRange& rNew); // for cursor
void SetNewRanges(const ScRangeList& rNew);
- void SetCursorOnly(sal_Bool bSet);
- sal_Bool IsCursorOnly() const { return bCursorOnly; }
+ void SetCursorOnly(bool bSet);
+ bool IsCursorOnly() const { return bCursorOnly; }
// XSheetOperation
virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index ddf3dbd..6340667e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1731,7 +1731,7 @@ void ScCellRangesBase::SetNewRanges(const ScRangeList& rNew)
RefChanged();
}
-void ScCellRangesBase::SetCursorOnly( sal_Bool bSet )
+void ScCellRangesBase::SetCursorOnly( bool bSet )
{
// set for a selection object that is created from the cursor position
// without anything selected (may contain several sheets)
commit 94e75e3c976653204a44a2eb5aff71caf816bdf4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 14:50:12 2014 +0200
sal_Bool->bool
Change-Id: I027b7bd5d1708676521faf7f03f553d2c083f04e
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 58267c1..c6c748a 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -308,10 +308,10 @@ public:
void SetPagebreakMode( bool bSet );
void SetPasteMode ( ScPasteFlags nFlags ) { nPasteFlags = nFlags; }
- void SetZoomType( SvxZoomType eNew, sal_Bool bAll );
+ void SetZoomType( SvxZoomType eNew, bool bAll );
void SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
void SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs );
- void SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll );
+ void SetZoom( const Fraction& rNewX, const Fraction& rNewY, bool bAll );
void RefreshZoom();
void SetSelCtrlMouseClick( bool bTmp ) { bSelCtrlMouseClick = bTmp; }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index ea92ba7..3095a78 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1570,11 +1570,11 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType)
{
case SVX_ZOOM_WHOLEPAGE:
case SVX_ZOOM_PAGEWIDTH:
- pView->SetZoomType( eZoomType, sal_True );
+ pView->SetZoomType( eZoomType, true );
break;
default:
- pView->SetZoomType( SVX_ZOOM_PERCENT, sal_True );
+ pView->SetZoomType( SVX_ZOOM_PERCENT, true );
}
SetZoom( nZoom );
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 36110fe..6018684 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -413,7 +413,7 @@ void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoo
aNewY = aFrac400;
GetViewData()->UpdateScreenZoom( aNewX, aNewY );
- SetZoom( aNewX, aNewY, sal_True );
+ SetZoom( aNewX, aNewY, true );
PaintGrid();
PaintTop();
@@ -1750,13 +1750,13 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
if ( GetViewData()->GetDocShell()->IsPreview() )
{
// preview for template dialog: always show whole page
- SetZoomType( SVX_ZOOM_WHOLEPAGE, sal_True ); // zoom value is recalculated at next Resize
+ SetZoomType( SVX_ZOOM_WHOLEPAGE, true ); // zoom value is recalculated at next Resize
}
else
{
Fraction aFract( rAppOpt.GetZoom(), 100 );
- SetZoom( aFract, aFract, sal_True );
- SetZoomType( rAppOpt.GetZoomType(), sal_True );
+ SetZoom( aFract, aFract, true );
+ SetZoomType( rAppOpt.GetZoomType(), true );
}
// make Controller known to SFX
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8444ce8..d047147 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -582,7 +582,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
}
}
-void ScViewData::SetZoomType( SvxZoomType eNew, sal_Bool bAll )
+void ScViewData::SetZoomType( SvxZoomType eNew, bool bAll )
{
std::vector< SCTAB > vTabs; // Empty for all tabs
if ( !bAll ) // get selected tabs
@@ -667,7 +667,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
RefreshZoom();
}
-void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll )
+void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, bool bAll )
{
std::vector< SCTAB > vTabs;
if ( !bAll ) // get selected tabs
commit 8843078a1a9a3126d6d90cde5b98b171963446c8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 13:25:37 2014 +0200
sal_Bool -> bool
Change-Id: Ic17c27323279f01cf35701bcd5aa4d89bc18a74c
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index fad7496..68bd62e 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -43,8 +43,8 @@ public:
sal_uInt16 GetZoom() const { return nZoom; }
void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; }
SvxZoomType GetZoomType() const { return eZoomType; }
- void SetSynchronizeZoom( sal_Bool bNew ) { bSynchronizeZoom = bNew; }
- sal_Bool GetSynchronizeZoom() const { return bSynchronizeZoom; }
+ void SetSynchronizeZoom( bool bNew ) { bSynchronizeZoom = bNew; }
+ bool GetSynchronizeZoom() const { return bSynchronizeZoom; }
sal_uInt16 GetLRUFuncListCount() const { return nLRUFuncCount; }
sal_uInt16* GetLRUFuncList() const { return pLRUList; }
void SetLRUFuncList( const sal_uInt16* pList,
@@ -86,7 +86,7 @@ private:
sal_uInt16* pLRUList;
SvxZoomType eZoomType;
sal_uInt16 nZoom;
- sal_Bool bSynchronizeZoom;
+ bool bSynchronizeZoom;
sal_uInt16 nStatusFunc;
sal_Bool bAutoComplete;
sal_Bool bDetectiveAuto;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 219653b..3ae890f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -952,7 +952,7 @@ bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
{
// scroll wheel doesn't set the AppOptions default
- sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+ bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom );
Fraction aFract( nNew, 100 );
SetZoom( aFract, aFract, bSyncZoom );
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index aa68378..de20ea1 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -628,7 +628,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_ATTR_ZOOM: // Statuszeile
case FID_SCALE:
{
- sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+ bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
SvxZoomType eOldZoomType = GetZoomType();
SvxZoomType eNewZoomType = eOldZoomType;
const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
@@ -740,7 +740,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_ATTR_ZOOMSLIDER:
{
const SfxPoolItem* pItem = NULL;
- sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+ bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem) == SFX_ITEM_SET )
{
const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
More information about the Libreoffice-commits
mailing list