summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-31 10:22:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-03-31 10:22:13 +0200
commitb53ff2865e337f173758f3430bc2a212a14c0b95 (patch)
treedf277ad7fd106bd1f191ba15358893e019027202 /sc
parente211e4ed41289fe680ac3d733175ef40a1e290b8 (diff)
Fix various warnings
Change-Id: I78aa55539c2a3e522736bb178ba7d445300bf1f0
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx19
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeList.cxx4
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListData.cxx4
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeListBase.hxx2
5 files changed, 7 insertions, 24 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 267b7f58fe18..48b4874a79c7 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -22,7 +22,7 @@
using namespace css::uno;
using namespace css::sheet;
-ScItemValue::ScItemValue(OUString aName, SCCOL nColumn, sal_uInt16 nFunctionMask) :
+ScItemValue::ScItemValue(OUString const & aName, SCCOL nColumn, sal_uInt16 nFunctionMask) :
maName(aName),
maFunctionData(nColumn, nFunctionMask),
mpOriginalItemValue(this)
@@ -40,22 +40,7 @@ ScItemValue::~ScItemValue()
namespace
{
-OUString lclGetNameForNamedRange(ScRange aRange, ScDocument* pDocument)
-{
- OUString aName;
-
- ScRangeName* pRangeName = pDocument->GetRangeName();
- if (pRangeName == NULL)
- return aName;
-
- const ScRangeData* pData = pRangeName->findByRange(aRange);
- if (pData == NULL)
- return aName;
-
- return pData->GetName();
-}
-
-ScRange lclGetRangeForNamedRange(OUString aName, ScDocument* pDocument)
+ScRange lclGetRangeForNamedRange(OUString const & aName, ScDocument* pDocument)
{
ScRange aInvalidRange(ScAddress::INITIALIZE_INVALID);
ScRangeName* pRangeName = pDocument->GetRangeName();
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 8c76aff6a9a0..9eae737eeffd 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -83,7 +83,7 @@ void ScPivotLayoutTreeList::FillFields(ScPivotFieldVector& rFieldVector)
{
ScPivotField& rField = *it;
ScItemValue* pItemValue = mpParent->GetItem(rField.nCol);
- InsertEntry(pItemValue->maName, NULL, sal_False, TREELIST_APPEND, pItemValue);
+ InsertEntry(pItemValue->maName, NULL, false, TREELIST_APPEND, pItemValue);
}
}
@@ -105,7 +105,7 @@ void ScPivotLayoutTreeList::InsertEntryForSourceTarget(SvTreeListEntry* pSource,
void ScPivotLayoutTreeList::InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition)
{
OUString rName = pItemValue->maName;
- InsertEntry(rName, NULL, sal_False, nPosition, pItemValue);
+ InsertEntry(rName, NULL, false, nPosition, pItemValue);
}
void ScPivotLayoutTreeList::KeyInput(const KeyEvent& rKeyEvent)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 82cd93adf1f2..8ef80b0c0199 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -156,7 +156,7 @@ void ScPivotLayoutTreeListData::InsertEntryForSourceTarget(SvTreeListEntry* pSou
OUString rText = GetEntryText(pSource);
GetModel()->Remove(pSource);
sal_uLong nPosition = (pTarget == NULL) ? TREELIST_APPEND : GetModel()->GetAbsPos(pTarget) + 1;
- InsertEntry(rText, NULL, sal_False, nPosition, pItemValue);
+ InsertEntry(rText, NULL, false, nPosition, pItemValue);
}
else
{
@@ -184,7 +184,7 @@ void ScPivotLayoutTreeListData::InsertEntryForItem(ScItemValue* pItemValue, sal_
pDataItemValue->maName,
rFunctionData.mnDupCount);
- InsertEntry(sDataName, NULL, sal_False, nPosition, pDataItemValue);
+ InsertEntry(sDataName, NULL, false, nPosition, pDataItemValue);
}
void ScPivotLayoutTreeListData::KeyInput(const KeyEvent& rKeyEvent)
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index e5eb4aae8e54..b7ad9cd792b0 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -33,7 +33,7 @@ public:
ScPivotFuncData maFunctionData;
ScItemValue* mpOriginalItemValue;
- ScItemValue(OUString aName, SCCOL nColumn, sal_uInt16 nFunctionMask);
+ ScItemValue(OUString const & aName, SCCOL nColumn, sal_uInt16 nFunctionMask);
ScItemValue(ScItemValue* pInputItemValue);
virtual ~ScItemValue();
diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
index b8f226dc4899..26d94a12282d 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
@@ -33,8 +33,6 @@ public:
COLUMN_LIST,
DATA_LIST
};
-private:
- bool mbIsInternalDrag;
protected:
SvPivotTreeListType meType;