mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:staticmethods

Browse Source 
Change-Id: Id3d6b50e07ea0850af18ab9bdadfffe0e4602aab
This commit is contained in:
Noel Grandin 2015-04-02 14:07:31 +02:00
parent e4688a3d41
commit d1b27a1d9a
59 changed files with 112 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eventattacher/source/eventattacher.cxx
View File

@ -251,7 +251,7 @@ public:
friend class FilterAllListenerImpl;
private:
Reference<XEventListener> attachListenerForTarget(
static Reference<XEventListener> attachListenerForTarget(
const Reference<XIntrospectionAccess>& xAccess,
const Reference<XInvocationAdapterFactory2>& xInvocationAdapterFactory,
const Reference<XAllListener>& xAllListener,

10
i18npool/inc/calendar_hijri.hxx
View File

@ -64,11 +64,11 @@ protected:
static const sal_Int32 LeapYear[];
private:
double NewMoon(sal_Int32 n);
void getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
void ToGregorian(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
void getGregorianDay(sal_Int32 jd, sal_Int32 *pnDay, sal_Int32 *pnMonth, sal_Int32 *pnYear);
double getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year);
static double NewMoon(sal_Int32 n);
static void getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
static void ToGregorian(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
static void getGregorianDay(sal_Int32 jd, sal_Int32 *pnDay, sal_Int32 *pnMonth, sal_Int32 *pnYear);
static double getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year);
};
} } } }

4
i18npool/inc/cclass_unicode.hxx
View File

@ -136,7 +136,7 @@ private:
sal_Unicode cDecimalSep;
/// Get corresponding KParseTokens flag for a character
sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos );
static sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos );
/// Access parser table flags.
UPT_FLAG_TYPE getFlags( const sal_Unicode* aStr, sal_Int32 nPos );
@ -171,7 +171,7 @@ private:
bool setupInternational( const com::sun::star::lang::Locale& rLocale );
/// Implementation of getCharacterType() for one single character
sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
static sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
};

2
i18npool/inc/inputsequencechecker.hxx
View File

@ -72,7 +72,7 @@ private :
com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage)
throw (com::sun::star::uno::RuntimeException);
sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
};
} } } }

6
i18npool/inc/numberformatcode.hxx
View File

@ -62,9 +62,9 @@ private:
void setupLocale( const ::com::sun::star::lang::Locale& rLocale );
void getFormats( const ::com::sun::star::lang::Locale& rLocale );
OUString mapElementTypeShortToString(sal_Int16 formatType);
sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
OUString mapElementUsageShortToString(sal_Int16 formatUsage);
static OUString mapElementTypeShortToString(sal_Int16 formatType);
static sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
static OUString mapElementUsageShortToString(sal_Int16 formatUsage);
sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
void createLocaleDataObject();
};

2
include/xmloff/SettingsExportHelper.hxx
View File

@ -60,7 +60,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
const OUString& rName) const;
void exportBool(const bool bValue, const OUString& rName) const;
void exportByte(const sal_Int8 nValue, const OUString& rName) const;
static void exportByte(const sal_Int8 nValue, const OUString& rName);
void exportShort(const sal_Int16 nValue, const OUString& rName) const;
void exportInt(const sal_Int32 nValue, const OUString& rName) const;
void exportLong(const sal_Int64 nValue, const OUString& rName) const;

2
include/xmloff/formlayerexport.hxx
View File

@ -142,7 +142,7 @@ namespace xmloff
/** determines whether the given page contains logical forms
*/
bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ) const;
static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage );
/** determines whether the given page contains XForm instances
*/

2
include/xmloff/formlayerimport.hxx
View File

