[Libreoffice-commits] core.git: 15 commits - basctl/source basic/source desktop/source editeng/source include/vcl sc/inc sc/source sd/source sfx2/source svx/source sw/source vcl/generic vcl/headless vcl/inc vcl/source vcl/unx
Matteo Casalin
matteo.casalin at yahoo.com
Sun Dec 27 07:52:08 PST 2015
basctl/source/basicide/basidesh.cxx | 2
basic/source/classes/sb.cxx | 2
basic/source/classes/sbxmod.cxx | 6
basic/source/runtime/methods1.cxx | 2
basic/source/runtime/stdobj.cxx | 2
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxobj.cxx | 2
desktop/source/deployment/gui/license_dialog.cxx | 2
editeng/source/editeng/impedit5.cxx | 2
include/vcl/jobdata.hxx | 4
sc/inc/brdcst.hxx | 2
sc/inc/column.hxx | 2
sc/inc/document.hxx | 4
sc/inc/global.hxx | 3
sc/inc/zforauto.hxx | 20 +-
sc/source/core/data/bcaslot.cxx | 6
sc/source/core/data/column3.cxx | 2
sc/source/core/data/documen7.cxx | 4
sc/source/core/data/dputil.cxx | 2
sc/source/core/data/formulacell.cxx | 8 -
sc/source/core/data/global.cxx | 8 -
sc/source/core/inc/bcaslot.hxx | 6
sc/source/core/tool/brdcst.cxx | 2
sc/source/core/tool/dbdata.cxx | 3
sc/source/core/tool/zforauto.cxx | 36 ++--
sc/source/filter/lotus/tool.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 4
sc/source/ui/Accessibility/AccessibleText.cxx | 104 ++++---------
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/scmod.cxx | 10 -
sc/source/ui/docshell/docsh.cxx | 3
sc/source/ui/docshell/servobj.cxx | 3
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 10 -
sc/source/ui/unoobj/chart2uno.cxx | 2
sc/source/ui/unoobj/datauno.cxx | 8 -
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/editsrc.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/view/prevwsh2.cxx | 3
sc/source/ui/view/tabvwsh5.cxx | 2
sd/source/core/stlsheet.cxx | 5
sd/source/ui/tools/PreviewRenderer.cxx | 5
sd/source/ui/view/DocumentRenderer.cxx | 7
sfx2/source/dialog/templdlg.cxx | 2
svx/source/svdraw/svdoedge.cxx | 2
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/unocore/unostyle.cxx | 3
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/uibase/app/apphdl.cxx | 19 +-
sw/source/uibase/docvw/srcedtw.cxx | 26 +--
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/utlui/numfmtlb.cxx | 21 +-
vcl/generic/print/genprnpsp.cxx | 4
vcl/headless/svpprn.cxx | 2
vcl/inc/jobset.h | 2
vcl/source/edit/vclmedit.cxx | 41 ++---
vcl/source/fontsubset/gsub.cxx | 11 -
vcl/unx/generic/printer/jobdata.cxx | 9 -
62 files changed, 216 insertions(+), 250 deletions(-)
New commits:
commit e7d920da4465fd8de8b8a9f87a3589054eac73de
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 22 22:57:02 2015 +0100
sal_uLong to sal_uInt32, ScHint related
Change-Id: I84402bf4b8d69ae350f6449cf4d1fd7c5c325f3c
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 5dfdb8f..606541b 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -31,7 +31,7 @@ class ScHint : public SfxSimpleHint
ScAddress aAddress;
public:
- ScHint( sal_uLong n, const ScAddress& a );
+ ScHint( sal_uInt32 n, const ScAddress& a );
const ScAddress& GetAddress() const { return aAddress; }
ScAddress& GetAddress() { return aAddress; }
};
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 69cb036..5c0615c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -578,7 +578,7 @@ public:
bool HasBroadcaster() const;
void Broadcast( SCROW nRow );
- void BroadcastCells( const std::vector<SCROW>& rRows, sal_uLong nHint );
+ void BroadcastCells( const std::vector<SCROW>& rRows, sal_uInt32 nHint );
// cell notes
ScPostIt* GetCellNote( SCROW nRow );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4720d34..e8297bb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1909,7 +1909,7 @@ public:
*/
void Broadcast( const ScHint& rHint );
- void BroadcastCells( const ScRange& rRange, sal_uLong nHint, bool bBroadcastSingleBroadcasters = true );
+ void BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool bBroadcastSingleBroadcasters = true );
void BroadcastRefMoved( const sc::RefMovedHint& rHint );
/// only area, no cell broadcast
@@ -1952,7 +1952,7 @@ public:
void ClearFormulaTree();
void AppendToFormulaTrack( ScFormulaCell* pCell );
void RemoveFromFormulaTrack( ScFormulaCell* pCell );
- void TrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED );
+ void TrackFormulas( sal_uInt32 nHintId = SC_HINT_DATACHANGED );
bool IsInFormulaTree( ScFormulaCell* pCell ) const;
bool IsInFormulaTrack( ScFormulaCell* pCell ) const;
HardRecalcState GetHardRecalcState() { return eHardRecalcState; }
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index b5eb089..632767e 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -282,7 +282,7 @@ ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
namespace {
-void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, sal_uLong nHint )
+void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, sal_uInt32 nHint )
{
ScHint aHint(nHint, ScAddress());
ScAddress& rPos = aHint.GetAddress();
@@ -303,7 +303,7 @@ void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, sal_uLong
}
-bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange& rRange, sal_uLong nHint )
+bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint )
{
if (aBroadcastAreaTbl.empty())
return false;
@@ -842,7 +842,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea(
}
}
-bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScRange& rRange, sal_uLong nHint )
+bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint )
{
bool bBroadcasted = false;
SCTAB nEndTab = rRange.aEnd.Tab();
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9ba8227..bca3d7a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -75,7 +75,7 @@ void ScColumn::Broadcast( SCROW nRow )
pDocument->Broadcast(aHint);
}
-void ScColumn::BroadcastCells( const std::vector<SCROW>& rRows, sal_uLong nHint )
+void ScColumn::BroadcastCells( const std::vector<SCROW>& rRows, sal_uInt32 nHint )
{
if (rRows.empty())
return;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 71a3c13..eedb0e1 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -94,7 +94,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
}
}
-void ScDocument::BroadcastCells( const ScRange& rRange, sal_uLong nHint, bool bBroadcastSingleBroadcasters )
+void ScDocument::BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool bBroadcastSingleBroadcasters )
{
ClearFormulaContext();
@@ -591,7 +591,7 @@ bool ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const
The next is broadcasted again, and so on.
View initiates Interpret.
*/
-void ScDocument::TrackFormulas( sal_uLong nHintId )
+void ScDocument::TrackFormulas( sal_uInt32 nHintId )
{
if ( pFormulaTrack )
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 27ff119..fec60cd 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -213,7 +213,7 @@ public:
void EndListeningArea(
const ScRange& rRange, bool bGroupListening, SvtListener* pListener, ScBroadcastArea*& rpArea );
- bool AreaBroadcast( const ScRange& rRange, sal_uLong nHint );
+ bool AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint );
bool AreaBroadcast( const ScHint& rHint );
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateRemove( UpdateRefMode eUpdateRefMode,
@@ -296,7 +296,7 @@ private:
ScDocument *pDoc;
ScBroadcastArea *pUpdateChain;
ScBroadcastArea *pEOUpdateChain;
- sal_uLong nInBulkBroadcast;
+ sal_uInt32 nInBulkBroadcast;
static inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress );
static void ComputeAreaPoints( const ScRange& rRange,
@@ -312,7 +312,7 @@ public:
void EndListeningArea(
const ScRange& rRange, bool bGroupListening, SvtListener* pListener );
- bool AreaBroadcast( const ScRange& rRange, sal_uLong nHint );
+ bool AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint );
bool AreaBroadcast( const ScHint& rHint ) const;
// return: at least one broadcast occurred
void DelBroadcastAreasInRange( const ScRange& rRange );
diff --git a/sc/source/core/tool/brdcst.cxx b/sc/source/core/tool/brdcst.cxx
index dba508b..d573094 100644
--- a/sc/source/core/tool/brdcst.cxx
+++ b/sc/source/core/tool/brdcst.cxx
@@ -19,7 +19,7 @@
#include "brdcst.hxx"
-ScHint::ScHint( sal_uLong n, const ScAddress& a ) :
+ScHint::ScHint( sal_uInt32 n, const ScAddress& a ) :
SfxSimpleHint(n), aAddress(a) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7cd9eba81dc3be56def062e3f22d290636a11b1c
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 21:34:20 2015 +0100
Prefer switch-case to cascaded ifs
Change-Id: Ic3fdf87c3028ae6367447f168a04cdc6fd2b0559
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 041acaf..1c3937c 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -744,26 +744,28 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO
void SwSrcEditWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- if ( dynamic_cast<const TextHint*>(&rHint) )
+ if ( !dynamic_cast<const TextHint*>(&rHint) )
+ return;
+
+ const TextHint& rTextHint = static_cast<const TextHint&>(rHint);
+ switch (rTextHint.GetId())
{
- const TextHint& rTextHint = static_cast<const TextHint&>(rHint);
- if( rTextHint.GetId() == TEXT_HINT_VIEWSCROLLED )
- {
+ case TEXT_HINT_VIEWSCROLLED:
pHScrollbar->SetThumbPos( pTextView->GetStartDocPos().X() );
pVScrollbar->SetThumbPos( pTextView->GetStartDocPos().Y() );
- }
- else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
- {
+ break;
+
+ case TEXT_HINT_TEXTHEIGHTCHANGED:
if ( pTextEngine->GetTextHeight() < pOutWin->GetOutputSizePixel().Height() )
pTextView->Scroll( 0, pTextView->GetStartDocPos().Y() );
pVScrollbar->SetThumbPos( pTextView->GetStartDocPos().Y() );
SetScrollBarRanges();
- }
- else if( ( rTextHint.GetId() == TEXT_HINT_PARAINSERTED ) ||
- ( rTextHint.GetId() == TEXT_HINT_PARACONTENTCHANGED ) )
- {
+ break;
+
+ case TEXT_HINT_PARAINSERTED:
+ case TEXT_HINT_PARACONTENTCHANGED:
DoDelayedSyntaxHighlight( (sal_uInt16)rTextHint.GetValue() );
- }
+ break;
}
}
commit 6b9fdc5860b710bd9bc864b11e7e44ca844b68c8
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 21:23:38 2015 +0100
Bail out early (so to avoid unuseful dynamic_casts)
Change-Id: Ie1940e2178585c56cecdbbcff9c9e57aa8b05459
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 97965f7..8aac204 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -527,10 +527,13 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// first, base class functionality
SfxStyleSheet::Notify(rBC, rHint);
+ if (nFamily != SD_STYLE_FAMILY_PSEUDO)
+ return;
+
/* if the dummy gets a notify about a changed attribute, he takes care that
the actual ment style sheet sends broadcasts. */
const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if (pSimple && pSimple->GetId() == SFX_HINT_DATACHANGED && nFamily == SD_STYLE_FAMILY_PSEUDO)
+ if (pSimple && pSimple->GetId() == SFX_HINT_DATACHANGED)
{
SdStyleSheet* pRealStyle = GetRealStyleSheet();
if (pRealStyle)
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index e2468c7..fa63de9 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -491,8 +491,11 @@ Image PreviewRenderer::ScaleBitmap (
void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
+ if (!mpDocShellOfView)
+ return;
+
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if (pSimpleHint && mpDocShellOfView && pSimpleHint->GetId() == SFX_HINT_DYING)
+ if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING)
{
// The doc shell is dying. Our view uses its item pool and
// has to be destroyed as well. The next call to
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index fd2b69c..2df074e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1154,10 +1154,11 @@ public:
virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override
{
+ if (&rBroadcaster != &static_cast<SfxBroadcaster&>(mrBase))
+ return;
+
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if (pSimpleHint != nullptr
- && pSimpleHint->GetId() == SFX_HINT_DYING
- && &rBroadcaster == &static_cast<SfxBroadcaster&>(mrBase))
+ if (pSimpleHint != nullptr && pSimpleHint->GetId() == SFX_HINT_DYING)
{
Dispose();
}
commit 3806388288cc4a9c229bb0c7aa14d806406d4bf4
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 21:16:43 2015 +0100
Prefer switch-case to cascaded ifs
Change-Id: I0848676dcdf6f96fe90f34be018b1c3d9d3d370a
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 7244c35..13e9157 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -512,17 +512,19 @@ OUString ImpVclMEdit::GetTextLines( LineEnd aSeparator ) const
void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const TextHint* pTextHint = dynamic_cast<const TextHint*>(&rHint);
- if ( pTextHint )
+ if ( !pTextHint )
+ return;
+
+ switch (pTextHint->GetId())
{
- if( pTextHint->GetId() == TEXT_HINT_VIEWSCROLLED )
- {
+ case TEXT_HINT_VIEWSCROLLED:
if ( mpHScrollBar )
ImpSetHScrollBarThumbPos();
if ( mpVScrollBar )
mpVScrollBar->SetThumbPos( mpTextWindow->GetTextView()->GetStartDocPos().Y() );
- }
- else if( pTextHint->GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
- {
+ break;
+
+ case TEXT_HINT_TEXTHEIGHTCHANGED:
if ( mpTextWindow->GetTextView()->GetStartDocPos().Y() )
{
long nOutHeight = mpTextWindow->GetOutputSizePixel().Height();
@@ -530,11 +532,10 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( nTextHeight < nOutHeight )
mpTextWindow->GetTextView()->Scroll( 0, mpTextWindow->GetTextView()->GetStartDocPos().Y() );
}
-
ImpSetScrollBarRanges();
- }
- else if( pTextHint->GetId() == TEXT_HINT_TEXTFORMATTED )
- {
+ break;
+
+ case TEXT_HINT_TEXTFORMATTED:
if ( mpHScrollBar )
{
const long nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
@@ -545,20 +546,20 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
ImpSetHScrollBarThumbPos();
}
}
- }
- else if( pTextHint->GetId() == TEXT_HINT_MODIFIED )
- {
+ break;
+
+ case TEXT_HINT_MODIFIED:
ImpUpdateSrollBarVis(pVclMultiLineEdit->GetStyle());
pVclMultiLineEdit->Modify();
- }
- else if( pTextHint->GetId() == TEXT_HINT_VIEWSELECTIONCHANGED )
- {
+ break;
+
+ case TEXT_HINT_VIEWSELECTIONCHANGED:
pVclMultiLineEdit->SelectionChanged();
- }
- else if( pTextHint->GetId() == TEXT_HINT_VIEWCARETCHANGED )
- {
+ break;
+
+ case TEXT_HINT_VIEWCARETCHANGED:
pVclMultiLineEdit->CaretChanged();
- }
+ break;
}
}
commit 801801bbca4db5b568bb947a29326b7b018a48fa
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 20:54:57 2015 +0100
Whitespace cleanups
Change-Id: I18e7323297ef840c8a8547299450dcb93221b85e
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 34b6af6..844b652 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3269,7 +3269,7 @@ void SwFrameHolder::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING && &rBC == pFrame )
{
- pFrame = nullptr;
+ pFrame = nullptr;
}
}
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index e4e34c9..127fea2 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -749,16 +749,16 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if (static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DEINITIALIZING)
{
DELETEZ(m_pWebUsrPref);
- DELETEZ(m_pUsrPref) ;
+ DELETEZ(m_pUsrPref);
DELETEZ(m_pModuleConfig);
- DELETEZ(m_pPrintOptions) ;
- DELETEZ(m_pWebPrintOptions) ;
+ DELETEZ(m_pPrintOptions);
+ DELETEZ(m_pWebPrintOptions);
DELETEZ(m_pChapterNumRules);
- DELETEZ(m_pStdFontConfig) ;
- DELETEZ(m_pNavigationConfig) ;
- DELETEZ(m_pToolbarConfig) ;
- DELETEZ(m_pWebToolbarConfig) ;
- DELETEZ(m_pAuthorNames) ;
+ DELETEZ(m_pStdFontConfig);
+ DELETEZ(m_pNavigationConfig);
+ DELETEZ(m_pToolbarConfig);
+ DELETEZ(m_pWebToolbarConfig);
+ DELETEZ(m_pAuthorNames);
DELETEZ(m_pDBConfig);
if( m_pColorConfig )
{
commit c49e160c7ca779af5b5719f4d64dfc6dad6dc2f5
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 20:54:30 2015 +0100
Avoid comma operator
Change-Id: I113b3b4ac54b08b6feb0d3e1d05c534e8e3fac7b
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index d7c084d..390352d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -227,7 +227,8 @@ namespace sw
const SfxSimpleHint *pHint = dynamic_cast<const SfxSimpleHint*>( &rHint );
if(pHint && (pHint->GetId() & SFX_HINT_DYING))
{
- m_pBasePool = nullptr, m_pDocShell = nullptr;
+ m_pBasePool = nullptr;
+ m_pDocShell = nullptr;
EndListening(rBC);
}
}
commit cb98c423bbdada017a687186a5c06def6cb6f7a2
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 15 20:46:34 2015 +0100
sal_uLong/sal_uIntPtr/sal_uInt16 to sal_uInt32
also avoid some explicit temporaries and group some checks.
Change-Id: I7795b208dde53fd383b8c75f72dd9f56429aea2b
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 849b9d9..84d589e 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -525,7 +525,7 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if (SbxHint const* pSbxHint = dynamic_cast<SbxHint const*>(&rHint))
{
- sal_uLong nHintId = pSbxHint->GetId();
+ const sal_uInt32 nHintId = pSbxHint->GetId();
if ( ( nHintId == SBX_HINT_BASICSTART ) ||
( nHintId == SBX_HINT_BASICSTOP ) )
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a59da1e..745f4b3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -2118,7 +2118,7 @@ void BasicCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- sal_uIntPtr nId = p->GetId();
+ const sal_uInt32 nId = p->GetId();
bool bRead = nId == SBX_HINT_DATAWANTED;
bool bWrite = nId == SBX_HINT_DATACHANGED;
bool bRequestInfo = nId == SBX_HINT_INFOWANTED;
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index db0275c..94ae86a 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -820,10 +820,10 @@ void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- sal_uLong t = pHint->GetId();
const sal_uInt16 nCallId = static_cast<sal_uInt16>(pVar->GetUserData());
if( nCallId )
{
+ const sal_uInt32 t = pHint->GetId();
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( static_cast<short>(pVar->GetUserData()) ) );
else
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 9a91d35..83df80b 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -117,7 +117,7 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- sal_uLong nId = p->GetId();
+ const sal_uInt32 nId = p->GetId();
bool bRead = ( nId == SBX_HINT_DATAWANTED );
bool bWrite = ( nId == SBX_HINT_DATACHANGED );
SbxVariable* pVar = p->GetVar();
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 3704d28..6d0154a 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -137,7 +137,7 @@ void SbxObject::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- sal_uLong nId = p->GetId();
+ const sal_uInt32 nId = p->GetId();
bool bRead = ( nId == SBX_HINT_DATAWANTED );
bool bWrite = ( nId == SBX_HINT_DATACHANGED );
SbxVariable* pVar = p->GetVar();
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index c0420c4..ec47151 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -177,7 +177,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( pTextHint )
{
bool bLastVal = EndReached();
- sal_uLong nId = pTextHint->GetId();
+ const sal_uInt32 nId = pTextHint->GetId();
if ( nId == TEXT_HINT_PARAINSERTED )
{
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 51d947e..027c3ce 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -144,7 +144,7 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
SfxStyleSheet* pStyle = nullptr;
- sal_uLong nId = 0;
+ sal_uInt32 nId = 0;
const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast<const SfxStyleSheetHint*>(&rHint);
if ( pStyleSheetHint )
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 1c6d358..fbb3d90 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2167,7 +2167,7 @@ void ScFormulaCell::Notify( const SfxHint& rHint )
if (!pSimpleHint)
return;
- sal_uLong nHint = pSimpleHint->GetId();
+ const sal_uInt32 nHint = pSimpleHint->GetId();
if (nHint == SC_HINT_REFERENCE)
{
const sc::RefHint& rRefHint = static_cast<const sc::RefHint&>(rHint);
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index bb1ae56..59fbb9b 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -888,8 +888,7 @@ void ScDBData::Notify( const SfxHint& rHint )
if (!pScHint)
return;
- sal_uLong nHint = pScHint->GetId();
- if (nHint & SC_HINT_DATACHANGED)
+ if (pScHint->GetId() & SC_HINT_DATACHANGED)
{
mbTableColumnNamesDirty = true;
if (!mpContainer)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 54f456b..34c1ca2 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -122,7 +122,7 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint&
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if (pSimpleHint)
{
- sal_uLong nId = pSimpleHint->GetId();
+ const sal_uInt32 nId {pSimpleHint->GetId()};
if (nId == SC_HINT_ACC_VISAREACHANGED)
{
if (mpTextHelper)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index b1af379..4e083a6 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -89,14 +89,14 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if (pSimpleHint)
{
- sal_uLong nId = pSimpleHint->GetId();
+ const sal_uInt32 nId {pSimpleHint->GetId()};
if ( nId == SFX_HINT_DATACHANGED )
{
// column / row layout may change with any document change,
// so it must be invalidated
DELETEZ( mpTableInfo );
}
- else if (pSimpleHint->GetId() == SC_HINT_ACC_VISAREACHANGED)
+ else if (nId == SC_HINT_ACC_VISAREACHANGED)
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED;
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 13f23a3..4edcec9 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -723,17 +723,13 @@ ScAccessibleCellTextData::~ScAccessibleCellTextData()
void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpViewShell = nullptr; // invalid now
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- if (mpEditViewForwarder)
- mpEditViewForwarder->SetInvalid();
- }
+ mpViewShell = nullptr; // invalid now
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
+ if (mpEditViewForwarder)
+ mpEditViewForwarder->SetInvalid();
}
ScAccessibleCellBaseTextData::Notify(rBC, rHint);
}
@@ -979,20 +975,16 @@ ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpWindow = nullptr;
- mpEditView = nullptr;
- mpEditEngine = nullptr;
- DELETEZ(mpForwarder);
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- if (mpEditViewForwarder)
- mpEditViewForwarder->SetInvalid();
- }
+ mpWindow = nullptr;
+ mpEditView = nullptr;
+ mpEditEngine = nullptr;
+ DELETEZ(mpForwarder);
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
+ if (mpEditViewForwarder)
+ mpEditViewForwarder->SetInvalid();
}
ScAccessibleTextData::Notify(rBC, rHint);
}
@@ -1240,15 +1232,11 @@ ScAccessiblePreviewCellTextData::~ScAccessiblePreviewCellTextData()
void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpViewShell = nullptr; // invalid now
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- }
+ mpViewShell = nullptr; // invalid now
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
}
ScAccessibleCellBaseTextData::Notify(rBC, rHint);
}
@@ -1318,15 +1306,11 @@ ScAccessiblePreviewHeaderCellTextData::~ScAccessiblePreviewHeaderCellTextData()
void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpViewShell = nullptr; // invalid now
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- }
+ mpViewShell = nullptr; // invalid now
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
}
ScAccessibleCellBaseTextData::Notify(rBC, rHint);
}
@@ -1441,16 +1425,12 @@ ScAccessibleTextData* ScAccessibleHeaderTextData::Clone() const
void ScAccessibleHeaderTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpViewShell = nullptr;// invalid now
- mpDocSh = nullptr;
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- }
+ mpViewShell = nullptr;// invalid now
+ mpDocSh = nullptr;
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
}
}
@@ -1556,16 +1536,12 @@ ScAccessibleTextData* ScAccessibleNoteTextData::Clone() const
void ScAccessibleNoteTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- mpViewShell = nullptr;// invalid now
- mpDocSh = nullptr;
- if (mpViewForwarder)
- mpViewForwarder->SetInvalid();
- }
+ mpViewShell = nullptr;// invalid now
+ mpDocSh = nullptr;
+ if (mpViewForwarder)
+ mpViewForwarder->SetInvalid();
}
}
@@ -1697,16 +1673,12 @@ ScAccessibleCsvTextData::~ScAccessibleCsvTextData()
void ScAccessibleCsvTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if( nId == SFX_HINT_DYING )
- {
- mpWindow = nullptr;
- mpEditEngine = nullptr;
- if (mpViewForwarder.get())
- mpViewForwarder->SetInvalid();
- }
+ mpWindow = nullptr;
+ mpEditEngine = nullptr;
+ if (mpViewForwarder.get())
+ mpViewForwarder->SetInvalid();
}
ScAccessibleTextData::Notify( rBC, rHint );
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 026389e..d30805a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2045,7 +2045,7 @@ void ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint )
{
- sal_uLong nHintId = pSimpleHint->GetId();
+ const sal_uInt32 nHintId = pSimpleHint->GetId();
if ( nHintId == SC_HINT_AREAS_CHANGED || nHintId == SC_HINT_NAVIGATOR_UPDATEALL)
FillRangeNames();
}
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index eaafb66..ebdd2fe 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -318,14 +318,10 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
{
- sal_uLong nHintId = pSimpleHint->GetId();
- if ( nHintId == SFX_HINT_DEINITIALIZING )
- {
- // ConfigItems must be removed before ConfigManager
- DeleteCfg();
- }
+ // ConfigItems must be removed before ConfigManager
+ DeleteCfg();
}
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 43f8756..87f2d6a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -620,8 +620,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) // Without parameter
{
- sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId();
- switch ( nSlot )
+ switch ( static_cast<const SfxSimpleHint&>(rHint).GetId() )
{
case SFX_HINT_TITLECHANGED:
aDocument.SetName( SfxShell::GetName() );
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 6cb3fa9..2c215dc 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -239,8 +239,7 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else if (const SfxSimpleHint *pSplHint = dynamic_cast<const SfxSimpleHint*>(&rHint))
{
- sal_uLong nId = pSplHint->GetId();
- if (nId == SFX_HINT_DYING)
+ if (pSplHint->GetId() == SFX_HINT_DYING)
{
// If the range is being deleted, listening must be restarted
// after the deletion is complete (done in GetData)
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 2c1f160..bc9e495 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -823,7 +823,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint );
if ( pSimpleHint )
{
- sal_uLong nHintId = pSimpleHint->GetId();
+ const sal_uInt32 nHintId = pSimpleHint->GetId();
if ( nHintId == SC_HINT_DOCNAME_CHANGED )
{
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 776a918..df1de74 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1598,7 +1598,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
+ const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
ForgetCurrentAttrs();
@@ -9408,7 +9408,7 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
+ const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
pDocShell = nullptr; // ungueltig geworden
@@ -9471,8 +9471,7 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
- if ( nId == SFX_HINT_DYING )
+ if ( static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING )
pDocShell = nullptr; // ungueltig geworden
}
}
@@ -9729,8 +9728,7 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
- if ( nId == SFX_HINT_DYING )
+ if ( static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING )
pDocShell = nullptr; // ungueltig geworden
}
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 20932b4..6730559 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2806,7 +2806,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint )
{
- sal_uLong nId = pSimpleHint->GetId();
+ const sal_uInt32 nId = pSimpleHint->GetId();
if ( nId ==SFX_HINT_DYING )
{
m_pDocument = nullptr;
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index ab7486d..70921f1 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -991,13 +991,9 @@ ScFilterDescriptorBase::~ScFilterDescriptorBase()
void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- sal_uLong nId = pSimpleHint->GetId();
- if ( nId == SFX_HINT_DYING )
- {
- pDocSh = nullptr; // invalid
- }
+ pDocSh = nullptr; // invalid
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7a7b064..2bdab21 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1063,7 +1063,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint )
{
- sal_uLong nId = pSimpleHint->GetId();
+ const sal_uInt32 nId = pSimpleHint->GetId();
if ( nId == SFX_HINT_DYING )
{
pDocShell = nullptr; // has become invalid
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 219d74b..d52b773 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -202,7 +202,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
+ const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
pDocShell = nullptr; // ungueltig geworden
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 1ea1215..0578c1f 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -1036,7 +1036,7 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) )
{
- sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
+ const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
pDocShell = nullptr; // invalid now
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 10edc68..0b8af5d 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -32,8 +32,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if (dynamic_cast<const SfxSimpleHint*>(&rHint))
{
- sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId();
- switch ( nSlot )
+ switch ( static_cast<const SfxSimpleHint&>(rHint).GetId() )
{
case FID_DATACHANGED:
case SID_SCPRINTOPTIONS:
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 9ccfb50..674dc65 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -44,7 +44,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if (dynamic_cast<const SfxSimpleHint*>(&rHint)) // ohne Parameter
{
- sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId();
+ const sal_uInt32 nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId();
switch ( nSlot )
{
case FID_DATACHANGED:
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index aafe9c7..2b7c1dd 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1540,7 +1540,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
// possible that a new one is registered after the timer is up -
// works bad in UpdateStyles_Impl ()!
- sal_uIntPtr nId = pSfxSimpleHint ? pSfxSimpleHint->GetId() : 0;
+ const sal_uInt32 nId = pSfxSimpleHint ? pSfxSimpleHint->GetId() : 0;
if(!bDontUpdate && nId != SFX_HINT_DYING &&
(dynamic_cast<const SfxStyleSheetPoolHint*>(&rHint) ||
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 553ec70..b204879 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1564,7 +1564,7 @@ line (CL). The number of object margins per object varies between 0 and 3:
void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint);
- sal_uIntPtr nId=pSimple==nullptr ? 0 : pSimple->GetId();
+ const sal_uInt32 nId = pSimple==nullptr ? 0 : pSimple->GetId();
bool bDataChg=nId==SFX_HINT_DATACHANGED;
bool bDying=nId==SFX_HINT_DYING;
bool bObj1=aCon1.pObj!=nullptr && aCon1.pObj->GetBroadcaster()==&rBC;
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index bd18537..e4e34c9 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -746,8 +746,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
else if(dynamic_cast<const SfxSimpleHint*>(&rHint))
{
- sal_uInt16 nHintId = static_cast<const SfxSimpleHint&>(rHint).GetId();
- if(SFX_HINT_DEINITIALIZING == nHintId)
+ if (static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DEINITIALIZING)
{
DELETEZ(m_pWebUsrPref);
DELETEZ(m_pUsrPref) ;
commit 4088208d731ac281c88a8854978b683aee477385
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Mon Dec 7 14:38:02 2015 +0100
sal_uLong to sal_uInt32/sal_uInt64
Change-Id: I8f563ae1de4ae9e032ffbcfae194372b5501a0ee
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 7f74550..b236bad 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -535,8 +535,7 @@ public:
SfxObjectShell* pShell );
SC_DLLPUBLIC static OUString GetDocTabName( const OUString& rFileName,
const OUString& rTabName );
- SC_DLLPUBLIC static sal_uLong GetStandardFormat( SvNumberFormatter&,
- sal_uLong nFormat, short nType );
+ SC_DLLPUBLIC static sal_uInt32 GetStandardFormat( SvNumberFormatter&, sal_uInt32 nFormat, short nType );
SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
SC_DLLPUBLIC static double nScreenPPTX;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index e574af7..1c6d358 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1911,7 +1911,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
bool bSetFormat = true;
const short nOldFormatType = nFormatType;
nFormatType = p->GetRetFormatType();
- sal_Int32 nFormatIndex = p->GetRetFormatIndex();
+ sal_uInt32 nFormatIndex = p->GetRetFormatIndex();
if (nFormatType == css::util::NumberFormat::TEXT)
{
@@ -2447,10 +2447,10 @@ void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText )
// Cell Text uses the Cell format while the URL uses
// the default format for the type.
- sal_uLong nCellFormat = pDocument->GetNumberFormat( aPos );
+ const sal_uInt32 nCellFormat = pDocument->GetNumberFormat( aPos );
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- sal_uLong nURLFormat = ScGlobal::GetStandardFormat( *pFormatter, nCellFormat, css::util::NumberFormat::NUMBER);
+ const sal_uInt32 nURLFormat = ScGlobal::GetStandardFormat( *pFormatter, nCellFormat, css::util::NumberFormat::NUMBER);
if ( IsValue() )
{
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 2053f55..bc0cdcf 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -170,8 +170,8 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
return bInvalidate;
}
-sal_uLong ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
- sal_uLong nFormat, short nType )
+sal_uInt32 ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
+ sal_uInt32 nFormat, short nType )
{
const SvNumberformat* pFormat = rFormatter.GetEntry( nFormat );
if ( pFormat )
@@ -860,7 +860,7 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
SvMemoryStream aStream2;
pObj1->Store( aStream1 );
pObj2->Store( aStream2 );
- sal_uLong nSize = aStream1.Tell();
+ const sal_uInt64 nSize = aStream1.Tell();
if ( aStream2.Tell() == nSize )
if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (sal_uInt16) nSize ) )
return true;
@@ -1044,7 +1044,7 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
const SvNumberformat* pHardFormat = rFormatter.GetEntry(
static_cast<const SfxUInt32Item*>(pHardItem)->GetValue() );
- sal_uLong nParentFmt = 0; // Pool default
+ sal_uInt32 nParentFmt = 0; // Pool default
const SfxItemSet* pParent = rSet.GetParent();
if ( pParent )
nParentFmt = static_cast<const SfxUInt32Item&>(pParent->Get( ATTR_VALUE_FORMAT )).GetValue();
commit 672b31d516888f0f1cd0fbfdd3fafc430a233dcb
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Dec 4 23:05:22 2015 +0100
Lnge to Language in ScNumFormatAbbrev member names
Change-Id: I226e857eb9c3d30a40dbe6afcc395b109e836674
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 956daf1..4e9be26 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -29,8 +29,8 @@ class SvNumberFormatter;
class ScNumFormatAbbrev
{
OUString sFormatstring;
- LanguageType eLnge;
- LanguageType eSysLnge;
+ LanguageType eLanguage;
+ LanguageType eSysLanguage;
public:
ScNumFormatAbbrev();
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
@@ -42,17 +42,17 @@ public:
inline bool operator==(const ScNumFormatAbbrev& rNumFormat) const
{
return ((sFormatstring == rNumFormat.sFormatstring)
- && (eLnge == rNumFormat.eLnge)
- && (eSysLnge == rNumFormat.eSysLnge));
+ && (eLanguage == rNumFormat.eLanguage)
+ && (eSysLanguage == rNumFormat.eSysLanguage));
}
inline ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
{
sFormatstring = rNumFormat.sFormatstring;
- eLnge = rNumFormat.eLnge;
- eSysLnge = rNumFormat.eSysLnge;
+ eLanguage = rNumFormat.eLanguage;
+ eSysLanguage = rNumFormat.eSysLanguage;
return *this;
}
- inline LanguageType GetLanguage() const { return eLnge; }
+ inline LanguageType GetLanguage() const { return eLanguage; }
};
#endif
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 22412ef..6551c9c 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -27,15 +27,15 @@
ScNumFormatAbbrev::ScNumFormatAbbrev() :
sFormatstring ( "Standard" ),
- eLnge (LANGUAGE_SYSTEM),
- eSysLnge (LANGUAGE_GERMAN) // otherwise "Standard" does not fit
+ eLanguage (LANGUAGE_SYSTEM),
+ eSysLanguage (LANGUAGE_GERMAN) // otherwise "Standard" does not fit
{
}
ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) :
sFormatstring (aFormat.sFormatstring),
- eLnge (aFormat.eLnge),
- eSysLnge (aFormat.eSysLnge)
+ eLanguage (aFormat.eLanguage),
+ eSysLanguage (aFormat.eSysLanguage)
{
}
@@ -50,16 +50,16 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, rtl_TextEncoding eByteStrSet )
sal_uInt16 nSysLang, nLang;
sFormatstring = rStream.ReadUniOrByteString( eByteStrSet );
rStream.ReadUInt16( nSysLang ).ReadUInt16( nLang );
- eLnge = (LanguageType) nLang;
- eSysLnge = (LanguageType) nSysLang;
- if ( eSysLnge == LANGUAGE_SYSTEM ) // old versions did write it
- eSysLnge = Application::GetSettings().GetLanguageTag().getLanguageType();
+ eLanguage = (LanguageType) nLang;
+ eSysLanguage = (LanguageType) nSysLang;
+ if ( eSysLanguage == LANGUAGE_SYSTEM ) // old versions did write it
+ eSysLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
}
void ScNumFormatAbbrev::Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const
{
rStream.WriteUniOrByteString( sFormatstring, eByteStrSet );
- rStream.WriteUInt16( eSysLnge ).WriteUInt16( eLnge );
+ rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eLanguage );
}
void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
@@ -68,15 +68,15 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
const SvNumberformat* pFormat = rFormatter.GetEntry(nFormat);
if (pFormat)
{
- eSysLnge = Application::GetSettings().GetLanguageTag().getLanguageType();
- eLnge = pFormat->GetLanguage();
+ eSysLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
+ eLanguage = pFormat->GetLanguage();
sFormatstring = pFormat->GetFormatstring();
}
else
{
OSL_FAIL("SCNumFormatAbbrev:: unknown number format");
- eLnge = LANGUAGE_SYSTEM;
- eSysLnge = LANGUAGE_GERMAN; // otherwise "Standard" does not fit
+ eLanguage = LANGUAGE_SYSTEM;
+ eSysLanguage = LANGUAGE_GERMAN; // otherwise "Standard" does not fit
sFormatstring = "Standard";
}
}
@@ -86,8 +86,8 @@ sal_uInt32 ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
short nType;
bool bNewInserted;
sal_Int32 nCheckPos;
- return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge,
- eSysLnge, nType, bNewInserted, nCheckPos);
+ return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLanguage,
+ eSysLanguage, nType, bNewInserted, nCheckPos);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 855128d61a6f376f24bf33f7d8f2add8df15353b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Dec 4 23:00:44 2015 +0100
Translate German comments
Change-Id: I4421e7e1c610cab504080b8210cdc9c13764976f
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index e428cab..22412ef 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -28,7 +28,7 @@
ScNumFormatAbbrev::ScNumFormatAbbrev() :
sFormatstring ( "Standard" ),
eLnge (LANGUAGE_SYSTEM),
- eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht
+ eSysLnge (LANGUAGE_GERMAN) // otherwise "Standard" does not fit
{
}
@@ -76,7 +76,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
{
OSL_FAIL("SCNumFormatAbbrev:: unknown number format");
eLnge = LANGUAGE_SYSTEM;
- eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht
+ eSysLnge = LANGUAGE_GERMAN; // otherwise "Standard" does not fit
sFormatstring = "Standard";
}
}
commit 7d8919d2d54767d1e34d67129c9e4ae62a1707f3
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Dec 4 22:56:51 2015 +0100
sal_uLong/sal_uIntPtr for ScNumFormatAbbrev
Change-Id: I45f2a43fe4295e44691ab00c93af3fca41b1dcfa
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 48ef752..1f38637 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2539,7 +2539,7 @@ RTLFUNC(FormatDateTime)
}
LanguageType eLangType = Application::GetSettings().GetLanguageTag().getLanguageType();
- sal_uIntPtr nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
+ const sal_uInt32 nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
Color* pCol;
pFormatter->GetOutputString( dDate, nIndex, aRetStr, &pCol );
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index fe72450..956daf1 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -34,11 +34,11 @@ class ScNumFormatAbbrev
public:
ScNumFormatAbbrev();
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
- ScNumFormatAbbrev(sal_uLong nFormat, SvNumberFormatter& rFormatter);
+ ScNumFormatAbbrev(sal_uInt32 nFormat, SvNumberFormatter& rFormatter);
void Load( SvStream& rStream, rtl_TextEncoding eByteStrSet ); // loading of the numberformats
void Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const; // saving of the numberformats
- void PutFormatIndex(sal_uLong nFormat, SvNumberFormatter& rFormatter);
- sal_uLong GetFormatIndex( SvNumberFormatter& rFormatter);
+ void PutFormatIndex(sal_uInt32 nFormat, SvNumberFormatter& rFormatter);
+ sal_uInt32 GetFormatIndex( SvNumberFormatter& rFormatter);
inline bool operator==(const ScNumFormatAbbrev& rNumFormat) const
{
return ((sFormatstring == rNumFormat.sFormatstring)
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index bdf59ee..93d79ed 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -123,7 +123,7 @@ OUString ScDPUtil::getDateGroupName(
Date aNullDate = *pFormatter->GetNullDate();
long nDays = aDate - aNullDate;
- sal_uLong nFormat = pFormatter->GetFormatIndex(NF_DATE_SYS_DDMMM, ScGlobal::eLnge);
+ const sal_uInt32 nFormat = pFormatter->GetFormatIndex(NF_DATE_SYS_DDMMM, ScGlobal::eLnge);
Color* pColor;
OUString aStr;
pFormatter->GetOutputString(nDays, nFormat, aStr, &pColor);
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index bafd40b..e428cab 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -39,7 +39,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) :
{
}
-ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat,
+ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uInt32 nFormat,
SvNumberFormatter& rFormatter)
{
PutFormatIndex(nFormat, rFormatter);
@@ -62,7 +62,7 @@ void ScNumFormatAbbrev::Save( SvStream& rStream, rtl_TextEncoding eByteStrSet )
rStream.WriteUInt16( eSysLnge ).WriteUInt16( eLnge );
}
-void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat,
+void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
SvNumberFormatter& rFormatter)
{
const SvNumberformat* pFormat = rFormatter.GetEntry(nFormat);
@@ -81,7 +81,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat,
}
}
-sal_uLong ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
+sal_uInt32 ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
{
short nType;
bool bNewInserted;
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 8dd2cc9..7a91186 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -194,7 +194,7 @@ void ScAutoFmtPreview::DrawString(vcl::RenderContext& rRenderContext, size_t nCo
OUString cellString;
bool bNumFormat = pCurData->GetIncludeValueFormat();
- sal_uLong nNum;
+ sal_uInt32 nNum;
double nVal;
Color* pDummy = nullptr;
sal_uInt16 nIndex = static_cast<sal_uInt16>(maArray.GetCellIndex(nCol, nRow, mbRTL));
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index b4930b1..b98e0d8 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -323,7 +323,7 @@ void SwHTMLParser::NewField()
case RES_DATEFLD:
case RES_TIMEFLD:
{
- sal_uLong nNumFormat = 0;
+ sal_uInt32 nNumFormat = 0;
sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime();
sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
sal_uInt16 nSub = 0;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 05a109b..d04418b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -408,7 +408,7 @@ OUString GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16
//Get the system date in the correct final language layout, convert to
//a known language and modify the 2 digit year part to be 4 digit, and
//convert back to the correct language layout.
- sal_uLong nIndex = pFormatter->GetFormatIndex(NF_DATE_SYSTEM_SHORT, nLang);
+ const sal_uInt32 nIndex = pFormatter->GetFormatIndex(NF_DATE_SYSTEM_SHORT, nLang);
SvNumberformat aFormat = const_cast<SvNumberformat &>
(*(pFormatter->GetEntry(nIndex)));
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index b768d05..588a0e9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -802,7 +802,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
else
{
SvNumberFormatter* pFormatter = rWrtSh.GetNumberFormatter();
- sal_uLong nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
+ const sal_uInt32 nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
SwInsertField_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, OUString(), sFormula, nSysNumFormat);
aFieldMgr.InsertField(aData);
}
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index c41d255..dc7d5eb 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -212,21 +212,20 @@ void NumFormatListBox::SetFormatType(const short nFormatType)
const SvNumberformat* pFormat;
sal_Int32 i = 0;
- sal_uLong nFormat;
Color* pCol;
double fVal = GetDefValue( nFormatType );
OUString sValue;
- sal_uLong nSysNumFormat = pFormatter->GetFormatIndex(
+ const sal_uInt32 nSysNumFormat = pFormatter->GetFormatIndex(
NF_NUMBER_SYSTEM, eCurLanguage );
- sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex(
+ const sal_uInt32 nSysShortDateFormat = pFormatter->GetFormatIndex(
NF_DATE_SYSTEM_SHORT, eCurLanguage );
- sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex(
+ const sal_uInt32 nSysLongDateFormat = pFormatter->GetFormatIndex(
NF_DATE_SYSTEM_LONG, eCurLanguage );
for( long nIndex = eOffsetStart; nIndex <= eOffsetEnd; ++nIndex )
{
- nFormat = pFormatter->GetFormatIndex(
+ const sal_uInt32 nFormat = pFormatter->GetFormatIndex(
(NfIndexTableOffset)nIndex, eCurLanguage );
pFormat = pFormatter->GetEntry( nFormat );
@@ -324,15 +323,15 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefaultFormat)
while (reinterpret_cast<sal_uLong>(GetEntryData(nPos)) == ULONG_MAX)
nPos++;
- sal_uLong nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
- sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
- sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
+ const sal_uInt32 nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
+ const sal_uInt32 nSysShortDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
+ const sal_uInt32 nSysLongDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
bool bSysLang = false;
if( eCurLanguage == GetAppLanguage() )
bSysLang = true;
- sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFormat, LANGUAGE_SYSTEM );
- sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFormat, LANGUAGE_SYSTEM );
- sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFormat, LANGUAGE_SYSTEM );
+ const sal_uInt32 nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFormat, LANGUAGE_SYSTEM );
+ const sal_uInt32 nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFormat, LANGUAGE_SYSTEM );
+ const sal_uInt32 nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFormat, LANGUAGE_SYSTEM );
if (
nDefaultFormat == nSysNumFormat ||
commit fb46f61c51872ea85fb3d9f08cc44235bc8c2703
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Dec 4 21:24:49 2015 +0100
Avoid redundant cast
Change-Id: I0075eab13c09edc83437c14e36d8f4d401fcb337
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 7760fe2..d6c74493 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -334,7 +334,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage );
}
- return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nHandle );
+ return new SfxUInt32Item( ATTR_VALUE_FORMAT, nHandle );
}
void LotusRange::MakeHash()
commit 42798dc46a3e9a178ca5bc85e63865686daec0ef
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Wed Dec 2 00:37:13 2015 +0100
sal_uIntPtr to sal_uInt32
Change-Id: I856ee7aa28d45dd69b030e3db05701b415009fde
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 73428af..55d9a65 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -842,7 +842,7 @@ void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
// side effects when using name as variable implicitly
bool bForwardToSbxObject = true;
- sal_uIntPtr nId = pHint->GetId();
+ const sal_uInt32 nId = pHint->GetId();
if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
pVar->GetName().equalsIgnoreAsciiCase( "name" ) )
{
@@ -954,7 +954,7 @@ void SbModule::SetSource32( const OUString& r )
// Broadcast of a hint to all Basics
-static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
+static void _SendHint( SbxObject* pObj, sal_uInt32 nId, SbMethod* p )
{
// Self a BASIC?
if( dynamic_cast<const StarBASIC *>(pObj) != nullptr && pObj->IsBroadcaster() )
@@ -969,7 +969,7 @@ static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
}
}
-static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, sal_uInt32 nId, SbMethod* p )
{
while( pObj->GetParent() )
pObj = pObj->GetParent();
commit 59e3e041ccd119e72dee053172531a59832336c7
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 1 23:22:59 2015 +0100
sal_uIntPtr to sal_uInt32, int to sal_uInt32/sal_uInt64
Change-Id: Ib86d6b63d16f24f3c5e17981562d100e247dc267
diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index 4244fdb..771f73c 100644
--- a/include/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
@@ -75,8 +75,8 @@ struct VCL_DLLPUBLIC JobData
// creates a new buffer using new
// it is up to the user to delete it again
- bool getStreamBuffer( void*& pData, int& bytes );
- static bool constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData );
+ bool getStreamBuffer( void*& pData, sal_uInt32& bytes );
+ static bool constructFromStreamBuffer( void* pData, sal_uInt32 bytes, JobData& rJobData );
};
bool operator==(const psp::JobData& rLeft, const psp::JobData& rRight);
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 672b222..36e3538 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -235,7 +235,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
if( pJobSetup->mpDriverData )
rtl_freeMemory( pJobSetup->mpDriverData );
- int nBytes;
+ sal_uInt32 nBytes;
void* pBuffer = nullptr;
if( rData.getStreamBuffer( pBuffer, nBytes ) )
{
@@ -568,7 +568,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
rtl_freeMemory( pJobSetup->mpDriverData );
pJobSetup->mpDriverData = nullptr;
- int nBytes;
+ sal_uInt32 nBytes;
void* pBuffer = nullptr;
aInfo.getStreamBuffer( pBuffer, nBytes );
pJobSetup->mnDriverDataLen = nBytes;
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index fd5047e..8941303 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -139,7 +139,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
if( pJobSetup->mpDriverData )
rtl_freeMemory( pJobSetup->mpDriverData );
- int nBytes;
+ sal_uInt32 nBytes;
void* pBuffer = nullptr;
if( rData.getStreamBuffer( pBuffer, nBytes ) )
{
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index f0bf8a5..721f1b0 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -41,7 +41,7 @@ struct ImplJobSetup
Paper mePaperFormat; // paper format
long mnPaperWidth; // paper width (100th mm)
long mnPaperHeight; // paper height (100th mm)
- sal_uIntPtr mnDriverDataLen; // length of system specific data
+ sal_uInt32 mnDriverDataLen; // length of system specific data
sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block)
bool mbPapersizeFromSetup;
std::unordered_map< OUString, OUString, OUStringHash > maValueMap;
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 9169b01..a9f7c30 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -125,7 +125,7 @@ bool JobData::setPaperBin( int i_nPaperBin )
return bSuccess;
}
-bool JobData::getStreamBuffer( void*& pData, int& bytes )
+bool JobData::getStreamBuffer( void*& pData, sal_uInt32& bytes )
{
// consistency checks
if( ! m_pParser )
@@ -198,12 +198,13 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
pContextBuffer.reset();
// success
- pData = rtl_allocateMemory( bytes = aStream.Tell() );
+ bytes = static_cast<sal_uInt32>(aStream.Tell());
+ pData = rtl_allocateMemory( bytes );
memcpy( pData, aStream.GetData(), bytes );
return true;
}
-bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData )
+bool JobData::constructFromStreamBuffer( void* pData, sal_uInt32 bytes, JobData& rJobData )
{
SvMemoryStream aStream( pData, bytes, StreamMode::READ );
OString aLine;
@@ -291,7 +292,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
if( rJobData.m_pParser )
{
rJobData.m_aContext.setParser( rJobData.m_pParser );
- int nBytes = bytes - aStream.Tell();
+ const sal_uInt64 nBytes = bytes - aStream.Tell();
std::unique_ptr<char[]> pRemain(new char[bytes - aStream.Tell()]);
aStream.Read( pRemain.get(), nBytes );
rJobData.m_aContext.rebuildFromStreamBuffer( pRemain.get(), nBytes );
commit 118318e3e9d6ac310861dc87c6219c2120da33fa
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Tue Dec 1 21:55:26 2015 +0100
sal_uLong to sal_uInt32
Change-Id: Ia07f4057f7a48766974f80f7a23f62b6cef6f573
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 8966ce3..399f31e 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -30,7 +30,6 @@
namespace vcl
{
-typedef sal_uIntPtr sal_uLong;
typedef sal_uInt8 FT_Byte;
typedef std::map<sal_uInt16,sal_uInt16> GlyphSubstitution;
@@ -63,7 +62,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
// parse GSUB header
const FT_Byte* pGsubHeader = pGsubBase;
- const sal_uLong nVersion = NEXT_Long( pGsubHeader );
+ const sal_uInt32 nVersion = NEXT_Long( pGsubHeader );
const sal_uInt16 nOfsScriptList = NEXT_UShort( pGsubHeader );
const sal_uInt16 nOfsFeatureTable = NEXT_UShort( pGsubHeader );
const sal_uInt16 nOfsLookupList = NEXT_UShort( pGsubHeader );
@@ -73,7 +72,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
if( nVersion != 0x00001000 ) // workaround for SunBatang etc.
return false; // unknown format or broken
- typedef std::vector<sal_uLong> ReqFeatureTagList;
+ typedef std::vector<sal_uInt32> ReqFeatureTagList;
ReqFeatureTagList aReqFeatureTagList;
aReqFeatureTagList.push_back( MKTAG("vert") );
@@ -88,7 +87,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
return false;
for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex )
{
- const sal_uLong nTag = NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang
+ const sal_uInt32 nTag = NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang
const sal_uInt16 nOfsScriptTable= NEXT_UShort( pScriptHeader );
if( (nTag != (sal_uInt16)nRequestedScript) && (nRequestedScript != 0) )
continue;
@@ -103,7 +102,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
return false;
for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
{
- const sal_uLong nInnerTag = NEXT_Long( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN
+ const sal_uInt32 nInnerTag = NEXT_Long( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN
const sal_uInt16 nOffset= NEXT_UShort( pScriptTable );
if( (nInnerTag != (sal_uInt16)nRequestedLangsys) && (nRequestedLangsys != 0) )
continue;
@@ -163,7 +162,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
return false;
for( sal_uInt16 nFeatureIndex = 0; nFeatureIndex < nCntFeature; ++nFeatureIndex )
{
- const sal_uLong nTag = NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
+ const sal_uInt32 nTag = NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
const sal_uInt16 nOffset= NEXT_UShort( pFeatureHeader );
// ignore unneeded feature lookups
More information about the Libreoffice-commits
mailing list