[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 31 13:00:26 PST 2010
binfilter/bf_sc/source/ui/inc/AccessibleText.hxx | 22 +--
binfilter/bf_sc/source/ui/unoobj/makefile.mk | 1
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 41 +++----
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 134 +++++++++++------------
binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 56 ++++-----
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 88 +++++++--------
binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx | 13 +-
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 120 ++++++++++----------
binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 62 +++++-----
binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 36 ++----
binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx | 28 ++--
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 6 -
binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx | 26 ++--
binfilter/bf_sc/source/ui/unoobj/sc_pageuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 54 ++++-----
binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx | 10 -
binfilter/inc/bf_sch/schdll0.hxx | 6 -
25 files changed, 360 insertions(+), 369 deletions(-)
New commits:
commit c04935efdfc06671d27927dbe13d3d8f067159ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 31 20:59:12 2010 +0000
WaE: make this dir warning free
diff --git a/binfilter/bf_sc/source/ui/inc/AccessibleText.hxx b/binfilter/bf_sc/source/ui/inc/AccessibleText.hxx
index 679f037..7113853 100644
--- a/binfilter/bf_sc/source/ui/inc/AccessibleText.hxx
+++ b/binfilter/bf_sc/source/ui/inc/AccessibleText.hxx
@@ -59,7 +59,7 @@ public:
virtual ScAccessibleTextData* Clone() const = 0;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) {}
+ virtual void Notify( SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/ ) {}
virtual SvxTextForwarder* GetTextForwarder() = 0;
virtual SvxViewForwarder* GetViewForwarder() = 0;
@@ -84,9 +84,9 @@ class ScAccessibleCellBaseTextData : public ScAccessibleTextData,
public ScCellTextData
{
public:
- ScAccessibleCellBaseTextData(ScDocShell* pDocShell,
+ ScAccessibleCellBaseTextData(ScDocShell* pInDocShell,
const ScAddress& rP)
- : ScCellTextData(pDocShell, rP) {}
+ : ScCellTextData(pInDocShell, rP) {}
virtual ~ScAccessibleCellBaseTextData() {}
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); }
@@ -150,7 +150,7 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool bValue) { }
+ virtual void SetDoUpdate(sal_Bool /*bValue*/) { }
virtual sal_Bool IsDirty() const { return sal_False; }
DECL_LINK( NotifyHdl, EENotify* );
@@ -203,7 +203,7 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /*bCreate*/ ) { return NULL; }
DECL_LINK( NotifyHdl, EENotify* );
private:
@@ -232,7 +232,7 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /*bCreate*/ ) { return NULL; }
DECL_LINK( NotifyHdl, EENotify* );
private:
@@ -264,10 +264,10 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /*bCreate*/ ) { return NULL; }
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool bValue) { }
+ virtual void SetDoUpdate(sal_Bool /*bValue*/) { }
virtual sal_Bool IsDirty() const { return sal_False; }
private:
ScPreviewViewForwarder* mpViewForwarder;
@@ -297,10 +297,10 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /*bCreate*/ ) { return NULL; }
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool bValue) { }
+ virtual void SetDoUpdate(sal_Bool /*bValue*/) { }
virtual sal_Bool IsDirty() const { return sal_False; }
private:
ScPreviewViewForwarder* mpViewForwarder;
@@ -349,7 +349,7 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
virtual void UpdateData() {}
- virtual void SetDoUpdate( sal_Bool bValue ) {}
+ virtual void SetDoUpdate( sal_Bool /*bValue*/ ) {}
virtual sal_Bool IsDirty() const { return sal_False; }
};
diff --git a/binfilter/bf_sc/source/ui/unoobj/makefile.mk b/binfilter/bf_sc/source/ui/unoobj/makefile.mk
index dea8748..a6bd953 100644
--- a/binfilter/bf_sc/source/ui/unoobj/makefile.mk
+++ b/binfilter/bf_sc/source/ui/unoobj/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
index dca8879..8954a2f 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
@@ -69,7 +69,7 @@ const SfxItemPropertyMap* lcl_GetAutoFormatMap()
{MAP_CHAR_LEN(SC_UNONAME_INCJUST), 0, &::getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_INCNUM), 0, &::getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0, &::getBooleanCppuType(), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aAutoFormatMap_Impl;
}
@@ -124,7 +124,7 @@ const SfxItemPropertyMap* lcl_GetAutoFieldMap()
{MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &::getCppuType((const sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aAutoFieldMap_Impl;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index b08241a..6595878 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -125,25 +125,25 @@ const SfxItemPropertyMap* lcl_GetSettingsPropertyMap()
{
static SfxItemPropertyMap aSettingsPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_DOAUTOCP), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ENTERED), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_EXPREF), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_EXTFMT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_LINKUPD), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_MARKHDR), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_METRIC), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_MOVEDIR), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_MOVESEL), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_PRALLSH), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_PREMPTY), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_SCALE), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_STBFUNC), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence< ::rtl::OUString>*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0, &getBooleanCppuType(), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_DOAUTOCP), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ENTERED), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_EXPREF), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_EXTFMT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_LINKUPD), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_MARKHDR), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_METRIC), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_MOVEDIR), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_MOVESEL), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_PRALLSH), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_PREMPTY), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SCALE), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_STBFUNC), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence< ::rtl::OUString>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0, &getBooleanCppuType(), 0,0},
+ {0,0,0,0,0,0}
};
return aSettingsPropertyMap_Impl;
}
@@ -417,7 +417,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings()
}
uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& rSMgr )
+ const uno::Reference<lang::XMultiServiceFactory>& /*rSMgr*/ )
{
SolarMutexGuard aGuard;
SC_DLL()->Load(); // load module
@@ -634,6 +634,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const ::rtl::OUString
case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break;
case SVX_ZOOM_WHOLEPAGE: nZoomVal = SC_ZOOMVAL_WHOLEPAGE; break;
case SVX_ZOOM_PAGEWIDTH: nZoomVal = SC_ZOOMVAL_PAGEWIDTH; break;
+ default: break;
}
aRet <<= (sal_Int16) nZoomVal;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 15cddfa..e605ed8 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -236,7 +236,7 @@ const SfxItemPropertyMap* lcl_GetCellsPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aCellsPropertyMap_Impl;
}
@@ -329,7 +329,7 @@ const SfxItemPropertyMap* lcl_GetRangePropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aRangePropertyMap_Impl;
}
@@ -424,7 +424,7 @@ const SfxItemPropertyMap* lcl_GetCellPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aCellPropertyMap_Impl;
}
@@ -522,7 +522,7 @@ const SfxItemPropertyMap* lcl_GetColumnPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aColumnPropertyMap_Impl;
}
@@ -618,7 +618,7 @@ const SfxItemPropertyMap* lcl_GetRowPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aRowPropertyMap_Impl;
}
@@ -712,7 +712,7 @@ const SfxItemPropertyMap* lcl_GetSheetPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aSheetPropertyMap_Impl;
}
@@ -727,7 +727,7 @@ const SfxItemPropertyMap* lcl_GetEditPropertyMap()
SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
{MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aEditPropertyMap_Impl;
}
@@ -1237,17 +1237,17 @@ String lcl_GetInputString( ScDocShell* pDocSh, const ScAddress& rPosition, BOOL
ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) :
- pDocShell( pDocSh ),
aPropSet(lcl_GetCellsPropertyMap()),
- bChartColAsHdr( FALSE ),
- bChartRowAsHdr( FALSE ),
- bCursorOnly( FALSE ),
+ pDocShell( pDocSh ),
+ pValueListener( NULL ),
pCurrentFlat( NULL ),
pCurrentDeep( NULL ),
pCurrentDataSet( NULL ),
- pValueListener( NULL ),
- bValueChangePosted( FALSE ),
pMarkData( NULL ),
+ bChartColAsHdr( FALSE ),
+ bChartRowAsHdr( FALSE ),
+ bCursorOnly( FALSE ),
+ bValueChangePosted( FALSE ),
aValueListeners( 0 )
{
ScRange aCellRange = rR;
@@ -1259,18 +1259,18 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) :
}
ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) :
+ aPropSet(lcl_GetCellsPropertyMap()),
pDocShell( pDocSh ),
+ pValueListener( NULL ),
+ pCurrentFlat( NULL ),
+ pCurrentDeep( NULL ),
+ pCurrentDataSet( NULL ),
+ pMarkData( NULL ),
aRanges( rR ),
- aPropSet(lcl_GetCellsPropertyMap()),
bChartColAsHdr( FALSE ),
bChartRowAsHdr( FALSE ),
bCursorOnly( FALSE ),
- pCurrentFlat( NULL ),
- pCurrentDeep( NULL ),
- pCurrentDataSet( NULL ),
- pValueListener( NULL ),
bValueChangePosted( FALSE ),
- pMarkData( NULL ),
aValueListeners( 0 )
{
if (pDocShell) // Null, wenn per createInstance erzeugt...
@@ -2389,7 +2389,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< ::rtl::O
if ( pDocShell && nCount )
{
- SfxItemPropertySet aPropSet( pPropertyMap );
+ SfxItemPropertySet aLclPropSet( pPropertyMap );
ScDocument* pDoc = pDocShell->GetDocument();
ScPatternAttr* pOldPattern = NULL;
@@ -3088,6 +3088,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
}
}
break;
+ default:
+ break;
}
if (bAdd)
@@ -3241,13 +3243,13 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
aCmpAddr = ScAddress( aIter.GetCol(), nCmpPos, aIter.GetTab() );
else
aCmpAddr = ScAddress( nCmpPos, aIter.GetRow(), aIter.GetTab() );
- const ScBaseCell* pCmpCell = pDoc->GetCell( aCmpAddr );
+ const ScBaseCell* pLclCmpCell = pDoc->GetCell( aCmpAddr );
- ScRange aCellRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() );
- if ( !ScBaseCell::CellEqual( pCell, pCmpCell ) )
- aMarkData.SetMultiMarkArea( aCellRange );
+ ScRange aLclCellRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() );
+ if ( !ScBaseCell::CellEqual( pCell, pLclCmpCell ) )
+ aMarkData.SetMultiMarkArea( aLclCellRange );
else
- aMarkData.SetMultiMarkArea( aCellRange, FALSE ); // aufheben
+ aMarkData.SetMultiMarkArea( aLclCellRange, FALSE ); // aufheben
pCell = aIter.GetNext();
}
@@ -3333,10 +3335,10 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
{
ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
- ScDetectiveRefIter aIter( pFCell );
+ ScDetectiveRefIter aLclIter( pFCell );
ScTripel aRefStart;
ScTripel aRefEnd;
- while ( aIter.GetNextRef( aRefStart, aRefEnd ) )
+ while ( aLclIter.GetNextRef( aRefStart, aRefEnd ) )
{
ScRange aRefRange( aRefStart, aRefEnd );
if ( bRecursive && !bFound && !aMarkData.IsAllMarked( aRefRange ) )
@@ -3528,7 +3530,6 @@ ScCellRangesObj::ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR) :
ScCellRangesObj::~ScCellRangesObj()
{
- List aNamedEntries;
}
void ScCellRangesObj::RefChanged()
@@ -5327,9 +5328,9 @@ const SfxItemPropertyMap* ScCellObj::GetEditPropertyMap() // static
ScCellObj::ScCellObj(ScDocShell* pDocSh, const ScAddress& rP) :
ScCellRangeObj( pDocSh, ScRange(rP,rP) ),
+ pUnoText( NULL ),
aCellPropSet( lcl_GetCellPropertyMap() ),
aCellPos( rP ),
- pUnoText( NULL ),
nActionLockCount( 0 )
{
// pUnoText is allocated on demand (GetUnoText)
@@ -6174,10 +6175,10 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation
}
uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName(
- const ::rtl::OUString& aRange ) throw(uno::RuntimeException)
+ const ::rtl::OUString& rRange ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return ScCellRangeObj::getCellRangeByName( aRange );
+ return ScCellRangeObj::getCellRangeByName( rRange );
}
uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor()
@@ -6195,14 +6196,14 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor()
}
uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorByRange(
- const uno::Reference<sheet::XSheetCellRange>& aRange )
+ const uno::Reference<sheet::XSheetCellRange>& rRange )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh && aRange.is() )
+ if ( pDocSh && rRange.is() )
{
- ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( aRange );
+ ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( rRange );
if (pRangesImp)
{
const ScRangeList& rRanges = pRangesImp->GetRangeList();
@@ -6403,7 +6404,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage()
// XCellMovement
-void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& aRange,
+void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRange,
sheet::CellInsertMode nMode ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -6426,14 +6427,14 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& aRang
if (bDo)
{
- DBG_ASSERT( aRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ DBG_ASSERT( rRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aScRange;
- ScUnoConversion::FillScRange( aScRange, aRange );
+ ScUnoConversion::FillScRange( aScRange, rRange );
}
}
}
-void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& aRange,
+void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRange,
sheet::CellDeleteMode nMode ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -6456,9 +6457,9 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& aRang
if (bDo)
{
- DBG_ASSERT( aRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ DBG_ASSERT( rRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aScRange;
- ScUnoConversion::FillScRange( aScRange, aRange );
+ ScUnoConversion::FillScRange( aScRange, rRange );
}
}
}
@@ -6472,8 +6473,8 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& /*aDestinati
if ( pDocSh )
{
DBG_ASSERT( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
- ScRange aRange;
- ScUnoConversion::FillScRange( aRange, aSource );
+ ScRange aLclRange;
+ ScUnoConversion::FillScRange( aLclRange, aSource );
}
}
@@ -6486,8 +6487,8 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& /*aDestinati
if ( pDocSh )
{
DBG_ASSERT( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
- ScRange aRange;
- ScUnoConversion::FillScRange( aRange, aSource );
+ ScRange aLclRange;
+ ScUnoConversion::FillScRange( aLclRange, aSource );
}
}
@@ -6557,12 +6558,12 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
pDoc->SetPrintRangeCount( nTab, nCount );
if (nCount)
{
- ScRange aRange;
+ ScRange aLclRange;
const table::CellRangeAddress* pAry = aPrintAreas.getConstArray();
for (USHORT i=0; i<nCount; i++)
{
- ScUnoConversion::FillScRange( aRange, pAry[i] );
- pDoc->SetPrintRange( nTab, i, aRange );
+ ScUnoConversion::FillScRange( aLclRange, pAry[i] );
+ pDoc->SetPrintRange( nTab, i, aLclRange );
}
}
@@ -6902,7 +6903,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo
return FALSE;
}
-sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition )
+sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& /*aPosition*/ )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -6911,6 +6912,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo
{
USHORT nTab = GetTab_Impl();
DBG_ASSERT( aPosition.Sheet == nTab, "falsche Tabelle in CellAddress" );
+ (void)nTab;
return false;
}
return FALSE;
@@ -6973,7 +6975,7 @@ void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException)
// XSheetOutline
-void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& aRange,
+void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rRange,
table::TableOrientation nOrientation )
throw(uno::RuntimeException)
{
@@ -6983,13 +6985,13 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& aRange,
{
BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
ScRange aGroupRange;
- ScUnoConversion::FillScRange( aGroupRange, aRange );
+ ScUnoConversion::FillScRange( aGroupRange, rRange );
ScOutlineDocFunc aFunc(*pDocSh);
aFunc.MakeOutline( aGroupRange, bColumns, TRUE, TRUE );
}
}
-void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& aRange,
+void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rRange,
table::TableOrientation nOrientation )
throw(uno::RuntimeException)
{
@@ -6999,13 +7001,13 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& aRange,
{
BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
ScRange aGroupRange;
- ScUnoConversion::FillScRange( aGroupRange, aRange );
+ ScUnoConversion::FillScRange( aGroupRange, rRange );
ScOutlineDocFunc aFunc(*pDocSh);
aFunc.RemoveOutline( aGroupRange, bColumns, TRUE, TRUE );
}
}
-void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& aRange )
+void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -7013,7 +7015,7 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& aRang
if ( pDocSh )
{
ScRange aFormulaRange;
- ScUnoConversion::FillScRange( aFormulaRange, aRange );
+ ScUnoConversion::FillScRange( aFormulaRange, rRange );
ScOutlineDocFunc aFunc(*pDocSh);
aFunc.AutoOutline( aFormulaRange, TRUE, TRUE );
}
@@ -7031,7 +7033,7 @@ void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
}
}
-void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& aRange )
+void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -7039,13 +7041,13 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& aRange
if ( pDocSh )
{
ScRange aMarkRange;
- ScUnoConversion::FillScRange( aMarkRange, aRange );
+ ScUnoConversion::FillScRange( aMarkRange, rRange );
ScOutlineDocFunc aFunc(*pDocSh);
aFunc.HideMarkedOutlines( aMarkRange, TRUE, TRUE );
}
}
-void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& aRange )
+void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -7053,7 +7055,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& aRange
if ( pDocSh )
{
ScRange aMarkRange;
- ScUnoConversion::FillScRange( aMarkRange, aRange );
+ ScUnoConversion::FillScRange( aMarkRange, rRange );
ScOutlineDocFunc aFunc(*pDocSh);
aFunc.ShowMarkedOutlines( aMarkRange, TRUE, TRUE );
}
@@ -7164,7 +7166,7 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const ::rtl::OUString& aScena
}
}
-void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& aRanges )
+void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& rRanges )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -7177,17 +7179,17 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
ScMarkData aMarkData;
aMarkData.SelectTable( nTab, TRUE );
- USHORT nRangeCount = (USHORT)aRanges.getLength();
+ USHORT nRangeCount = (USHORT)rRanges.getLength();
if (nRangeCount)
{
- const table::CellRangeAddress* pAry = aRanges.getConstArray();
+ const table::CellRangeAddress* pAry = rRanges.getConstArray();
for (USHORT i=0; i<nRangeCount; i++)
{
DBG_ASSERT( pAry[i].Sheet == nTab, "addRanges mit falscher Tab" );
- ScRange aRange( (USHORT)pAry[i].StartColumn, (USHORT)pAry[i].StartRow, nTab,
+ ScRange aLclRange( (USHORT)pAry[i].StartColumn, (USHORT)pAry[i].StartRow, nTab,
(USHORT)pAry[i].EndColumn, (USHORT)pAry[i].EndRow, nTab );
- aMarkData.SetMultiMarkArea( aRange );
+ aMarkData.SetMultiMarkArea( aLclRange );
}
}
@@ -7830,8 +7832,8 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException)
ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) :
pDocShell( pDocSh ),
aRanges( rR ),
- bAtEnd( FALSE ),
- pMark( NULL )
+ pMark( NULL ),
+ bAtEnd( FALSE )
{
ScDocument* pDoc = pDocShell->GetDocument();
pDoc->AddUnoObject(*this);
@@ -8333,8 +8335,8 @@ uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createE
ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell* pDocSh, const ScMyRangeLists& rRangeLists) :
- pDocShell( pDocSh ),
aRangeLists(rRangeLists),
+ pDocShell( pDocSh ),
nCurrentPosition(0)
{
pDocShell->GetDocument()->AddUnoObject(*this);
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
index dfd5959..41a15c1 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
@@ -107,7 +107,7 @@ ScChartsObj::~ScChartsObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScChartsObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScChartsObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! Referenz-Update
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
index 9e6596a..b65bd84 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
@@ -57,32 +57,32 @@ const SfxItemPropertyMap* lcl_GetConfigPropertyMap()
{
static SfxItemPropertyMap aConfigPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_SHOWZERO), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_SHOWNOTES), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_SHOWGRID), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_GRIDCOLOR), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_LINKUPD), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_COLROWHDR), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_SHEETTABS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_OUTLSYMB), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_SNAPTORASTER), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERVIS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERRESX), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERRESY), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERSUBX), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERSUBY), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_RASTERSYNC), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_AUTOCALC), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0, &getCppuType((uno::Sequence<sal_Int8>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNO_CHARCOMP), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_ASIANKERN), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SCSAVEVERSION), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNO_SHOWZERO), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SHOWNOTES), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SHOWGRID), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_GRIDCOLOR), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_LINKUPD), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_COLROWHDR), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SHEETTABS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_OUTLSYMB), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SNAPTORASTER), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERVIS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERRESX), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERRESY), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERSUBX), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERSUBY), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_RASTERSYNC), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_AUTOCALC), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0, &getCppuType((uno::Sequence<sal_Int8>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNO_CHARCOMP), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ASIANKERN), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SCSAVEVERSION), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0,0},
+ {0,0,0,0,0,0}
};
return aConfigPropertyMap_Impl;
}
@@ -90,8 +90,8 @@ const SfxItemPropertyMap* lcl_GetConfigPropertyMap()
//------------------------------------------------------------------------
ScDocumentConfiguration::ScDocumentConfiguration(ScDocShell* pDocSh)
- : aPropSet ( lcl_GetConfigPropertyMap() ) ,
- pDocShell(pDocSh)
+ : pDocShell(pDocSh)
+ , aPropSet ( lcl_GetConfigPropertyMap() )
{
pDocShell->GetDocument()->AddUnoObject(*this);
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
index 0964716..2bc8e94 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
@@ -115,17 +115,17 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
+ aLclRange.Justify();
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- USHORT nStartCol = aRange.aStart.Col();
- USHORT nStartRow = aRange.aStart.Row();
- USHORT nEndCol = aRange.aEnd.Col();
- USHORT nEndRow = aRange.aEnd.Row();
- USHORT nTab = aRange.aStart.Tab();
+ USHORT nStartCol = aLclRange.aStart.Col();
+ USHORT nStartRow = aLclRange.aStart.Row();
+ USHORT nEndCol = aLclRange.aEnd.Col();
+ USHORT nEndRow = aLclRange.aEnd.Row();
+ USHORT nTab = aLclRange.aStart.Tab();
pDocSh->GetDocument()->GetDataArea(
nTab, nStartCol, nStartRow, nEndCol, nEndRow, TRUE );
@@ -140,10 +140,10 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
- ScAddress aCursor = aRange.aStart; // use the start address of the range
+ aLclRange.Justify();
+ ScAddress aCursor = aLclRange.aStart; // use the start address of the range
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
@@ -307,17 +307,17 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException)
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
+ aLclRange.Justify();
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- USHORT nStartCol = aRange.aStart.Col();
- USHORT nStartRow = aRange.aStart.Row();
- USHORT nEndCol = aRange.aEnd.Col();
- USHORT nEndRow = aRange.aEnd.Row();
- USHORT nTab = aRange.aStart.Tab();
+ USHORT nStartCol = aLclRange.aStart.Col();
+ USHORT nStartRow = aLclRange.aStart.Row();
+ USHORT nEndCol = aLclRange.aEnd.Col();
+ USHORT nEndRow = aLclRange.aEnd.Row();
+ USHORT nTab = aLclRange.aStart.Tab();
pDocSh->GetDocument()->GetDataArea(
nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
@@ -335,17 +335,17 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException)
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
+ aLclRange.Justify();
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- USHORT nStartCol = aRange.aStart.Col();
- USHORT nStartRow = aRange.aStart.Row();
- USHORT nEndCol = aRange.aEnd.Col();
- USHORT nEndRow = aRange.aEnd.Row();
- USHORT nTab = aRange.aStart.Tab();
+ USHORT nStartCol = aLclRange.aStart.Col();
+ USHORT nStartRow = aLclRange.aStart.Row();
+ USHORT nEndCol = aLclRange.aEnd.Col();
+ USHORT nEndRow = aLclRange.aEnd.Row();
+ USHORT nTab = aLclRange.aStart.Tab();
pDocSh->GetDocument()->GetDataArea(
nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
@@ -360,10 +360,10 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException)
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
- ScAddress aCursor = aRange.aStart; // bei Block immer den Start nehmen
+ aLclRange.Justify();
+ ScAddress aCursor = aLclRange.aStart; // bei Block immer den Start nehmen
ScMarkData aMark; // not used with bMarked=FALSE
USHORT nNewX = aCursor.Col();
@@ -382,10 +382,10 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException)
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
+ ScRange aLclRange = *rRanges.GetObject(0);
- aRange.Justify();
- ScAddress aCursor = aRange.aStart; // bei Block immer den Start nehmen
+ aLclRange.Justify();
+ ScAddress aCursor = aLclRange.aStart; // bei Block immer den Start nehmen
ScMarkData aMark; // not used with bMarked=FALSE
USHORT nNewX = aCursor.Col();
@@ -405,20 +405,20 @@ void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nR
SolarMutexGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
- ScRange aRange = *rRanges.GetObject(0);
- aRange.Justify();
+ ScRange aLclRange = *rRanges.GetObject(0);
+ aLclRange.Justify();
- if ( aRange.aStart.Col() + nColumnOffset >= 0 &&
- aRange.aEnd.Col() + nColumnOffset <= MAXCOL &&
- aRange.aStart.Row() + nRowOffset >= 0 &&
- aRange.aEnd.Row() + nRowOffset <= MAXROW )
+ if ( aLclRange.aStart.Col() + nColumnOffset >= 0 &&
+ aLclRange.aEnd.Col() + nColumnOffset <= MAXCOL &&
+ aLclRange.aStart.Row() + nRowOffset >= 0 &&
+ aLclRange.aEnd.Row() + nRowOffset <= MAXROW )
{
- ScRange aNew( (USHORT)(aRange.aStart.Col() + nColumnOffset),
- (USHORT)(aRange.aStart.Row() + nRowOffset),
- aRange.aStart.Tab(),
- (USHORT)(aRange.aEnd.Col() + nColumnOffset),
- (USHORT)(aRange.aEnd.Row() + nRowOffset),
- aRange.aEnd.Tab() );
+ ScRange aNew( (USHORT)(aLclRange.aStart.Col() + nColumnOffset),
+ (USHORT)(aLclRange.aStart.Row() + nRowOffset),
+ aLclRange.aStart.Tab(),
+ (USHORT)(aLclRange.aEnd.Col() + nColumnOffset),
+ (USHORT)(aLclRange.aEnd.Row() + nRowOffset),
+ aLclRange.aEnd.Tab() );
SetNewRange( aNew );
}
}
@@ -451,10 +451,10 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPositi
}
uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
- const ::rtl::OUString& aRange ) throw(uno::RuntimeException)
+ const ::rtl::OUString& rRange ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return ScCellRangeObj::getCellRangeByName(aRange);
+ return ScCellRangeObj::getCellRangeByName(rRange);
}
// XServiceInfo
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
index 754c713..218db50 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
@@ -54,7 +54,7 @@ const SfxItemPropertyMap* lcl_GetDataPilotFieldMap()
{
{MAP_CHAR_LEN(SC_UNONAME_FUNCTION), 0, &getCppuType((sheet::GeneralFunction*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ORIENT), 0, &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aDataPilotFieldMap_Impl;
}
@@ -192,6 +192,7 @@ USHORT ScDataPilotConversion::FunctionBit( sheet::GeneralFunction eFunc )
case sheet::GeneralFunction_VAR: nRet = PIVOT_FUNC_STD_VAR; break;
case sheet::GeneralFunction_VARP: nRet = PIVOT_FUNC_STD_VARP; break;
case sheet::GeneralFunction_AUTO: nRet = PIVOT_FUNC_AUTO; break;
+ default: break;
}
return nRet;
}
@@ -925,9 +926,9 @@ void ScDataPilotTableObj::GetParam( ScPivotParam& rParam, ScQueryParam& rQuery,
void ScDataPilotTableObj::SetParam( const ScPivotParam& rParam,
const ScQueryParam& rQuery, const ScArea& rSrcArea )
{
- ScDocShell* pDocShell = GetDocShell();
- ScDPObject* pDPObj = lcl_GetDPObject(pDocShell, nTab, aName);
- if ( pDPObj && pDocShell )
+ ScDocShell* pLclDocShell = GetDocShell();
+ ScDPObject* pDPObj = lcl_GetDPObject(pLclDocShell, nTab, aName);
+ if ( pDPObj && pLclDocShell )
{
// in den Uno-Objekten sind alle Fields in den Descriptoren innerhalb des Bereichs gezaehlt
@@ -953,7 +954,7 @@ void ScDataPilotTableObj::SetParam( const ScPivotParam& rParam,
rEntry.nField += nFieldStart;
}
- ScDocument* pDoc = pDocShell->GetDocument();
+ ScDocument* pDoc = pLclDocShell->GetDocument();
ScPivot* pNew = new ScPivot( pDoc );
pNew->SetName( pDPObj->GetName() );
pNew->SetTag( pDPObj->GetTag() );
@@ -963,7 +964,7 @@ void ScDataPilotTableObj::SetParam( const ScPivotParam& rParam,
pNewObj->InitFromOldPivot( *pNew, pDoc, TRUE );
lcl_SetLayoutNamesToObject( pDoc, aNewParam, rSrcArea, *pNewObj );
- ScDBDocFunc aFunc(*pDocShell);
+ ScDBDocFunc aFunc(*pLclDocShell);
aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, TRUE );
delete pNewObj; // DataPilotUpdate copies settings from "new" object
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index 63e1239..2223965 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -66,19 +66,19 @@ const SfxItemPropertyMap* lcl_GetSubTotalPropertyMap()
static SfxItemPropertyMap aSubTotalPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_BINDFMT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_CASE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ENABSORT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ENUSLIST), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_FORMATS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_INSBRK), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ISCASE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_MAXFLD), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNONAME_SORTASC), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ULIST), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_UINDEX), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_USINDEX), 0, &getCppuType((sal_Int32*)0), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_BINDFMT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_CASE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ENABSORT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ENUSLIST), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_FORMATS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_INSBRK), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ISCASE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_MAXFLD), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SORTASC), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ULIST), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_UINDEX), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_USINDEX), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {0,0,0,0,0,0}
};
return aSubTotalPropertyMap_Impl;
}
@@ -87,16 +87,16 @@ const SfxItemPropertyMap* lcl_GetFilterPropertyMap()
{
static SfxItemPropertyMap aFilterPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_CONTHDR), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_COPYOUT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ISCASE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_MAXFLD), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNONAME_ORIENT), 0, &getCppuType((table::TableOrientation*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_OUTPOS), 0, &getCppuType((table::CellAddress*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_SAVEOUT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_SKIPDUP), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_USEREGEX), 0, &getBooleanCppuType(), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_CONTHDR), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_COPYOUT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ISCASE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_MAXFLD), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ORIENT), 0, &getCppuType((table::TableOrientation*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_OUTPOS), 0, &getCppuType((table::CellAddress*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SAVEOUT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SKIPDUP), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_USEREGEX), 0, &getBooleanCppuType(), 0,0},
+ {0,0,0,0,0,0}
};
return aFilterPropertyMap_Impl;
}
@@ -105,16 +105,16 @@ const SfxItemPropertyMap* lcl_GetDBRangePropertyMap()
{
static SfxItemPropertyMap aDBRangePropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_AUTOFLT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_FLTCRT), 0, &getCppuType((table::CellRangeAddress*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ISUSER), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0, &getBooleanCppuType(), 0},
+ {MAP_CHAR_LEN(SC_UNONAME_AUTOFLT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_FLTCRT), 0, &getCppuType((table::CellRangeAddress*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ISUSER), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0, &getBooleanCppuType(), 0,0},
{MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_USEFLTCRT),0, &getBooleanCppuType(), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_USEFLTCRT),0, &getBooleanCppuType(), 0,0},
+ {0,0,0,0,0,0}
};
return aDBRangePropertyMap_Impl;
}
@@ -294,8 +294,6 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
// Uno-Werte zusammensuchen
- rParam.bByRow ? table::TableOrientation_ROWS : table::TableOrientation_COLUMNS;
-
table::CellAddress aOutPos;
aOutPos.Sheet = rParam.nDestTab;
aOutPos.Column = rParam.nDestCol;
@@ -393,50 +391,50 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
{
bOldSortDescriptor = sal_True;
INT32 nCount = aSeq.getLength();
- INT32 i;
+ INT32 k;
if ( nCount > MAXSORT )
{
DBG_ERROR("Zu viele Sortierfelder");
nCount = MAXSORT;
}
const util::SortField* pFieldArray = aSeq.getConstArray();
- for (i=0; i<nCount; i++)
+ for (k=0; k<nCount; k++)
{
- rParam.nField[i] = (USHORT)pFieldArray[i].Field;
- rParam.bAscending[i] = pFieldArray[i].SortAscending;
+ rParam.nField[k] = (USHORT)pFieldArray[k].Field;
+ rParam.bAscending[k] = pFieldArray[k].SortAscending;
// FieldType wird ignoriert
- rParam.bDoSort[i] = TRUE;
+ rParam.bDoSort[k] = TRUE;
}
- for (i=nCount; i<MAXSORT; i++)
- rParam.bDoSort[i] = FALSE;
+ for (k=nCount; k<MAXSORT; k++)
+ rParam.bDoSort[k] = FALSE;
}
else if ( rProp.Value >>= aNewSeq )
{
bNewSortDescriptor = sal_True;
INT32 nCount = aNewSeq.getLength();
- INT32 i;
+ INT32 k;
if ( nCount > MAXSORT )
{
DBG_ERROR("Zu viele Sortierfelder");
nCount = MAXSORT;
}
const table::TableSortField* pFieldArray = aNewSeq.getConstArray();
- for (i=0; i<nCount; i++)
+ for (k=0; k<nCount; k++)
{
- rParam.nField[i] = (USHORT)pFieldArray[i].Field;
- rParam.bAscending[i] = pFieldArray[i].IsAscending;
+ rParam.nField[k] = (USHORT)pFieldArray[k].Field;
+ rParam.bAscending[k] = pFieldArray[k].IsAscending;
// only one is possible, sometime we should make it possible to have different for every entry
- rParam.bCaseSens = pFieldArray[i].IsCaseSensitive;
- rParam.aCollatorLocale = pFieldArray[i].CollatorLocale;
- rParam.aCollatorAlgorithm = pFieldArray[i].CollatorAlgorithm;
+ rParam.bCaseSens = pFieldArray[k].IsCaseSensitive;
+ rParam.aCollatorLocale = pFieldArray[k].CollatorLocale;
+ rParam.aCollatorAlgorithm = pFieldArray[k].CollatorAlgorithm;
// FieldType wird ignoriert
- rParam.bDoSort[i] = TRUE;
+ rParam.bDoSort[k] = TRUE;
}
- for (i=nCount; i<MAXSORT; i++)
- rParam.bDoSort[i] = FALSE;
+ for (k=nCount; k<MAXSORT; k++)
+ rParam.bDoSort[k] = FALSE;
}
}
else if (aPropName.EqualsAscii( SC_UNONAME_ISCASE ))
@@ -483,8 +481,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ) :
- rParent( *pDesc ),
xRef( pDesc ), // Objekt festhalten
+ rParent( *pDesc ),
nPos( nP )
{
DBG_ASSERT(pDesc, "ScSubTotalFieldObj: Parent ist 0");
@@ -1029,9 +1027,9 @@ void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks )
}
-ScFilterDescriptorBase::ScFilterDescriptorBase(ScDocShell* pDocShell) :
- pDocSh(pDocShell),
- aPropSet( lcl_GetFilterPropertyMap() )
+ScFilterDescriptorBase::ScFilterDescriptorBase(ScDocShell* pDocShell)
+ : aPropSet( lcl_GetFilterPropertyMap() )
+ , pDocSh(pDocShell)
{
if (pDocSh)
pDocSh->GetDocument()->AddUnoObject(*this);
@@ -1311,9 +1309,9 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const ::rtl::OUStrin
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase )
-ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocSh)
+ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pInDocSh)
:
- ScFilterDescriptorBase(pDocSh)
+ ScFilterDescriptorBase(pInDocSh)
{
}
@@ -1337,8 +1335,8 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew )
}
-ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocSh, ScDatabaseRangeObj* pPar) :
- ScFilterDescriptorBase(pDocSh),
+ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pInDocSh, ScDatabaseRangeObj* pPar) :
+ ScFilterDescriptorBase(pInDocSh),
pParent(pPar)
{
if (pParent)
@@ -1364,8 +1362,8 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam )
}
-ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocSh, ScDataPilotDescriptorBase* pPar) :
- ScFilterDescriptorBase(pDocSh),
+ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pInDocSh, ScDataPilotDescriptorBase* pPar) :
+ ScFilterDescriptorBase(pInDocSh),
pParent(pPar)
{
if (pParent)
@@ -1967,7 +1965,7 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException)
return pNames->GetCount();
}
- return NULL;
+ return 0;
}
uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx
index 9a4c03d..db65b5e 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx
@@ -72,7 +72,7 @@ const SfxItemPropertyMap* lcl_GetDocDefaultsMap()
{MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
{MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_TABSTOPDIS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aDocDefaultsMap_Impl;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index 2645a6a..27b5221 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -88,35 +88,35 @@ const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
{
static SfxItemPropertyMap aDocOptPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_AREALINKS), 0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_COLLABELRNG), 0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_DDELINKS), 0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNO_HASDRAWPAGES), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY},
- {MAP_CHAR_LEN(SC_UNO_IGNORECASE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_ITERENABLED), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_ITERCOUNT), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_ITEREPSILON), 0, &getCppuType((double*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), 0, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_DATABASERNG), 0, &getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_NULLDATE), 0, &getCppuType((util::Date*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_ROWLABELRNG), 0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_SHEETLINKS), 0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), 0, &getBooleanCppuType(), 0},
-
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_AREALINKS), 0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_COLLABELRNG), 0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_DDELINKS), 0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNO_HASDRAWPAGES), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY,0},
+ {MAP_CHAR_LEN(SC_UNO_IGNORECASE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITERENABLED), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITERCOUNT), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITEREPSILON), 0, &getCppuType((double*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), 0, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_DATABASERNG), 0, &getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_NULLDATE), 0, &getCppuType((util::Date*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ROWLABELRNG), 0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SHEETLINKS), 0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), 0, &getBooleanCppuType(), 0,0},
+
+ {0,0,0,0,0,0}
};
return aDocOptPropertyMap_Impl;
}
@@ -132,7 +132,7 @@ const SfxItemPropertyMap* lcl_GetColumnsPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_OWIDTH), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLWID), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aColumnsPropertyMap_Impl;
}
@@ -147,7 +147,7 @@ const SfxItemPropertyMap* lcl_GetRowsPropertyMap()
{MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aRowsPropertyMap_Impl;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
index 18a8188..4831e34 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
@@ -258,8 +258,6 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHi
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- (const ScUpdateRefHint&)rHint;
-
//! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
index eccbc08..2d81fa6 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
@@ -72,13 +72,13 @@ const SfxItemPropertyMap* lcl_GetURLPropertyMap()
{
static SfxItemPropertyMap aURLPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((::rtl::OUString*)0), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {0,0,0,0,0,0}
};
return aURLPropertyMap_Impl;
}
@@ -87,10 +87,10 @@ const SfxItemPropertyMap* lcl_GetHeaderFieldPropertyMap()
{
static SfxItemPropertyMap aHeaderFieldPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY },
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY,0 },
+ {0,0,0,0,0,0}
};
return aHeaderFieldPropertyMap_Impl;
}
@@ -99,11 +99,11 @@ const SfxItemPropertyMap* lcl_GetFileFieldPropertyMap()
{
static SfxItemPropertyMap aFileFieldPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY },
- {MAP_CHAR_LEN(SC_UNONAME_FILEFORM), 0, &getCppuType((sal_Int16*)0), 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY },
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_FILEFORM), 0, &getCppuType((sal_Int16*)0), 0,0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY,0 },
+ {0,0,0,0,0,0}
};
return aFileFieldPropertyMap_Impl;
}
@@ -278,8 +278,6 @@ void ScCellFieldsObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- (const ScUpdateRefHint&)rHint;
-
//! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
@@ -540,8 +538,6 @@ void ScCellFieldObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if ( rHint.ISA( ScUpdateRefHint ) )
{
- (const ScUpdateRefHint&)rHint;
-
//! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx
index 01c71b0..6da271d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx
@@ -54,16 +54,16 @@ const SfxItemPropertyMap* lcl_GetValidatePropertyMap()
{
static SfxItemPropertyMap aValidatePropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0, &getCppuType((sheet::ValidationAlertStyle*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_IGNOREBL), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((::rtl::OUString*)0), 0},
- {MAP_CHAR_LEN(SC_UNONAME_SHOWERR), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_SHOWINP), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNONAME_TYPE), 0, &getCppuType((sheet::ValidationType*)0), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0, &getCppuType((sheet::ValidationAlertStyle*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_IGNOREBL), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((::rtl::OUString*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SHOWERR), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_SHOWINP), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNONAME_TYPE), 0, &getCppuType((sheet::ValidationType*)0), 0,0},
+ {0,0,0,0,0,0}
};
return aValidatePropertyMap_Impl;
}
@@ -90,6 +90,7 @@ sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode )
case SC_COND_BETWEEN: eOper = sheet::ConditionOperator_BETWEEN; break;
case SC_COND_NOTBETWEEN: eOper = sheet::ConditionOperator_NOT_BETWEEN; break;
case SC_COND_DIRECT: eOper = sheet::ConditionOperator_FORMULA; break;
+ default: break;
}
return eOper;
}
@@ -108,6 +109,7 @@ ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper )
case sheet::ConditionOperator_BETWEEN: eMode = SC_COND_BETWEEN; break;
case sheet::ConditionOperator_NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break;
case sheet::ConditionOperator_FORMULA: eMode = SC_COND_DIRECT; break;
+ default: break;
}
return eMode;
}
@@ -171,7 +173,7 @@ ScTableConditionalFormat::~ScTableConditionalFormat()
{
ScTableConditionalEntry* pEntry;
aEntries.First();
- while ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() )
+ while ( (pEntry = (ScTableConditionalEntry*)aEntries.Remove()) )
pEntry->release();
}
@@ -275,7 +277,7 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException)
SolarMutexGuard aGuard;
ScTableConditionalEntry* pEntry;
aEntries.First();
- while ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() )
+ while ( (pEntry = (ScTableConditionalEntry*)aEntries.Remove()) )
pEntry->release();
DataChanged();
@@ -742,6 +744,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
case sheet::ValidationType_TEXT_LEN: nValMode = SC_VALID_TEXTLEN; break;
case sheet::ValidationType_LIST: nValMode = SC_VALID_LIST; break;
case sheet::ValidationType_CUSTOM: nValMode = SC_VALID_CUSTOM; break;
+ default: break;
}
}
else if ( aString.EqualsAscii( SC_UNONAME_ERRALSTY ) )
@@ -754,6 +757,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
case sheet::ValidationAlertStyle_WARNING: nErrorStyle = SC_VALERR_WARNING; break;
case sheet::ValidationAlertStyle_INFO: nErrorStyle = SC_VALERR_INFO; break;
case sheet::ValidationAlertStyle_MACRO: nErrorStyle = SC_VALERR_MACRO; break;
+ default: break;
}
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
index 33b46c4..1ea510d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
@@ -187,9 +187,9 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
return TRUE;
}
-ScFunctionAccess::ScFunctionAccess() :
- bInvalid( FALSE ),
- pOptions( NULL )
+ScFunctionAccess::ScFunctionAccess()
+ : pOptions( NULL )
+ , bInvalid( FALSE )
{
StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
index 8ee79b1..cd3af23 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
@@ -58,7 +58,7 @@ const SfxItemPropertyMap* lcl_GetSheetLinkMap()
{MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((::rtl::OUString*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((::rtl::OUString*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aSheetLinkMap_Impl;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
index fac3ce3..5c5e818 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
@@ -58,7 +58,7 @@ const SfxItemPropertyMap* lcl_GetNamedRangeMap()
{
{MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aNamedRangeMap_Impl;
}
@@ -92,7 +92,7 @@ ScNamedRangeObj::~ScNamedRangeObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScNamedRangeObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScNamedRangeObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Ref-Update interessiert nicht
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx
index 8bbfed7..5208e7a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx
@@ -57,7 +57,7 @@ const SfxItemPropertyMap* lcl_GetAnnotationPropertyMap()
{
static SfxItemPropertyMap aAnnotationPropertyMap_Impl[] =
{
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aAnnotationPropertyMap_Impl;
}
@@ -102,8 +102,6 @@ void ScAnnotationObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- (const ScUpdateRefHint&)rHint;
-
//! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx
index 318a906..07f18c4 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx
@@ -48,19 +48,19 @@ const SfxItemPropertyMap* ScDocOptionsHelper::GetPropertyMap()
{
static SfxItemPropertyMap aMap[] =
{
- {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_IGNORECASE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_ITERENABLED), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_ITERCOUNT), 0, &getCppuType((sal_Int32*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_ITEREPSILON), 0, &getCppuType((double*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_NULLDATE), 0, &getCppuType((util::Date*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), 0, &getBooleanCppuType(), 0},
- {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0},
- {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), 0, &getBooleanCppuType(), 0},
- {0,0,0,0}
+ {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_IGNORECASE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITERENABLED), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITERCOUNT), 0, &getCppuType((sal_Int32*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_ITEREPSILON), 0, &getCppuType((double*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_NULLDATE), 0, &getCppuType((util::Date*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), 0, &getBooleanCppuType(), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0,0},
+ {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), 0, &getBooleanCppuType(), 0,0},
+ {0,0,0,0,0,0}
};
return aMap;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_pageuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_pageuno.cxx
index 89d235a..6e6d741 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_pageuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_pageuno.cxx
@@ -41,8 +41,8 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-ScPageObj::ScPageObj( SdrPage* pPage ) :
- SvxFmDrawPage( pPage )
+ScPageObj::ScPageObj( SdrPage* pInPage ) :
+ SvxFmDrawPage( pInPage )
{
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx
index 435b693..7d35a8d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx
@@ -64,7 +64,7 @@ const SfxItemPropertyMap* lcl_GetShapeMap()
static SfxItemPropertyMap aShapeMap_Impl[] =
{
{MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aShapeMap_Impl;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index 0bb2129..1a0cdf7 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -146,7 +146,7 @@ const SfxItemPropertyMap* lcl_GetCellStyleMap()
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aCellStyleMap_Impl;
}
@@ -263,7 +263,7 @@ const SfxItemPropertyMap* lcl_GetPageStyleMap()
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_WIDTH | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPageStyleMap_Impl;
}
@@ -301,7 +301,7 @@ const SfxItemPropertyMap* lcl_GetHeaderStyleMap()
{MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
{MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aHeaderStyleMap_Impl;
}
@@ -339,7 +339,7 @@ const SfxItemPropertyMap* lcl_GetFooterStyleMap()
{MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
{MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
return aFooterStyleMap_Impl;
}
@@ -550,13 +550,13 @@ void ScStyleFamiliesObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
// XStyleFamilies
-ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(UINT16 Type) const
+ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(UINT16 nType) const
{
if ( pDocShell )
{
- if ( Type == SFX_STYLE_FAMILY_PARA )
+ if ( nType == SFX_STYLE_FAMILY_PARA )
return new ScStyleFamilyObj( pDocShell, SFX_STYLE_FAMILY_PARA );
- else if ( Type == SFX_STYLE_FAMILY_PAGE )
+ else if ( nType == SFX_STYLE_FAMILY_PAGE )
return new ScStyleFamilyObj( pDocShell, SFX_STYLE_FAMILY_PAGE );
}
DBG_ERROR("getStyleFamilyByType: keine DocShell oder falscher Typ");
@@ -989,10 +989,10 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const ::rtl::OUString& aName )
ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) :
+ aPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleMap() : lcl_GetPageStyleMap() ),
pDocShell( pDocSh ),
eFamily( eFam ),
- aStyleName( rName ),
- aPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleMap() : lcl_GetPageStyleMap() )
+ aStyleName( rName )
{
// pDocShell ist Null, wenn per ServiceProvider erzeugt
@@ -1184,10 +1184,6 @@ void SAL_CALL ScStyleObj::setName( const ::rtl::OUString& aNewName )
if (bOk)
{
aStyleName = aString; //! notify other objects for this style?
-
- // Zellvorlagen = 2, Seitenvorlagen = 4
- ( eFamily == SFX_STYLE_FAMILY_PARA ) ?
- SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4;
}
}
}
@@ -1584,13 +1580,13 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno:
}
if (!bDone)
{
- const SfxItemPropertyMap* pMap =
+ const SfxItemPropertyMap* pLclMap =
SfxItemPropertyMap::GetByName( aPropSet.getPropertyMap(), aString );
- if ( pMap && IsScItemWid( pMap->nWID ) )
+ if ( pLclMap && IsScItemWid( pLclMap->nWID ) )
{
if (pValue)
{
- switch ( pMap->nWID ) // fuer Item-Spezial-Behandlungen
+ switch ( pLclMap->nWID ) // fuer Item-Spezial-Behandlungen
{
case ATTR_VALUE_FORMAT:
{
@@ -1604,7 +1600,7 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno:
nOldFormat = pFormatter->
GetFormatForLanguageIfBuiltIn( nOldFormat, eOldLang );
- UINT32 nNewFormat;
+ UINT32 nNewFormat(0);
*pValue >>= nNewFormat;
rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
@@ -1619,9 +1615,9 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno:
break;
case ATTR_INDENT:
{
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
*pValue >>= nVal;
- rSet.Put( SfxUInt16Item( pMap->nWID, (USHORT)HMMToTwips(nVal) ) );
+ rSet.Put( SfxUInt16Item( pLclMap->nWID, (USHORT)HMMToTwips(nVal) ) );
}
break;
case ATTR_ROTATE_VALUE:
@@ -1665,19 +1661,19 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno:
case ATTR_PAGE_SCALETOPAGES:
case ATTR_PAGE_FIRSTPAGENO:
{
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
*pValue >>= nVal;
- rSet.Put( SfxUInt16Item( pMap->nWID, nVal ) );
+ rSet.Put( SfxUInt16Item( pLclMap->nWID, nVal ) );
}
break;
case ATTR_PAGE_CHARTS:
case ATTR_PAGE_OBJECTS:
case ATTR_PAGE_DRAWINGS:
{
- sal_Bool bBool;
+ sal_Bool bBool(sal_False);
*pValue >>= bBool;
//! sal_Bool-MID fuer ScViewObjectModeItem definieren?
- rSet.Put( ScViewObjectModeItem( pMap->nWID,
+ rSet.Put( ScViewObjectModeItem( pLclMap->nWID,
bBool ? VOBJ_MODE_SHOW : VOBJ_MODE_HIDE ) );
}
break;
@@ -1718,19 +1714,19 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno:
// #65253# Default-Items mit falscher Slot-ID
// funktionieren im SfxItemPropertySet3 nicht
//! Slot-IDs aendern...
- if ( rSet.GetPool()->GetSlotId(pMap->nWID) == pMap->nWID &&
- rSet.GetItemState(pMap->nWID, sal_False) == SFX_ITEM_DEFAULT )
+ if ( rSet.GetPool()->GetSlotId(pLclMap->nWID) == pLclMap->nWID &&
+ rSet.GetItemState(pLclMap->nWID, sal_False) == SFX_ITEM_DEFAULT )
{
- rSet.Put( rSet.Get(pMap->nWID) );
+ rSet.Put( rSet.Get(pLclMap->nWID) );
}
- aPropSet.setPropertyValue( *pMap, *pValue, rSet );
+ aPropSet.setPropertyValue( *pLclMap, *pValue, rSet );
}
}
else
{
- rSet.ClearItem( pMap->nWID );
+ rSet.ClearItem( pLclMap->nWID );
// #67847# language for number formats
- if ( pMap->nWID == ATTR_VALUE_FORMAT )
+ if ( pLclMap->nWID == ATTR_VALUE_FORMAT )
rSet.ClearItem( ATTR_LANGUAGE_FORMAT );
//! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION?
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
index 52eb5bd..719d0f3 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
@@ -80,7 +80,7 @@ const SfxItemPropertyMap* lcl_GetHdFtPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
static BOOL bTwipsSet = FALSE;
@@ -344,8 +344,8 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
if ( aSet.GetItemState( EE_FEATURE_FIELD, FALSE, &pItem ) == SFX_ITEM_ON )
{
const SvxFieldItem* pFieldItem = static_cast<const SvxFieldItem*>(pItem);
- const SvxFieldData* pData = pFieldItem->GetField();
- if ( !pData )
+ const SvxFieldData* pLclData = pFieldItem->GetField();
+ if ( !pLclData )
{
// remove the invalid field
pEditEngine->QuickDelete( aFieldSel );
@@ -981,9 +981,9 @@ ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) :
aCellPos( rP ),
pEditEngine( NULL ),
pForwarder( NULL ),
+ pOriginalSource( NULL ),
bDataValid( FALSE ),
bInUpdate( FALSE ),
- pOriginalSource( NULL ),
bDirty( FALSE ),
bDoUpdate( TRUE )
{
@@ -1109,8 +1109,6 @@ void ScCellTextData::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- (const ScUpdateRefHint&)rHint;
-
//! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) )
diff --git a/binfilter/inc/bf_sch/schdll0.hxx b/binfilter/inc/bf_sch/schdll0.hxx
index d56f870..1a58e4e 100644
--- a/binfilter/inc/bf_sch/schdll0.hxx
+++ b/binfilter/inc/bf_sch/schdll0.hxx
@@ -55,10 +55,10 @@ public:
// 'p' + SfxObjectShell-subclass + 'Factory'
SotFactory *pSchChartDocShellFactory; // Namensaufbau zwingend!!
- SchModuleDummy(ResMgr *pResMgr,
- BOOL bDummy,
+ SchModuleDummy(ResMgr *pInResMgr,
+ BOOL bInDummy,
SotFactory *pObjFact) :
- SfxModule(pResMgr, bDummy, (SfxObjectFactory*) pObjFact, NULL),
+ SfxModule(pInResMgr, bInDummy, (SfxObjectFactory*) pObjFact, NULL),
pSchChartDocShellFactory(pObjFact)
{
}
More information about the Libreoffice-commits
mailing list