@ -65,7 +65,7 @@ namespace xmloff
/** creates an import context for the office:forms element
*/
SvXMLImportContext* createOfficeFormsContext(
static SvXMLImportContext* createOfficeFormsContext(
SvXMLImport& _rImport,
sal_uInt16 _nPrefix,
const OUString& _rLocalName);

2
include/xmloff/nmspmap.hxx
View File

@ -136,7 +136,7 @@ public:
/* deprecated */ bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
/* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const;
/* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey );
/* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const;
/* deprecated */ sal_uInt16 GetFirstIndex() const;
/* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const;

8
include/xmloff/prstylei.hxx
View File

@ -78,10 +78,10 @@ protected:
bool translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames();
//UUUU provider for often used sets
const OldFillStyleDefinitionSet& getStandardSet();
const OldFillStyleDefinitionSet& getHeaderSet();
const OldFillStyleDefinitionSet& getFooterSet();
const OldFillStyleDefinitionSet& getParaSet();
static const OldFillStyleDefinitionSet& getStandardSet();
static const OldFillStyleDefinitionSet& getHeaderSet();
static const OldFillStyleDefinitionSet& getFooterSet();
static const OldFillStyleDefinitionSet& getParaSet();
virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,

2
include/xmloff/shapeimport.hxx
View File

@ -327,7 +327,7 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
SvXMLImportContext* CreateFrameChildContext(
static SvXMLImportContext* CreateFrameChildContext(
SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );

2
include/xmloff/txtimp.hxx
View File

@ -375,7 +375,7 @@ private:
/// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx
struct BackpatcherImpl;
std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl;
std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
static std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
protected:
virtual SvXMLImportContext *CreateTableChildContext(

4
include/xmloff/txtimppr.hxx
View File

@ -29,12 +29,12 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM
sal_Int32 nSizeTypeIndex;
sal_Int32 nWidthTypeIndex;
void FontFinished(
static void FontFinished(
XMLPropertyState *pFontFamilyNameState,
XMLPropertyState *pFontStyleNameState,
XMLPropertyState *pFontFamilyState,
XMLPropertyState *pFontPitchState,
XMLPropertyState *pFontCharsetState ) const;
XMLPropertyState *pFontCharsetState );
void FontDefaultsCheck(
XMLPropertyState*pFontFamilyName,

2
include/xmloff/xmlimp.hxx
View File

@ -180,7 +180,7 @@ protected:
inline bool HasShapeImport() const { return mxShapeImport.is(); }
inline void ClearShapeImport() { mxShapeImport = 0; }
SchXMLImportHelper* CreateChartImport();
static SchXMLImportHelper* CreateChartImport();
::xmloff::OFormLayerXMLImport* CreateFormImport();
void SetFontDecls( XMLFontStylesContext *pFontDecls );

4
include/xmloff/xmluconv.hxx
View File

@ -207,8 +207,8 @@ public:
/** convert NumberingType to num-forat and num-letter-sync values */
void convertNumFormat( OUStringBuffer& rBuffer,
sal_Int16 nType ) const;
void convertNumLetterSync( OUStringBuffer& rBuffer,
sal_Int16 nType ) const;
static void convertNumLetterSync( OUStringBuffer& rBuffer,
sal_Int16 nType );
static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps,
const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& aProperties);

2
sc/source/filter/xml/xmltabi.cxx
View File

@ -320,7 +320,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
{
GetScImport().GetFormImport()->startPage(GetScImport().GetTables().GetCurrentXDrawPage());
bStartFormPage = true;
pContext = GetScImport().GetFormImport()->createOfficeFormsContext( GetScImport(), nPrefix, rLName );
pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetScImport(), nPrefix, rLName );
}
break;
case XML_TOK_TABLE_EVENT_LISTENERS:

2
sdext/source/pdfimport/pdfparse/pdfparse.cxx
View File

@ -268,7 +268,7 @@ public:
}
#endif
void parseError( const char* pMessage, iteratorT pLocation )
static void parseError( const char* pMessage, iteratorT pLocation )
{
throw_( pLocation, pMessage );
}

2
sw/source/filter/xml/xmlexp.cxx
View File

