sc/source/core/data/table3.cxx | 5 +++--
sc/source/core/data/table6.cxx | 17 +++++++++--------
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 5f2e9679b1a676d54c9efc8fd0c2dae25015cfd9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 5 18:05:10 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ib256ed35a9ecb59a07ed31edec9bd8abb31a4610
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1a2a518..edeeaeb 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -59,6 +59,7 @@
#include <fstalgorithm.hxx>
#include <listenercontext.hxx>
#include <sharedformula.hxx>
+#include <stlsheet.hxx>
#include <refhint.hxx>
#include <listenerquery.hxx>
#include <bcaslot.hxx>
@@ -1812,8 +1813,8 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
//! sortieren?
- ScStyleSheet* pStyle = (ScStyleSheet*)
pDocument->GetStyleSheetPool()->Find(
- ScGlobal::GetRscString(STR_STYLENAME_RESULT),
SFX_STYLE_FAMILY_PARA );
+ ScStyleSheet* pStyle =
static_cast<ScStyleSheet*>(pDocument->GetStyleSheetPool()->Find(
+ ScGlobal::GetRscString(STR_STYLENAME_RESULT),
SFX_STYLE_FAMILY_PARA ));
bool bSpaceLeft = true; // Erfolg
beim Einfuegen?
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index c678680..697fa11 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -28,6 +28,7 @@
#include "formulacell.hxx"
#include "document.hxx"
#include "stlpool.hxx"
+#include "stlsheet.hxx"
#include "markdata.hxx"
#include "editutil.hxx"
#include "detfunc.hxx"
@@ -520,9 +521,9 @@ bool ScTable::ReplaceAll(
bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol,
SCROW& rRow,
const ScMarkData& rMark)
{
- const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
+ const ScStyleSheet* pSearchStyle = static_cast<const ScStyleSheet*>(
pDocument->GetStyleSheetPool()->Find(
- rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA );
+ rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA ));
SCsCOL nCol = rCol;
SCsROW nRow = rRow;
@@ -612,9 +613,9 @@ bool ScTable::ReplaceStyle(const SvxSearchItem&
rSearchItem, SCCOL& rCol, SCROW&
bRet = SearchStyle(rSearchItem, rCol, rRow, rMark);
if (bRet)
{
- const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
+ const ScStyleSheet* pReplaceStyle = static_cast<const ScStyleSheet*>(
pDocument->GetStyleSheetPool()->Find(
- rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA );
+ rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA ));
if (pReplaceStyle)
ApplyStyle( rCol, rRow, *pReplaceStyle );
@@ -630,9 +631,9 @@ bool ScTable::ReplaceStyle(const SvxSearchItem&
rSearchItem, SCCOL& rCol, SCROW&
bool ScTable::SearchAllStyle(
const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList&
rMatchedRanges)
{
- const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
+ const ScStyleSheet* pSearchStyle = static_cast<const ScStyleSheet*>(
pDocument->GetStyleSheetPool()->Find(
- rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA );
+ rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA ));
bool bSelect = rSearchItem.GetSelection();
bool bBack = rSearchItem.GetBackward();
bool bEverFound = false;
@@ -670,9 +671,9 @@ bool ScTable::ReplaceAllStyle(
bool bRet = SearchAllStyle(rSearchItem, rMark, rMatchedRanges);
if (bRet)
{
- const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
+ const ScStyleSheet* pReplaceStyle = static_cast<const ScStyleSheet*>(
pDocument->GetStyleSheetPool()->Find(
- rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA );
+ rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA ));
if (pReplaceStyle)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
