summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx7
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx24
2 files changed, 3 insertions, 28 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 4b01bf9a175a..83beb7ecf05a 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -484,7 +484,7 @@ void ScPivotLayoutDialog::UpdateSourceRange()
FillValuesToListBoxes();
}
-bool ScPivotLayoutDialog::ApplyChanges()
+void ScPivotLayoutDialog::ApplyChanges()
{
ScDPSaveData aSaveData;
ApplySaveData(aSaveData);
@@ -494,7 +494,7 @@ bool ScPivotLayoutDialog::ApplyChanges()
bool bToNewSheet = false;
if (!GetDestination(aDestinationRange, bToNewSheet))
- return false;
+ return;
SetDispatcherLock(false);
SwitchToDocument();
@@ -512,12 +512,11 @@ bool ScPivotLayoutDialog::ApplyChanges()
const SfxBoolItem* pItem = reinterpret_cast<const SfxBoolItem*>(pResult);
if (pItem)
{
- return pItem->GetValue();
+ return;
}
}
SetDispatcherLock(true);
- return true;
}
void ScPivotLayoutDialog::ApplySaveData(ScDPSaveData& rSaveData)
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index fe3bfb40a098..3447b98e35c0 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -139,30 +139,6 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
return *this;
}
-bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
-{
- if ( bFixedLen == rCmp.bFixedLen &&
- aFieldSeps == rCmp.aFieldSeps &&
- bMergeFieldSeps == rCmp.bMergeFieldSeps &&
- bQuotedFieldAsText == rCmp.bQuotedFieldAsText &&
- cTextSep == rCmp.cTextSep &&
- eCharSet == rCmp.eCharSet &&
- bCharSetSystem == rCmp.bCharSetSystem &&
- nStartRow == rCmp.nStartRow &&
- nInfoCount == rCmp.nInfoCount )
- {
- OSL_ENSURE( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat),
- "NULL pointer in ScAsciiOptions::operator==() column info" );
- for (sal_uInt16 i=0; i<nInfoCount; i++)
- if ( pColStart[i] != rCmp.pColStart[i] ||
- pColFormat[i] != rCmp.pColFormat[i] )
- return false;
-
- return true;
- }
- return false;
-}
-
static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps )
{
OUString aFieldSeps;