@ -462,7 +462,7 @@ void SwXMLExport::_ExportContent()
xPage, GetFormExport() );
// #i36597#
if ( GetFormExport()->pageContainsForms( xPage ) || GetFormExport()->documentContainsXForms() )
if ( xmloff::OFormLayerXMLExport::pageContainsForms( xPage ) || GetFormExport()->documentContainsXForms() )
{
::xmloff::OOfficeFormsExport aOfficeForms(*this);

6
ucb/source/cacher/cachedcontentresultsetstub.hxx
View File

@ -63,21 +63,21 @@ private:
sal_Int32 SAL_CALL
impl_getColumnCount();
void SAL_CALL
static void SAL_CALL
impl_getCurrentContentIdentifierString(
com::sun::star::uno::Any& rAny
, com::sun::star::uno::Reference<
com::sun::star::ucb::XContentAccess > xContentAccess )
throw ( com::sun::star::uno::RuntimeException );
void SAL_CALL
static void SAL_CALL
impl_getCurrentContentIdentifier(
com::sun::star::uno::Any& rAny
, com::sun::star::uno::Reference<
com::sun::star::ucb::XContentAccess > xContentAccess )
throw ( com::sun::star::uno::RuntimeException );
void SAL_CALL
static void SAL_CALL
impl_getCurrentContent(
com::sun::star::uno::Any& rAny
, com::sun::star::uno::Reference<

16
ucb/source/sorter/sortresult.hxx
View File

@ -136,28 +136,28 @@ class SortedResultSet: public cppu::WeakImplHelper8 <
SortedEntryList maS2O; // maps the sorted entries to the original ones
SimpleList maO2S; // maps the original Entries to the sorted ones
SimpleList maModList; // keeps track of modified entries
sal_IntPtr mnLastSort; // index of the last sorted entry;
sal_IntPtr mnCurEntry; // index of the current entry
sal_IntPtr mnCount; // total count of the elements
bool mbIsCopy;
sal_IntPtr mnLastSort; // index of the last sorted entry;
sal_IntPtr mnCurEntry; // index of the current entry
sal_IntPtr mnCount; // total count of the elements
bool mbIsCopy;
private:
sal_IntPtr FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd )
sal_IntPtr FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd )
throw( css::sdbc::SQLException, css::uno::RuntimeException );
sal_IntPtr Compare( SortListData *pOne,
sal_IntPtr Compare( SortListData *pOne,
SortListData *pTwo )
throw( css::sdbc::SQLException, css::uno::RuntimeException );
void BuildSortInfo( css::uno::Reference< css::sdbc::XResultSet > aResult,
const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
sal_IntPtr CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
static sal_IntPtr CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
SortInfo* pSortInfo )
throw( css::sdbc::SQLException, css::uno::RuntimeException );
sal_IntPtr CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
sal_IntPtr CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
throw( css::sdbc::SQLException, css::uno::RuntimeException );

2
xmloff/inc/txtflde.hxx
View File

@ -399,7 +399,7 @@ protected:
::com::sun::star::beans::XPropertySetInfo > & rPropertySetInfo );
/// for XDependentTextFields, get PropertySet of FieldMaster
::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
GetMasterPropertySet(const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextField > & rTextField);

2
xmloff/inc/txtfldi.hxx
View File

@ -179,7 +179,7 @@ protected:
/// force an update of the field's value
/// call update on optional XUptadeable interface; (disable Fixed property)
void ForceUpdate(
static void ForceUpdate(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropertySet);
};

6
xmloff/source/chart/SchXMLExport.cxx
View File

@ -165,9 +165,9 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc );
::com::sun::star::awt::Size getPageSize(
static ::com::sun::star::awt::Size getPageSize(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc ) const;
::com::sun::star::chart2::XChartDocument > & xChartDoc );
/** first parseDocument: collect autostyles and store names in this queue
second parseDocument: export content and use names from this queue
@ -3520,7 +3520,7 @@ void SchXMLExportHelper_Impl::addSize( Reference< drawing::XShape > xShape, bool
addSize( xShape->getSize(), bIsOOoNamespace );
}
awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) const
awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc )
{
awt::Size aSize( 8000, 7000 );
uno::Reference< embed::XVisualObject > xVisualObject( xChartDoc, uno::UNO_QUERY );

2
xmloff/source/core/SettingsExportHelper.cxx
View File

@ -195,7 +195,7 @@ void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rNam
m_rContext.EndElement( false );
}
void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const
void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName)
{
(void) nValue; (void) rName;
OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n"

2
xmloff/source/core/nmspmap.cxx
View File

@ -364,7 +364,7 @@ sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
// All methods after this are deprecated...
sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16 nKey ) const
sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16 nKey )
{
return nKey;
}

2
xmloff/source/core/xmluconv.cxx
View File

@ -683,7 +683,7 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
}
void SvXMLUnitConverter::convertNumLetterSync( OUStringBuffer& rBuffer,
sal_Int16 nType ) const
sal_Int16 nType )
{
enum XMLTokenEnum eSync = XML_TOKEN_INVALID;
switch( nType )

8
xmloff/source/draw/animationexport.cxx
View File

@ -513,9 +513,9 @@ public:
void exportAudio( const Reference< XAudio >& xAudio );
void exportCommand( const Reference< XCommand >& xCommand );
Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget ) const;
static Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget );
void convertPath( OUStringBuffer& sTmp, const Any& rPath ) const;
static void convertPath( OUStringBuffer& sTmp, const Any& rPath );
void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const;
void convertTiming( OUStringBuffer& sTmp, const Any& rTiming ) const;
void convertSource( OUStringBuffer& sTmp, const Any& rSource ) const;
@ -1412,7 +1412,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
}
}
Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const ParagraphTarget* pTarget ) const
Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const ParagraphTarget* pTarget )
{
if( pTarget ) try
{
@ -1437,7 +1437,7 @@ Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const Paragr
return xRef;
}
void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath ) const
void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath )
{
OUString aStr;
rPath >>= aStr;

12
xmloff/source/draw/animationimport.cxx
View File

@ -123,10 +123,10 @@ public:
Sequence< Any > convertValueSequence( XMLTokenEnum eAttributeName, const OUString& rValue );
Any convertTarget( const OUString& rValue );
Any convertPath( const OUString& rValue );
static Any convertPath( const OUString& rValue );
Any convertTiming( const OUString& rValue );
Sequence< double > convertKeyTimes( const OUString& rValue );
Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
static Sequence< double > convertKeyTimes( const OUString& rValue );
static Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
const OUString mastrHSL;
};
@ -993,7 +993,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
case ANA_KeyTimes:
{
if( xAnimate.is() )
xAnimate->setKeyTimes( mpHelper->convertKeyTimes( rValue ) );
xAnimate->setKeyTimes( AnimationsImportHelperImpl::convertKeyTimes( rValue ) );
}
break;
@ -1046,7 +1046,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
case ANA_KeySplines:
{
if( xAnimate.is() )
xAnimate->setTimeFilter( mpHelper->convertTimeFilter( rValue ) );
xAnimate->setTimeFilter( AnimationsImportHelperImpl::convertTimeFilter( rValue ) );
}
break;
@ -1054,7 +1054,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
{
Reference< XAnimateMotion > xAnimateMotion( mxNode, UNO_QUERY );
if( xAnimateMotion.is() )
xAnimateMotion->setPath( mpHelper->convertPath( rValue ) );
xAnimateMotion->setPath( AnimationsImportHelperImpl::convertPath( rValue ) );
}
break;

2
xmloff/source/draw/ximppage.cxx
View File

@ -249,7 +249,7 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPre
else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) )
{
if( GetImport().IsFormsSupported() )
pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
}
else if( ((nPrefix == XML_NAMESPACE_OFFICE) || (nPrefix == XML_NAMESPACE_OFFICE_EXT)) && IsXMLToken( rLocalName, XML_ANNOTATION ) )
{

6
xmloff/source/forms/elementexport.cxx
View File

@ -1735,7 +1735,7 @@ namespace xmloff
{
FormCellBindingHelper aHelper( m_xProps, NULL );
{
if ( aHelper.isCellBinding( aHelper.getCurrentBinding( ) ) )
if ( FormCellBindingHelper::isCellBinding( aHelper.getCurrentBinding( ) ) )
{
m_nIncludeBindings |= BA_LINKED_CELL;
if ( m_nClassId == FormComponentType::LISTBOX )
@ -1745,7 +1745,7 @@ namespace xmloff
// is it a list-like control which uses a calc cell range as list source?
{
if ( aHelper.isCellRangeListSource( aHelper.getCurrentListSource( ) ) )
if ( FormCellBindingHelper::isCellRangeListSource( aHelper.getCurrentListSource( ) ) )
m_nIncludeBindings |= BA_LIST_CELL_RANGE;
}
}
@ -1786,7 +1786,7 @@ namespace xmloff
if ( _bIncludeListLinkageType )
{
sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0;
sal_Int16 nLinkageType = FormCellBindingHelper::isCellIntegerBinding( xBinding ) ? 1 : 0;
OUStringBuffer sBuffer;
SvXMLUnitConverter::convertEnum(

2
xmloff/source/forms/elementimport.hxx
View File

@ -238,7 +238,7 @@ namespace xmloff
void setElementType(OControlElement::ElementType _eType) { m_eElementType = _eType; }
protected:
void implTranslateValueProperty(
static void implTranslateValueProperty(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo,
::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue);

8
xmloff/source/forms/formcellbinding.cxx
View File

@ -320,22 +320,22 @@ bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rx
);
}
bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const
bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding )
{
return doesComponentSupport( _rxBinding.get(), SERVICE_CELLVALUEBINDING );
}
bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const
bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding )
{
return doesComponentSupport( _rxBinding.get(), SERVICE_LISTINDEXCELLBINDING );
}
bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const
bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource )
{
return doesComponentSupport( _rxSource.get(), SERVICE_CELLRANGELISTSOURCE );
}
bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const
bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService )
{
Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY );
bool bDoes = xSI.is() && xSI->supportsService( _rService );

16
xmloff/source/forms/formcellbinding.hxx
View File

@ -161,22 +161,22 @@ namespace xmloff
/** checks whether a given binding is a spreadsheet cell binding
*/
bool isCellBinding(
static bool isCellBinding(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding
) const;
);
/** checks whether a given binding is a spreadsheet cell binding, exchanging
integer values
*/
bool isCellIntegerBinding(
static bool isCellIntegerBinding(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding
) const;
);
/** checks whether a given list source is a spreadsheet cell list source
*/
bool isCellRangeListSource(
static bool isCellRangeListSource(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource
) const;
);
protected:
/** creates an address object from a string representation of a cell address
@ -209,10 +209,10 @@ namespace xmloff
/** checkes whether a given component supports a given servive
*/
bool doesComponentSupport(
static bool doesComponentSupport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
const OUString& _rService
) const;
);
/** uses the document (it's factory interface, respectively) to create a component instance
@param _rService

4
xmloff/source/forms/formlayerexport.cxx
View File

@ -92,9 +92,9 @@ namespace xmloff
m_pImpl->exportXForms();
}
bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage )
{
return m_pImpl->pageContainsForms( _rxDrawPage );
return OFormLayerXMLExport_Impl::pageContainsForms( _rxDrawPage );
}
bool OFormLayerXMLExport::documentContainsXForms() const

2
xmloff/source/forms/formlayerimport.cxx
View File

@ -68,7 +68,7 @@ namespace xmloff
sal_uInt16 _nPrefix,
const OUString& _rLocalName)
{
return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName);
return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport, _nPrefix, _rLocalName);
}
SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName,

2
xmloff/source/forms/layerexport.cxx
View File

@ -292,7 +292,7 @@ namespace xmloff
::exportXForms( m_rContext );
}
bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage )
{
Reference< XFormsSupplier2 > xFormsSupp( _rxDrawPage, UNO_QUERY );
DBG_ASSERT( xFormsSupp.is(), "OFormLayerXMLExport_Impl::pageContainsForms: no XFormsSupplier2!" );

4
xmloff/source/forms/layerexport.hxx
View File

@ -217,7 +217,7 @@ namespace xmloff
/** determines whether the given page contains logical forms
*/
bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ) const;
static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage );
/** determines whether the given page contains XForm instances
*/
@ -232,7 +232,7 @@ namespace xmloff
void exportAutoStyles();
protected:
bool impl_isFormPageContainingForms(
static bool impl_isFormPageContainingForms(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage,
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxForms);

2
xmloff/source/forms/layerimport.hxx
View File

@ -144,7 +144,7 @@ namespace xmloff
/** creates an import context for the office:forms element
*/
SvXMLImportContext* createOfficeFormsContext(
static SvXMLImportContext* createOfficeFormsContext(
SvXMLImport& _rImport,
sal_uInt16 _nPrefix,
const OUString& _rLocalName);

4
xmloff/source/forms/officeforms.hxx
View File

@ -69,9 +69,9 @@ namespace xmloff
~OFormsRootExport();
private:
void addModelAttributes(SvXMLExport& _rExp);
static void addModelAttributes(SvXMLExport& _rExp);
void implExportBool(
static void implExportBool(
SvXMLExport& _rExp,
OfficeFormsAttributes _eAttribute,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps,

2
xmloff/source/forms/propertyexport.hxx
View File

@ -341,7 +341,7 @@ namespace xmloff
</ul>
If the type is not convertible, float is returned
*/
::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType);
static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType);
#ifdef DBG_UTIL
void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue);

4
xmloff/source/meta/xmlversion.cxx
View File

@ -60,12 +60,12 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
addChaffWhenEncryptedStorage();
sal_uInt16 nPos = _GetNamespaceMap().GetIndexByKey( XML_NAMESPACE_DC );
sal_uInt16 nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_DC );
AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
_GetNamespaceMap().GetNameByIndex ( nPos ) );
nPos = _GetNamespaceMap().GetIndexByKey( XML_NAMESPACE_FRAMEWORK );
nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_FRAMEWORK );
AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
_GetNamespaceMap().GetNameByIndex ( nPos ) );

4
xmloff/source/style/PageMasterPropHdl.cxx
View File

@ -200,7 +200,7 @@ bool XMLPMPropHdl_NumLetterSync::importXML(
bool XMLPMPropHdl_NumLetterSync::exportXML(
OUString& rStrExpValue,
const Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const
const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
bool bRet = false;
sal_Int16 nNumType = sal_Int16();
@ -208,7 +208,7 @@ bool XMLPMPropHdl_NumLetterSync::exportXML(
if( rValue >>= nNumType )
{
OUStringBuffer aBuffer( 5 );
rUnitConverter.convertNumLetterSync( aBuffer, nNumType );
SvXMLUnitConverter::convertNumLetterSync( aBuffer, nNumType );
rStrExpValue = aBuffer.makeStringAndClear();
bRet = !rStrExpValue.isEmpty();
}

4
xmloff/source/style/backhdl.cxx
View File

@ -211,7 +211,7 @@ bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno
return bRet;
}
void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert ) const
void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert )
{
switch( ePos )
{
@ -245,7 +245,7 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePo
}
}
void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori ) const
void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori )
{
DBG_ASSERT( style::GraphicLocation_LEFT_MIDDLE==eHori || style::GraphicLocation_MIDDLE_MIDDLE==eHori || style::GraphicLocation_RIGHT_MIDDLE==eHori,
"lcl_frmitems_MergeXMLHoriPos: vertical pos must be middle" );

4
xmloff/source/style/backhdl.hxx
View File

@ -37,8 +37,8 @@ public:
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
private:
void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ) const;
void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert ) const;
static void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori );
static void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert );
};
#endif // INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX

2
xmloff/source/style/xmlnume.cxx
View File

@ -329,7 +329,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
GetExport().GetMM100UnitConverter().convertNumFormat( sTmp, eType );
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
sTmp.makeStringAndClear() );
GetExport().GetMM100UnitConverter().convertNumLetterSync( sTmp, eType );
SvXMLUnitConverter::convertNumLetterSync( sTmp, eType );
if( !sTmp.isEmpty() )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_NUM_LETTER_SYNC,

2
xmloff/source/text/XMLIndexMarkExport.hxx
View File

@ -92,7 +92,7 @@ protected:
/// create a numerical ID for this index mark
/// (represented by its properties)
void GetID(
static void GetID(
OUStringBuffer& sBuffer,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);

2
xmloff/source/text/XMLLineNumberingExport.cxx
View File

@ -141,7 +141,7 @@ void XMLLineNumberingExport::Export()
rExport.GetMM100UnitConverter().convertNumFormat( sNumPosBuf, nFormat );
rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
sNumPosBuf.makeStringAndClear());
rExport.GetMM100UnitConverter().convertNumLetterSync( sNumPosBuf, nFormat );
SvXMLUnitConverter::convertNumLetterSync( sNumPosBuf, nFormat );
if( !sNumPosBuf.isEmpty() )
{
rExport.AddAttribute(XML_NAMESPACE_STYLE,

2
xmloff/source/text/XMLSectionExport.hxx
View File

@ -280,7 +280,7 @@ protected:
::com::sun::star::text::XDocumentIndex > & rIndex) const;
/// map service name to section type
enum SectionTypeEnum MapSectionType(const OUString& rSectionName);
static enum SectionTypeEnum MapSectionType(const OUString& rSectionName);
/**
* Export the index element start (for all index types).

2
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
View File

@ -168,7 +168,7 @@ void XMLSectionFootnoteConfigExport::exportXML(
sBuf.makeStringAndClear());
// and letter sync, if applicable
rExport.GetMM100UnitConverter().convertNumLetterSync(
SvXMLUnitConverter::convertNumLetterSync(
sBuf, nNumberingType );
if (!sBuf.isEmpty())
{

2
xmloff/source/text/XMLTextFrameContext.cxx
View File

@ -1674,7 +1674,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
else
{
// the child is a drawing shape
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
pContext = XMLShapeImportHelper::CreateFrameChildContext(
&m_xImplContext, p_nPrefix, rLocalName, xAttrList );
}

2
xmloff/source/text/txtexppr.cxx
View File

@ -284,7 +284,7 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
void XMLTextExportPropertySetMapper::ContextFontHeightFilter(
XMLPropertyState* pCharHeightState,
XMLPropertyState* pCharPropHeightState,
XMLPropertyState* pCharDiffHeightState ) const
XMLPropertyState* pCharDiffHeightState )
{
if( pCharPropHeightState )
{

4
xmloff/source/text/txtexppr.hxx
View File

@ -42,10 +42,10 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
XMLPropertyState *pFontFamilyState,
XMLPropertyState *pFontPitchState,
XMLPropertyState *pFontCharsetState ) const;
void ContextFontHeightFilter(
static void ContextFontHeightFilter(
XMLPropertyState* pCharHeightState,
XMLPropertyState* pCharPropHeightState,
XMLPropertyState* pCharDiffHeightState ) const;
XMLPropertyState* pCharDiffHeightState );
protected:
// SvXMLUnitConverter& mrUnitConverter;

3
xmloff/source/text/txtflde.cxx
View File

@ -2596,8 +2596,7 @@ void XMLTextFieldExport::ProcessNumberingType(sal_Int16 nNumberingType)
GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
sTmp.makeStringAndClear() );
// and letter sync, if applicable
GetExport().GetMM100UnitConverter().convertNumLetterSync( sTmp,
nNumberingType );
SvXMLUnitConverter::convertNumLetterSync( sTmp, nNumberingType );
if (!sTmp.isEmpty())
{

2
xmloff/source/text/txtftne.cxx
View File

@ -295,7 +295,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
GetExport().GetMM100UnitConverter().convertNumFormat( sBuffer, nNumbering);
GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
sBuffer.makeStringAndClear() );
GetExport().GetMM100UnitConverter().convertNumLetterSync( sBuffer, nNumbering);
SvXMLUnitConverter::convertNumLetterSync( sBuffer, nNumbering);
if (!sBuffer.isEmpty() )
{
GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC,

2
xmloff/source/text/txtimp.cxx
View File

@ -2278,7 +2278,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
break;
case XML_TOK_TEXT_FORMS:
pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext(rImport, nPrefix, rLocalName);
bContent = false;
break;

2
xmloff/source/text/txtimppr.cxx
View File

@ -148,7 +148,7 @@ void XMLTextImportPropertyMapper::FontFinished(
XMLPropertyState *pFontStyleNameState,
XMLPropertyState *pFontFamilyState,
XMLPropertyState *pFontPitchState,
XMLPropertyState *pFontCharsetState ) const
XMLPropertyState *pFontCharsetState )
{
if( pFontFamilyNameState && pFontFamilyNameState->mnIndex != -1 )
{

6
xmloff/source/text/txtprhdl.cxx
View File

@ -1222,14 +1222,14 @@ bool XMLNumber8OneBasedHdl::exportXML(
class XMLTextPropertyHandlerFactory_Impl
{
public:
const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType ) const;
static const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType );
XMLTextPropertyHandlerFactory_Impl();
~XMLTextPropertyHandlerFactory_Impl();
};
const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
( sal_Int32 nType ) const
( sal_Int32 nType )
{
const XMLPropertyHandler* pHdl = 0;
switch( nType )
@ -1459,7 +1459,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler(
if( !pHdl )
{
const XMLPropertyHandler *pNewHdl = pImpl->GetPropertyHandler( nType );
const XMLPropertyHandler *pNewHdl = XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler( nType );
if( pNewHdl )
PutHdlCache( nType, pNewHdl );

2
xmloff/source/transform/FormPropOASISTContext.hxx
View File

@ -28,7 +28,7 @@ class XMLFormPropOASISTransformerContext :
bool m_bIsList;
bool m_bIsListValue;
::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue );
static ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue );
public:
TYPEINFO_OVERRIDE();

2
xmloff/source/transform/TransformerBase.hxx
View File

@ -166,7 +166,7 @@ public:
matching token in its lower 16 bits. The value is converted to the
token that is given in the upper 16 bits of the matching parameter.
*/
bool RenameAttributeValue( OUString& rOutAttributeValue,
static bool RenameAttributeValue( OUString& rOutAttributeValue,
sal_Int32 nParam1,
sal_Int32 nParam2,
sal_Int32 nParam3 );