[Libreoffice-commits] core.git: comphelper/source cui/source dbaccess/source forms/source i18npool/source include/toolkit registry/test rsc/source sfx2/source shell/source svtools/source sw/source toolkit/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Oct 26 07:12:42 UTC 2015
comphelper/source/property/propagg.cxx | 2
cui/source/customize/cfg.cxx | 8 -
dbaccess/source/core/dataaccess/datasource.hxx | 4
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
forms/source/component/DatabaseForm.hxx | 2
forms/source/component/Grid.cxx | 2
forms/source/component/Grid.hxx | 2
i18npool/source/localedata/LocaleNode.cxx | 4
include/toolkit/controls/geometrycontrolmodel.hxx | 4
registry/test/regdiagnose.h | 4
rsc/source/parser/rscdb.cxx | 14 -
rsc/source/res/rscclobj.cxx | 2
rsc/source/res/rscrange.cxx | 4
rsc/source/res/rsctop.cxx | 6
rsc/source/rsc/rsc.cxx | 4
rsc/source/tools/rscdef.cxx | 16 +-
rsc/source/tools/rsctools.cxx | 20 +-
sfx2/source/dialog/dockwin.cxx | 2
shell/source/backends/kde4be/kde4access.cxx | 2
shell/source/backends/kdebe/kdeaccess.cxx | 2
shell/source/win32/ooofilereader/contentreader.cxx | 2
svtools/source/misc/embedtransfer.cxx | 2
sw/source/core/unocore/unoframe.cxx | 80 +++++-----
toolkit/source/controls/geometrycontrolmodel.cxx | 2
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 26 +--
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 26 +--
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx | 12 -
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 12 -
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 72 ++++-----
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 38 ++--
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 22 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 18 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 22 +-
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 14 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 42 ++---
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 36 ++--
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 22 +-
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 18 +-
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 22 +-
39 files changed, 297 insertions(+), 297 deletions(-)
New commits:
commit 3d784c4af6e0fdde0b7e555ad940bc13a61c2a22
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 26 09:11:28 2015 +0200
remove extra spaces around ::
just makes it harder to grep for methods
Change-Id: I0925db2f9284972fcf7e1e3adf90cbe21f69eb15
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 931d561..10da011 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -181,7 +181,7 @@ sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const OUString& _rPr
}
-const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: OUString& _rName ) const
+const Property* OPropertyArrayAggregationHelper::findPropertyByName(const OUString& _rName ) const
{
return lcl_findPropertyByName( m_aProperties, _rName );
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0d2f6d4..b263ae9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5295,7 +5295,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
* The SvxIconReplacementDialog class
*
*******************************************************************************/
-SvxIconReplacementDialog :: SvxIconReplacementDialog(
+SvxIconReplacementDialog::SvxIconReplacementDialog(
vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ )
:
MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
@@ -5310,7 +5310,7 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R
AddButton( StandardButtonType::Cancel, 4);
}
-SvxIconReplacementDialog :: SvxIconReplacementDialog(
+SvxIconReplacementDialog::SvxIconReplacementDialog(
vcl::Window *pWindow, const OUString& aMessage )
: MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
{
@@ -5318,7 +5318,7 @@ SvxIconReplacementDialog :: SvxIconReplacementDialog(
SetMessText( ReplaceIconName( aMessage ));
}
-OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
+OUString SvxIconReplacementDialog::ReplaceIconName( const OUString& rMessage )
{
OUString name;
OUString message = CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING );
@@ -5332,7 +5332,7 @@ OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
return name;
}
-sal_uInt16 SvxIconReplacementDialog :: ShowDialog()
+sal_uInt16 SvxIconReplacementDialog::ShowDialog()
{
this->Execute();
return ( this->GetCurButtonId() );
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 2e07c54..3c4caf2 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -170,10 +170,10 @@ public:
virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-// :: css::sdb::XBookmarksSupplier
+//::css::sdb::XBookmarksSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks( ) throw (css::uno::RuntimeException, std::exception) override;
-// :: css::sdb::XQueryDefinitionsSupplier
+//::css::sdb::XQueryDefinitionsSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(css::uno::RuntimeException, std::exception) override;
// css::sdbc::XIsolatedConnection
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 976b303..b33bc0d 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -832,7 +832,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL)
{
Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB()));
- :: OUString sLastSegmentName = pURL->getName();
+ OUString sLastSegmentName = pURL->getName();
bool bFolderExists = true;
sal_Int32 i = 1;
while (bFolderExists)
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 7123ae1..469116b 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -277,7 +277,7 @@ public:
// css::container::XChild
virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( css::uno::RuntimeException, std::exception) override { return OFormComponents::getParent(); }
- virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( :: css::lang::NoSupportException , css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw (::css::lang::NoSupportException , css::uno::RuntimeException, std::exception) override;
// css::container::XNamed
virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 1f128f1..4d878df 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -314,7 +314,7 @@ void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectio
}
// XGridColumnFactory
-Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
const Sequence< OUString >& rColumnTypes = frm::getColumnTypes();
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index f748cbe..168d524 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -135,7 +135,7 @@ public:
virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
// XGridColumnFactory
- virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( css::uno::RuntimeException, std::exception) override;
// XPersistObject
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index e3884dd..e4b7935 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -223,7 +223,7 @@ void print_node( const LocaleNode* p, int depth=0 )
printf("\n");
}
-void LocaleNode :: generateCode (const OFileWriter &of) const
+void LocaleNode::generateCode (const OFileWriter &of) const
{
OUString aDTD = getAttr().getValueByName("versionDTD");
if ( aDTD != LOCALE_VERSION_DTD )
@@ -1908,7 +1908,7 @@ bool isIso4217( const OUString& rStr )
;
}
-void LCCurrencyNode :: generateCode (const OFileWriter &of) const
+void LCCurrencyNode::generateCode (const OFileWriter &of) const
{
OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index b02a086..e858e072 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -83,9 +83,9 @@ namespace com { namespace sun { namespace star {
bool m_bCloneable;
protected:
- static css::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle);
+ static css::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle);
css::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const;
- void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: css::uno::Any& aValue);
+ void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const css::uno::Any& aValue);
protected:
/**
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 82f82cb..9d4562d 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -28,8 +28,8 @@
#define _REG_ENSURE(c, f, l, m) \
do \
{ \
- if (!(c) && :: osl_assertFailedLine(f, l, m)) \
- :: osl_breakDebug(); \
+ if (!(c) && ::osl_assertFailedLine(f, l, m)) \
+ ::osl_breakDebug(); \
} while (0)
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 627e549..883f0b1 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -35,7 +35,7 @@
#include <rscrsc.hxx>
-RscTypCont :: RscTypCont( RscError * pErrHdl,
+RscTypCont::RscTypCont( RscError * pErrHdl,
RSCBYTEORDER_TYPE nOrder,
const OString& rSearchPath,
sal_uInt32 nFlagsP )
@@ -166,7 +166,7 @@ void Pre_dtorTree( RscTop * pRscTop )
}
}
-RscTypCont :: ~RscTypCont()
+RscTypCont::~RscTypCont()
{
// delete all subtrees
aVersion.pClass->Destroy( aVersion );
@@ -254,7 +254,7 @@ RscTop * RscTypCont::SearchType( Atom nId )
return NULL;
}
-sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
+sal_uInt32 RscTypCont::PutSysName( sal_uInt32 nRscTyp, char * pFileName,
sal_uInt32 nConst, sal_uInt32 nId, bool bFirst )
{
RscSysEntry *pSysEntry;
@@ -297,7 +297,7 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
return pSysEntry->nKey;
}
-void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey )
+void RscTypCont::WriteInc( FILE * fOutput, sal_uLong lFileKey )
{
if( NOFILE_INDEX == lFileKey )
@@ -395,7 +395,7 @@ IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void
}
}
-void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut )
+void RscEnumerateObj::WriteRcFile( RscWriteRc & rMem, FILE * fOut )
{
// structure definition from which the resource is built
/*
@@ -504,7 +504,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
return aError;
}
-void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey,
+void RscTypCont::WriteSrc( FILE * fOutput, sal_uLong nFileKey,
bool bName )
{
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
@@ -580,7 +580,7 @@ IMPL_LINK_TYPED( RscDel, Delete, const NameNode&, r, void )
pNode->pObjBiTree = pNode->GetObjNode()->DelObjNode( pNode, lFileKey );
}
-void RscTypCont :: Delete( sal_uLong lFileKey )
+void RscTypCont::Delete( sal_uLong lFileKey )
{
// delete resource instance
RscDel aDel( pRoot, lFileKey );
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index 96866dd..8788ecb 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.cxx
@@ -50,7 +50,7 @@ bool RefNode::PutObjNode( ObjNode * pPutObject )
// if the node with the same name is in pObjBiTree,
// return NULL and no insert,
// if not return the pointer to the Object
-ObjNode * RefNode :: GetObjNode( const RscId & rRscId )
+ObjNode * RefNode::GetObjNode( const RscId & rRscId )
{
if( pObjBiTree )
return pObjBiTree->Search( rRscId );
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index f83792a..4164bfd 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -308,7 +308,7 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnCla
return aInst;
}
-void RscIdRange :: Destroy( const RSCINST & rInst )
+void RscIdRange::Destroy( const RSCINST & rInst )
{
reinterpret_cast<RscId *>(rInst.pData)->Destroy();
}
@@ -419,7 +419,7 @@ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "FALSE" );
}
-RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId )
+RscBreakRange::RscBreakRange( Atom nId, sal_uInt32 nTypeId )
: RscRange( nId, nTypeId )
{
nOutRange = 0xFFFFFFFF;
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 6038ab9..1688e39 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -48,7 +48,7 @@ RSCINST RscTop::GetDefault()
return aDfltInst;
}
-void RscTop :: Pre_dtor()
+void RscTop::Pre_dtor()
{
if( aDfltInst.IsInst() )
{
@@ -66,7 +66,7 @@ RscTop * RscTop::GetTypeClass() const
return NULL;
}
-sal_uInt32 RscTop :: Size()
+sal_uInt32 RscTop::Size()
{
if( pSuperClass )
return pSuperClass->Size();
@@ -74,7 +74,7 @@ sal_uInt32 RscTop :: Size()
return 0;
}
-ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId )
+ERRTYPE RscTop::GetRef( const RSCINST & rInst, RscId * pRscId )
{
if( pSuperClass )
return pSuperClass->GetRef( rInst, pRscId );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 01cd95e..c4409c4 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -412,7 +412,7 @@ void RscCompiler::EndCompile()
}
}
-ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
+ERRTYPE RscCompiler::IncludeParser( sal_uLong lFileKey )
{
FILE * finput;
RscFile * pFName;
@@ -455,7 +455,7 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
return aError;
}
-ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
+ERRTYPE RscCompiler::ParseOneFile( sal_uLong lFileKey,
const RscCmdLine::OutputFile* pOutputFile,
const WriteRcContext* pContext )
{
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index b0284ce..fc6a41a 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -370,7 +370,7 @@ OString RscExpression::GetMacro()
return aLeft.makeStringAndClear();
}
-RscFile :: RscFile()
+RscFile::RscFile()
{
bLoaded = false;
bIncFile = false;
@@ -378,7 +378,7 @@ RscFile :: RscFile()
bScanned = false;
}
-RscFile :: ~RscFile()
+RscFile::~RscFile()
{
for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
delete aDepLst[ i ];
@@ -408,7 +408,7 @@ bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree )
return true;
}
-bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos )
+bool RscFile::InsertDependFile( sal_uLong lIncFile, size_t lPos )
{
for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
{
@@ -489,7 +489,7 @@ RscFileTab::RscFileTab()
{
}
-RscFileTab :: ~RscFileTab()
+RscFileTab::~RscFileTab()
{
aDefTree.Remove();
@@ -502,7 +502,7 @@ RscFileTab :: ~RscFileTab()
};
}
-sal_uLong RscFileTab :: Find( const OString& rName )
+sal_uLong RscFileTab::Find( const OString& rName )
{
sal_uIntPtr aIndex = FirstIndex();
while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND && (Get(aIndex)->aFileName != rName) )
@@ -635,7 +635,7 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const OString& rDefName,
return pDef;
}
-void RscFileTab :: DeleteFileContext( sal_uLong lFileKey )
+void RscFileTab::DeleteFileContext( sal_uLong lFileKey )
{
RscFile * pFName;
@@ -652,7 +652,7 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey )
}
}
-sal_uLong RscFileTab :: NewCodeFile( const OString& rName )
+sal_uLong RscFileTab::NewCodeFile( const OString& rName )
{
sal_uLong lKey = Find( rName );
if( UNIQUEINDEX_ENTRY_NOTFOUND == lKey )
@@ -666,7 +666,7 @@ sal_uLong RscFileTab :: NewCodeFile( const OString& rName )
return lKey;
}
-sal_uLong RscFileTab :: NewIncFile(const OString& rName,
+sal_uLong RscFileTab::NewIncFile(const OString& rName,
const OString& rPath)
{
sal_uLong lKey = Find( rName );
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 51ce98c..175ec0f 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -153,18 +153,18 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc )
}
-RscPtrPtr :: RscPtrPtr()
+RscPtrPtr::RscPtrPtr()
{
nCount = 0;
pMem = NULL;
}
-RscPtrPtr :: ~RscPtrPtr()
+RscPtrPtr::~RscPtrPtr()
{
Reset();
}
-void RscPtrPtr :: Reset()
+void RscPtrPtr::Reset()
{
sal_uInt32 i;
@@ -181,7 +181,7 @@ void RscPtrPtr :: Reset()
pMem = NULL;
}
-sal_uInt32 RscPtrPtr :: Append( void * pBuffer )
+sal_uInt32 RscPtrPtr::Append( void * pBuffer )
{
if( !pMem )
pMem = static_cast<void **>(rtl_allocateMemory( (nCount +1) * sizeof( void * ) ));
@@ -193,7 +193,7 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer )
return nCount++;
}
-void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry )
+void * RscPtrPtr::GetEntry( sal_uInt32 nEntry )
{
if( nEntry < nCount )
return pMem[ nEntry ];
@@ -218,13 +218,13 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
pMem = NULL;
}
-RscWriteRc :: ~RscWriteRc()
+RscWriteRc::~RscWriteRc()
{
if( pMem )
rtl_freeMemory( pMem );
}
-sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
+sal_uInt32 RscWriteRc::IncSize( sal_uInt32 nSize )
{
sal_uInt32 nOrigPos = nLen;
nLen += nSize;
@@ -235,7 +235,7 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
return nOrigPos;
}
-char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
+char * RscWriteRc::GetPointer( sal_uInt32 nSize )
{
if( !pMem )
{
@@ -246,7 +246,7 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
}
-void RscWriteRc :: Put( sal_uInt16 nVal )
+void RscWriteRc::Put( sal_uInt16 nVal )
{
sal_uInt32 nOldLen;
@@ -254,7 +254,7 @@ void RscWriteRc :: Put( sal_uInt16 nVal )
PutAt( nOldLen, nVal );
}
-void RscWriteRc :: PutUTF8( char * pStr )
+void RscWriteRc::PutUTF8( char * pStr )
{
sal_uInt32 nStrLen = 0;
if( pStr )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index ba62989..86693b5 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1247,7 +1247,7 @@ void SfxDockingWindow::ReleaseChildWindow_Impl()
and thus the behavior of his DockinWindow class when docking where the
called virtual method:
- SfxDockingWindow :: CalcDockingSize (SfxChildAlignment eAlign)
+ SfxDockingWindow::CalcDockingSize (SfxChildAlignment eAlign)
is overridden (see below).
*/
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index f2a849d..bebb528 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -73,7 +73,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
{
QFont aFixedFont;
QString aFontName;
- :: OUString sFontName;
+ OUString sFontName;
aFixedFont = KGlobalSettings::fixedFont();
aFontName = aFixedFont.family();
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
index 2088ebc..a0a5156 100644
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -69,7 +69,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
{
QFont aFixedFont;
QString aFontName;
- :: OUString sFontName;
+ OUString sFontName;
aFixedFont = KGlobalSettings::fixedFont();
aFontName = aFixedFont.family();
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 24c420a..f2dedcd 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -143,7 +143,7 @@ LocaleSet_t const & CContentReader::getLocale( const StyleName_t& Style )
if ( m_StyleMap.empty() )
return m_DefaultLocale;
- StyleLocaleMap_t :: const_iterator style_Iter;
+ StyleLocaleMap_t::const_iterator style_Iter;
if ( ( style_Iter = m_StyleMap.find( Style ) ) == m_StyleMap.end( ) )
return m_DefaultLocale;
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 31227b4..6a52a98 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -174,7 +174,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
{
bRet = SetBitmapEx( m_pGraphic->GetBitmapEx(), rFlavor );
}
- else if ( m_xObj.is() && :: svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
+ else if ( m_xObj.is() && ::svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
{
uno::Reference< datatransfer::XTransferable > xTransferable( m_xObj->getComponent(), uno::UNO_QUERY );
if ( xTransferable.is() )
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a6c728f..3500551 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -635,7 +635,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_PROTECT, MID_PROTECT_SIZE, pName );
if(pCont||pPos||pName)
{
- SvxProtectItem aProt ( static_cast < const :: SvxProtectItem & > ( rFromSet.Get ( RES_PROTECT ) ) );
+ SvxProtectItem aProt ( static_cast < const ::SvxProtectItem & > ( rFromSet.Get ( RES_PROTECT ) ) );
if(pCont)
bRet &= ((SfxPoolItem&)aProt).PutValue(*pCont, MID_PROTECT_CONTENT);
if(pPos )
@@ -656,7 +656,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_PAGETOGGLE, pPageT);
if(pHori||pHoriP||pHoriR||pPageT)
{
- SwFormatHoriOrient aOrient ( static_cast < const :: SwFormatHoriOrient & > ( rFromSet.Get ( RES_HORI_ORIENT ) ) );
+ SwFormatHoriOrient aOrient ( static_cast < const ::SwFormatHoriOrient & > ( rFromSet.Get ( RES_HORI_ORIENT ) ) );
if(pHori )
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pHori, MID_HORIORIENT_ORIENT);
if(pHoriP)
@@ -678,7 +678,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_VERT_ORIENT, MID_VERTORIENT_RELATION, pVertR );
if(pVert||pVertP||pVertR)
{
- SwFormatVertOrient aOrient ( static_cast < const :: SwFormatVertOrient & > ( rFromSet.Get ( RES_VERT_ORIENT ) ) );
+ SwFormatVertOrient aOrient ( static_cast < const ::SwFormatVertOrient & > ( rFromSet.Get ( RES_VERT_ORIENT ) ) );
if(pVert )
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pVert, MID_VERTORIENT_ORIENT);
if(pVertP)
@@ -699,7 +699,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_URL, MID_URL_SERVERMAP, pHySMp );
if(pURL||pTarget||pHyLNm||pHySMp)
{
- SwFormatURL aURL ( static_cast < const :: SwFormatURL & > ( rFromSet.Get ( RES_URL ) ) );
+ SwFormatURL aURL ( static_cast < const ::SwFormatURL & > ( rFromSet.Get ( RES_URL ) ) );
if(pURL)
bRet &= ((SfxPoolItem&)aURL).PutValue(*pURL, MID_URL_URL);
if(pTarget)
@@ -717,7 +717,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_LR_SPACE, MID_R_MARGIN|CONVERT_TWIPS, pR );
if(pL||pR)
{
- SvxLRSpaceItem aLR ( static_cast < const :: SvxLRSpaceItem & > ( rFromSet.Get ( RES_LR_SPACE ) ) );
+ SvxLRSpaceItem aLR ( static_cast < const ::SvxLRSpaceItem & > ( rFromSet.Get ( RES_LR_SPACE ) ) );
if(pL)
bRet &= ((SfxPoolItem&)aLR).PutValue(*pL, MID_L_MARGIN|CONVERT_TWIPS);
if(pR)
@@ -730,7 +730,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_UL_SPACE, MID_LO_MARGIN|CONVERT_TWIPS, pB );
if(pT||pB)
{
- SvxULSpaceItem aTB ( static_cast < const :: SvxULSpaceItem &> ( rFromSet.Get ( RES_UL_SPACE ) ) );
+ SvxULSpaceItem aTB ( static_cast < const ::SvxULSpaceItem &> ( rFromSet.Get ( RES_UL_SPACE ) ) );
if(pT)
bRet &= ((SfxPoolItem&)aTB).PutValue(*pT, MID_UP_MARGIN|CONVERT_TWIPS);
if(pB)
@@ -740,21 +740,21 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
const ::uno::Any* pOp;
if(GetProperty(RES_OPAQUE, 0, pOp))
{
- SvxOpaqueItem aOp ( static_cast < const :: SvxOpaqueItem& > ( rFromSet.Get ( RES_OPAQUE ) ) );
+ SvxOpaqueItem aOp ( static_cast < const ::SvxOpaqueItem& > ( rFromSet.Get ( RES_OPAQUE ) ) );
bRet &= ((SfxPoolItem&)aOp).PutValue(*pOp, 0);
rToSet.Put(aOp);
}
const ::uno::Any* pPrt;
if(GetProperty(RES_PRINT, 0, pPrt))
{
- SvxPrintItem aPrt ( static_cast < const :: SvxPrintItem & > ( rFromSet.Get ( RES_PRINT ) ) );
+ SvxPrintItem aPrt ( static_cast < const ::SvxPrintItem & > ( rFromSet.Get ( RES_PRINT ) ) );
bRet &= ((SfxPoolItem&)aPrt).PutValue(*pPrt, 0);
rToSet.Put(aPrt);
}
const ::uno::Any* pSh;
if(GetProperty(RES_SHADOW, CONVERT_TWIPS, pSh))
{
- SvxShadowItem aSh ( static_cast < const :: SvxShadowItem& > ( rFromSet.Get ( RES_SHADOW ) ) );
+ SvxShadowItem aSh ( static_cast < const ::SvxShadowItem& > ( rFromSet.Get ( RES_SHADOW ) ) );
bRet &= ((SfxPoolItem&)aSh).PutValue(*pSh, CONVERT_TWIPS);
rToSet.Put(aSh);
}
@@ -771,7 +771,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_SURROUND, MID_SURROUND_ANCHORONLY, pSurAnch);
if(pSur || pSurAnch)
{
- SwFormatSurround aSrnd ( static_cast < const :: SwFormatSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
+ SwFormatSurround aSrnd ( static_cast < const ::SwFormatSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
if(pSur)
bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSur, MID_SURROUND_SURROUNDTYPE );
if(pSurAnch)
@@ -804,7 +804,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
pLeftDistance || pRightDistance || pTopDistance || pBottomDistance ||
pLineStyle || pLineWidth )
{
- SvxBoxItem aBox ( static_cast < const :: SvxBoxItem & > ( rFromSet.Get ( RES_BOX ) ) );
+ SvxBoxItem aBox ( static_cast < const ::SvxBoxItem & > ( rFromSet.Get ( RES_BOX ) ) );
if( pLeft )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLeft, CONVERT_TWIPS|LEFT_BORDER );
if( pRight )
@@ -856,7 +856,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
pWidthType ||pSyncWidth || pSyncHeight )
{
rSizeFound = true;
- SwFormatFrmSize aFrmSz ( static_cast < const :: SwFormatFrmSize& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
+ SwFormatFrmSize aFrmSz ( static_cast < const ::SwFormatFrmSize& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
if(pWidth)
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH|CONVERT_TWIPS);
if(pHeight)
@@ -940,7 +940,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
GetProperty(RES_TEXT_VERT_ADJUST, 0, pTextVertAdjust);
if ( pTextVertAdjust )
{
- SdrTextVertAdjustItem aTextVertAdjust(static_cast <const :: SdrTextVertAdjustItem & > ( rFromSet.Get ( RES_TEXT_VERT_ADJUST ) ));
+ SdrTextVertAdjustItem aTextVertAdjust(static_cast <const ::SdrTextVertAdjustItem & > ( rFromSet.Get ( RES_TEXT_VERT_ADJUST ) ));
bRet &= ((SfxPoolItem&)aTextVertAdjust).PutValue(*pTextVertAdjust, 0);
rToSet.Put(aTextVertAdjust);
}
@@ -963,11 +963,11 @@ SwFrameProperties_Impl::SwFrameProperties_Impl():
{
}
-static inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const :: uno::Any *pAny)
+static inline void lcl_FillCol ( SfxItemSet &rToSet, const ::SfxItemSet &rFromSet, const ::uno::Any *pAny)
{
if ( pAny )
{
- SwFormatCol aCol ( static_cast < const :: SwFormatCol & > ( rFromSet.Get ( RES_COL ) ) );
+ SwFormatCol aCol ( static_cast < const ::SwFormatCol & > ( rFromSet.Get ( RES_COL ) ) );
((SfxPoolItem&)aCol).PutValue( *pAny, MID_COLUMNS);
rToSet.Put(aCol);
}
@@ -994,13 +994,13 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItem
if ( pStyle )
{
rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *pStyle ) );
- const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
+ const ::SfxItemSet *pItemSet = &xStyle->GetItemSet();
bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
lcl_FillCol ( rSet, *pItemSet, pColumns );
}
else
{
- const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME )->GetAttrSet();
+ const ::SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME )->GetAttrSet();
bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
lcl_FillCol ( rSet, *pItemSet, pColumns );
}
@@ -1028,11 +1028,11 @@ SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) :
{
}
-static inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, bool &rRet )
+static inline void lcl_FillMirror ( SfxItemSet &rToSet, const ::SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, bool &rRet )
{
if(pHEvenMirror || pHOddMirror || pVMirror )
{
- SwMirrorGrf aMirror ( static_cast < const :: SwMirrorGrf& > ( rFromSet.Get ( RES_GRFATR_MIRRORGRF ) ) );
+ SwMirrorGrf aMirror ( static_cast < const ::SwMirrorGrf& > ( rFromSet.Get ( RES_GRFATR_MIRRORGRF ) ) );
if(pHEvenMirror)
rRet &= ((SfxPoolItem&)aMirror).PutValue(*pHEvenMirror, MID_MIRROR_HORZ_EVEN_PAGES);
if(pHOddMirror)
@@ -1073,18 +1073,18 @@ bool SwGraphicProperties_Impl::AnyToItemSet(
if ( pStyle )
{
rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet(*pStyle) );
- const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
+ const ::SfxItemSet *pItemSet = &xStyle->GetItemSet();
bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
}
else
{
- const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC )->GetAttrSet();
+ const ::SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC )->GetAttrSet();
bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
}
- static const :: sal_uInt16 nIDs[] =
+ static const ::sal_uInt16 nIDs[] =
{
RES_GRFATR_CROPGRF,
RES_GRFATR_ROTATION,
@@ -1154,12 +1154,12 @@ namespace
class theSwXFrameUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFrameUnoTunnelId > {};
}
-const :: uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId()
+const ::uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId()
{
return theSwXFrameUnoTunnelId::get().getSeq();
}
-sal_Int64 SAL_CALL SwXFrame::getSomething( const :: uno::Sequence< sal_Int8 >& rId )
+sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rId )
throw(uno::RuntimeException, std::exception)
{
if( rId.getLength() == 16
@@ -1178,7 +1178,7 @@ OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::ex
return OUString("SwXFrame");
}
-sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
@@ -1192,7 +1192,7 @@ uno::Sequence< OUString > SwXFrame::getSupportedServiceNames() throw( uno::Runti
return aRet;
}
-SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pDoc)
+SwXFrame::SwXFrame(FlyCntType eSet, const ::SfxItemPropertySet* pSet, SwDoc *pDoc)
: m_pImpl(new Impl)
, m_pPropSet(pSet)
, m_pDoc(pDoc)
@@ -1244,7 +1244,7 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD
}
}
-SwXFrame::SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet, const :: SfxItemPropertySet* pSet)
+SwXFrame::SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet, const ::SfxItemPropertySet* pSet)
: SwClient( &rFrameFormat )
, m_pImpl(new Impl)
,
@@ -1368,7 +1368,7 @@ SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrameFormat &rFormat)
= new SwFlyDrawContact( &rFormat, pDrawModel );
pObject = pContactObject->GetMaster();
- const :: SwFormatSurround& rSurround = rFormat.GetSurround();
+ const ::SwFormatSurround& rSurround = rFormat.GetSurround();
pObject->SetLayer(
( SURROUND_THROUGHT == rSurround.GetSurround() &&
!rFormat.GetOpaque().GetValue() ) ? pDoc->getIDocumentDrawModelAccess().GetHellId()
@@ -1379,7 +1379,7 @@ SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrameFormat &rFormat)
return pObject;
}
-static SwFrameFormat *lcl_GetFrameFormat( const :: uno::Any& rValue, SwDoc *pDoc )
+static SwFrameFormat *lcl_GetFrameFormat( const ::uno::Any& rValue, SwDoc *pDoc )
{
SwFrameFormat *pRet = 0;
SwDocShell* pDocSh = pDoc->GetDocShell();
@@ -1400,12 +1400,12 @@ static SwFrameFormat *lcl_GetFrameFormat( const :: uno::Any& rValue, SwDoc *pDoc
return pRet;
}
-void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::Any& _rValue)
+void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& _rValue)
throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
SwFrameFormat* pFormat = GetFrameFormat();
- const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
+ const ::SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1456,7 +1456,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
(FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) ||
(FN_UNO_IS_PIXEL_CONTOUR == pEntry->nWID) )
{
- const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
+ const ::SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
@@ -1471,9 +1471,9 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
tools::PolyPolygon aPoly((sal_uInt16)aParam.getLength());
for(sal_Int32 i = 0; i < aParam.getLength(); i++)
{
- const :: drawing::PointSequence* pPointSeq = aParam.getConstArray();
+ const ::drawing::PointSequence* pPointSeq = aParam.getConstArray();
sal_Int32 nPoints = pPointSeq[i].getLength();
- const :: awt::Point* pPoints = pPointSeq[i].getConstArray();
+ const ::awt::Point* pPoints = pPointSeq[i].getConstArray();
tools::Polygon aSet( (sal_uInt16)nPoints );
for(sal_Int32 j = 0; j < nPoints; j++)
{
@@ -1555,7 +1555,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
}
if ( pFly )
{
- const :: SfxPoolItem* pItem;
+ const ::SfxPoolItem* pItem;
if( SfxItemState::SET == pFrameFormat->GetItemState( RES_ANCHOR, false, &pItem ))
{
pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrameFormatSetRange );
@@ -1609,7 +1609,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
sFltName = sTmp;
}
- const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
+ const ::SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
@@ -1631,7 +1631,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
aValue >>= xGraphic;
if(xGraphic.is())
{
- const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
+ const ::SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
@@ -1683,7 +1683,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
if ( bApply )
{
- const :: SwFormatContent* pCnt = &pFormat->GetContent();
+ const ::SwFormatContent* pCnt = &pFormat->GetContent();
if ( pCnt->GetContentIdx() && pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ] )
{
SwOLENode* pOleNode = pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ]->GetOLENode();
@@ -1904,7 +1904,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aSet.Get(pEntry->nWID));
if(aAnchor.GetAnchorId() == FLY_AT_FLY)
{
- const :: SwPosition* pPosition = aAnchor.GetContentAnchor();
+ const ::SwPosition* pPosition = aAnchor.GetContentAnchor();
SwFrameFormat* pFlyFormat = pPosition ? pPosition->nNode.GetNode().GetFlyFormat() : 0;
if(!pFlyFormat || pFlyFormat->Which() == RES_DRAWFRMFMT)
{
@@ -1941,7 +1941,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
pFly = static_cast<SwFlyFrameFormat*>(pFormat)->GetFrm();
if (pFly)
{
- const :: SfxPoolItem* pItem;
+ const ::SfxPoolItem* pItem;
if( SfxItemState::SET == aSet.GetItemState( RES_ANCHOR, false, &pItem ))
{
aSet.Put( *pItem );
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 354b562..6bdf50c 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -226,7 +226,7 @@
}
- void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue)
+ void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue)
{
switch ( nHandle )
{
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 9dace2f..ecbbddc 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -28,38 +28,38 @@ using ::com::sun::star::lang::XSingleServiceFactory ;
using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
-XMLEncryptionTemplateImpl :: XMLEncryptionTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLEncryptionTemplateImpl::XMLEncryptionTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
: m_xTemplate( NULL ),
m_xTarget( NULL ),
m_xServiceManager( aFactory ),
m_nStatus ( ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN ) {
}
-XMLEncryptionTemplateImpl :: ~XMLEncryptionTemplateImpl() {
+XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() {
}
/* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
+void SAL_CALL XMLEncryptionTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
{
m_xTemplate = aTemplate ;
}
/* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTemplate()
+Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTemplate()
throw (com::sun::star::uno::RuntimeException, std::exception)
{
return m_xTemplate ;
}
/* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl :: setTarget( const Reference< XXMLElementWrapper >& aTarget )
+void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget )
throw( com::sun::star::lang::IllegalArgumentException, std::exception ) {
m_xTarget = aTarget ;
}
/* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTarget()
+Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTarget()
throw (com::sun::star::uno::RuntimeException, std::exception)
{
return m_xTarget ;
@@ -79,12 +79,12 @@ void SAL_CALL XMLEncryptionTemplateImpl::setStatus(
}
/* XServiceInfo */
-OUString SAL_CALL XMLEncryptionTemplateImpl :: getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryptionTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -95,28 +95,28 @@ sal_Bool SAL_CALL XMLEncryptionTemplateImpl :: supportsService( const OUString&
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > XMLEncryptionTemplateImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryptionTemplate";
return seqServiceNames;
}
-OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLEncryptionTemplateImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
return Reference< XInterface >( *new XMLEncryptionTemplateImpl( aServiceManager ) ) ;
}
-Reference< XSingleServiceFactory > XMLEncryptionTemplateImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > XMLEncryptionTemplateImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
}
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 9ec4259..00e1fe1 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -29,37 +29,37 @@ using ::com::sun::star::lang::XSingleServiceFactory ;
using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ;
-XMLSignatureTemplateImpl :: XMLSignatureTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSignatureTemplateImpl::XMLSignatureTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
:m_xTemplate( NULL ),
m_xServiceManager( aFactory ),
m_nStatus ( ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN )
{
}
-XMLSignatureTemplateImpl :: ~XMLSignatureTemplateImpl() {
+XMLSignatureTemplateImpl::~XMLSignatureTemplateImpl() {
}
/* XXMLSignatureTemplate */
-void SAL_CALL XMLSignatureTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
+void SAL_CALL XMLSignatureTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
{
m_xTemplate = aTemplate ;
}
/* XXMLSignatureTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl :: getTemplate()
+Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl::getTemplate()
throw (com::sun::star::uno::RuntimeException, std::exception)
{
return m_xTemplate ;
}
-void SAL_CALL XMLSignatureTemplateImpl :: setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement )
+void SAL_CALL XMLSignatureTemplateImpl::setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement )
throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
{
targets.push_back( aXmlElement );
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl :: getTargets()
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl::getTargets()
throw (com::sun::star::uno::RuntimeException, std::exception)
{
sal_Int32 length = targets.size();
@@ -105,12 +105,12 @@ void SAL_CALL XMLSignatureTemplateImpl::setStatus(
}
/* XServiceInfo */
-OUString SAL_CALL XMLSignatureTemplateImpl :: getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLSignatureTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL XMLSignatureTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -121,28 +121,28 @@ sal_Bool SAL_CALL XMLSignatureTemplateImpl :: supportsService( const OUString& s
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > XMLSignatureTemplateImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignatureTemplate";
return seqServiceNames ;
}
-OUString XMLSignatureTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSignatureTemplateImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
return Reference< XInterface >( *new XMLSignatureTemplateImpl( aServiceManager ) ) ;
}
-Reference< XSingleServiceFactory > XMLSignatureTemplateImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > XMLSignatureTemplateImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
}
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
index aa16c5e..b3aa819 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
@@ -26,31 +26,31 @@ using namespace ::com::sun::star::uno ;
using ::com::sun::star::security::XCertificateExtension ;
-CertificateExtension_XmlSecImpl :: CertificateExtension_XmlSecImpl() :
+CertificateExtension_XmlSecImpl::CertificateExtension_XmlSecImpl() :
m_critical( false ) ,
m_xExtnId() ,
m_xExtnValue()
{
}
-CertificateExtension_XmlSecImpl :: ~CertificateExtension_XmlSecImpl() {
+CertificateExtension_XmlSecImpl::~CertificateExtension_XmlSecImpl() {
}
//Methods from XCertificateExtension
-sal_Bool SAL_CALL CertificateExtension_XmlSecImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+sal_Bool SAL_CALL CertificateExtension_XmlSecImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_xExtnValue ;
}
-void CertificateExtension_XmlSecImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) {
+void CertificateExtension_XmlSecImpl::setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) {
unsigned int i ;
if( value != NULL && vlen != 0 ) {
Sequence< sal_Int8 > extnv( vlen ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 29e928c..f9988da 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -35,30 +35,30 @@ using namespace ::com::sun::star::security ;
using ::com::sun::star::security::XCertificateExtension ;
-SanExtensionImpl :: SanExtensionImpl() :
+SanExtensionImpl::SanExtensionImpl() :
m_critical( sal_False )
{
}
-SanExtensionImpl :: ~SanExtensionImpl() {
+SanExtensionImpl::~SanExtensionImpl() {
}
//Methods from XCertificateExtension
-sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException ) {
+sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) {
return m_xExtnValue ;
}
//Methods from XSanExtension
-::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl :: getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ){
+::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ){
if (!m_Entries.hasElements())
{
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index a4730c9..ab794e8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -101,11 +101,11 @@ void traceTrustStatus(DWORD err)
}
}
-SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ), m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL), m_hCaSystemStore(NULL){
+SecurityEnvironment_MSCryptImpl::SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ), m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL), m_hCaSystemStore(NULL){
}
-SecurityEnvironment_MSCryptImpl :: ~SecurityEnvironment_MSCryptImpl() {
+SecurityEnvironment_MSCryptImpl::~SecurityEnvironment_MSCryptImpl() {
if( m_hProv != NULL ) {
CryptReleaseContext( m_hProv, 0 ) ;
@@ -172,12 +172,12 @@ SecurityEnvironment_MSCryptImpl :: ~SecurityEnvironment_MSCryptImpl() {
}
/* XServiceInfo */
-OUString SAL_CALL SecurityEnvironment_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL SecurityEnvironment_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -188,33 +188,33 @@ sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl :: supportsService( const OUSt
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > SecurityEnvironment_MSCryptImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.SecurityEnvironment";
return seqServiceNames ;
}
-OUString SecurityEnvironment_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString SecurityEnvironment_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
return Reference< XInterface >( *new SecurityEnvironment_MSCryptImpl( aServiceManager ) ) ;
}
-Reference< XSingleServiceFactory > SecurityEnvironment_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > SecurityEnvironment_MSCryptImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
}
/* XUnoTunnel */
-sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier )
throw( RuntimeException )
{
if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
@@ -231,12 +231,12 @@ namespace
class theSecurityEnvironment_MSCryptImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSecurityEnvironment_MSCryptImplUnoTunnelId > {};
}
-const Sequence< sal_Int8>& SecurityEnvironment_MSCryptImpl :: getUnoTunnelId() {
+const Sequence< sal_Int8>& SecurityEnvironment_MSCryptImpl::getUnoTunnelId() {
return theSecurityEnvironment_MSCryptImplUnoTunnelId::get().getSeq();
}
/* XUnoTunnel extension */
-SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl :: getImplementation( const Reference< XInterface >& rObj ) {
+SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl::getImplementation( const Reference< XInterface >& rObj ) {
Reference< XUnoTunnel > xUT( rObj , UNO_QUERY ) ;
if( xUT.is() ) {
return ( SecurityEnvironment_MSCryptImpl* )xUT->getSomething( getUnoTunnelId() ) ;
@@ -245,11 +245,11 @@ SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl :: getImplement
}
/* Native methods */
-HCRYPTPROV SecurityEnvironment_MSCryptImpl :: getCryptoProvider() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
return m_hProv ;
}
-void SecurityEnvironment_MSCryptImpl :: setCryptoProvider( HCRYPTPROV aProv ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
if( m_hProv != NULL ) {
CryptReleaseContext( m_hProv, 0 ) ;
m_hProv = NULL ;
@@ -260,21 +260,21 @@ void SecurityEnvironment_MSCryptImpl :: setCryptoProvider( HCRYPTPROV aProv ) th
}
}
-LPCTSTR SecurityEnvironment_MSCryptImpl :: getKeyContainer() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
return m_pszContainer ;
}
-void SecurityEnvironment_MSCryptImpl :: setKeyContainer( LPCTSTR aKeyContainer ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
//TODO: Don't know whether or not it should be copied.
m_pszContainer = aKeyContainer ;
}
-HCERTSTORE SecurityEnvironment_MSCryptImpl :: getCryptoSlot() throw( Exception , RuntimeException ) {
+HCERTSTORE SecurityEnvironment_MSCryptImpl::getCryptoSlot() throw( Exception , RuntimeException ) {
return m_hKeyStore ;
}
-void SecurityEnvironment_MSCryptImpl :: setCryptoSlot( HCERTSTORE aSlot) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) throw( Exception , RuntimeException ) {
if( m_hKeyStore != NULL ) {
CertCloseStore( m_hKeyStore, CERT_CLOSE_STORE_FORCE_FLAG ) ;
m_hKeyStore = NULL ;
@@ -285,11 +285,11 @@ void SecurityEnvironment_MSCryptImpl :: setCryptoSlot( HCERTSTORE aSlot) throw(
}
}
-HCERTSTORE SecurityEnvironment_MSCryptImpl :: getCertDb() throw( Exception , RuntimeException ) {
+HCERTSTORE SecurityEnvironment_MSCryptImpl::getCertDb() throw( Exception , RuntimeException ) {
return m_hCertStore ;
}
-void SecurityEnvironment_MSCryptImpl :: setCertDb( HCERTSTORE aCertDb ) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCertDb( HCERTSTORE aCertDb ) throw( Exception , RuntimeException ) {
if( m_hCertStore != NULL ) {
CertCloseStore( m_hCertStore, CERT_CLOSE_STORE_FORCE_FLAG ) ;
m_hCertStore = NULL ;
@@ -300,7 +300,7 @@ void SecurityEnvironment_MSCryptImpl :: setCertDb( HCERTSTORE aCertDb ) throw( E
}
}
-void SecurityEnvironment_MSCryptImpl :: adoptSymKey( HCRYPTKEY aSymKey ) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::adoptSymKey( HCRYPTKEY aSymKey ) throw( Exception , RuntimeException ) {
HCRYPTKEY symkey ;
std::list< HCRYPTKEY >::iterator keyIt ;
@@ -322,7 +322,7 @@ void SecurityEnvironment_MSCryptImpl :: adoptSymKey( HCRYPTKEY aSymKey ) throw(
}
}
-HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getSymKey( unsigned int position ) throw( Exception , RuntimeException ) {
+HCRYPTKEY SecurityEnvironment_MSCryptImpl::getSymKey( unsigned int position ) throw( Exception , RuntimeException ) {
HCRYPTKEY symkey ;
std::list< HCRYPTKEY >::iterator keyIt ;
unsigned int pos ;
@@ -336,7 +336,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getSymKey( unsigned int position )
return symkey ;
}
-HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPubKey( unsigned int position ) throw( Exception , RuntimeException ) {
+HCRYPTKEY SecurityEnvironment_MSCryptImpl::getPubKey( unsigned int position ) throw( Exception , RuntimeException ) {
HCRYPTKEY pubkey ;
std::list< HCRYPTKEY >::iterator keyIt ;
unsigned int pos ;
@@ -350,7 +350,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPubKey( unsigned int position )
return pubkey ;
}
-HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPriKey( unsigned int position ) throw( Exception , RuntimeException ) {
+HCRYPTKEY SecurityEnvironment_MSCryptImpl::getPriKey( unsigned int position ) throw( Exception , RuntimeException ) {
HCRYPTKEY prikey ;
std::list< HCRYPTKEY >::iterator keyIt ;
unsigned int pos ;
@@ -365,7 +365,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPriKey( unsigned int position )
}
//Methods from XSecurityEnvironment
-Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPersonalCertificates() throw( SecurityException , RuntimeException )
+Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPersonalCertificates() throw( SecurityException , RuntimeException )
{
sal_Int32 length ;
X509Certificate_MSCryptImpl* xcert ;
@@ -441,7 +441,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPer
}
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) {
unsigned int i ;
LPSTR pszName ;
X509Certificate_MSCryptImpl *xcert = NULL ;
@@ -638,12 +638,12 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
return xcert ;
}
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( SecurityException , RuntimeException ) {
Sequence< sal_Int8 > serial = numericStringToBigInteger( serialNumber ) ;
return getCertificate( issuerName, serial ) ;
}
-Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException ) {
+Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException ) {
PCCERT_CHAIN_CONTEXT pChainContext ;
PCCERT_CONTEXT pCertContext ;
const X509Certificate_MSCryptImpl* xcert ;
@@ -765,7 +765,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: buildC
return Sequence< Reference < XCertificate > >();
}
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) {
X509Certificate_MSCryptImpl* xcert ;
if( rawCertificate.getLength() > 0 ) {
@@ -778,7 +778,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFr
return xcert ;
}
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException ) {
xmlChar* chCert ;
xmlSecSize certSize ;
@@ -826,7 +826,7 @@ HCERTSTORE getCertStoreForIntermediatCerts(
//explicitly that all validation steps are carried out even if one or several
//errors occur. See also
//http://wiki.openoffice.org/wiki/Certificate_Path_Validation#Validation_status
-sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
+sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
const Reference< ::com::sun::star::security::XCertificate >& aCert,
const Sequence< Reference< ::com::sun::star::security::XCertificate > >& seqCerts)
throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException )
@@ -998,7 +998,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
return validity ;
}
-sal_Int32 SecurityEnvironment_MSCryptImpl :: getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) {
+sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) {
sal_Int32 characters ;
PCCERT_CONTEXT pCertContext ;
const X509Certificate_MSCryptImpl* xcert ;
@@ -1047,11 +1047,11 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: getCertificateCharacters( const ::c
return characters ;
}
-void SecurityEnvironment_MSCryptImpl :: enableDefaultCrypt( sal_Bool enable ) throw( Exception, RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::enableDefaultCrypt( sal_Bool enable ) throw( Exception, RuntimeException ) {
m_bEnableDefault = enable ;
}
-sal_Bool SecurityEnvironment_MSCryptImpl :: defaultEnabled() throw( Exception, RuntimeException ) {
+sal_Bool SecurityEnvironment_MSCryptImpl::defaultEnabled() throw( Exception, RuntimeException ) {
return m_bEnableDefault ;
}
@@ -1075,7 +1075,7 @@ OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() th
}
/* Native methods */
-xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl :: createKeysManager() throw( Exception, RuntimeException ) {
+xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) {
unsigned int i ;
HCRYPTKEY symKey ;
@@ -1164,7 +1164,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl :: createKeysManager() throw(
return pKeysMngr ;
}
-void SecurityEnvironment_MSCryptImpl :: destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) {
if( pKeysMngr != NULL ) {
xmlSecKeysMngrDestroy( pKeysMngr ) ;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index f2f5a0a..d66c616 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -164,19 +164,19 @@ OUString replaceTagSWithTagST(OUString oldDN)
}
/* end */
-X509Certificate_MSCryptImpl :: X509Certificate_MSCryptImpl() :
+X509Certificate_MSCryptImpl::X509Certificate_MSCryptImpl() :
m_pCertContext( NULL )
{
}
-X509Certificate_MSCryptImpl :: ~X509Certificate_MSCryptImpl() {
+X509Certificate_MSCryptImpl::~X509Certificate_MSCryptImpl() {
if( m_pCertContext != NULL ) {
CertFreeCertificateContext( m_pCertContext ) ;
}
}
//Methods from XCertificate
-sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::sun::star::uno::RuntimeException) {
+sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
return ( char )m_pCertContext->pCertInfo->dwVersion ;
} else {
@@ -184,7 +184,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl :: getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > serial( m_pCertContext->pCertInfo->SerialNumber.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SerialNumber.cbData ; i ++ )
@@ -196,7 +196,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
}
}
-OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
DWORD cbIssuer ;
@@ -242,7 +242,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::
}
}
-OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
{
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{
@@ -286,7 +286,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl :: getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException ) {
+::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
SYSTEMTIME explTime ;
DateTime dateTime ;
@@ -312,7 +312,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl :: getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) {
+::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
SYSTEMTIME explTime ;
DateTime dateTime ;
@@ -338,7 +338,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl :: getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > issuerUid( m_pCertContext->pCertInfo->IssuerUniqueId.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->IssuerUniqueId.cbData; i ++ )
@@ -350,7 +350,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl :: getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > subjectUid( m_pCertContext->pCertInfo->SubjectUniqueId.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SubjectUniqueId.cbData; i ++ )
@@ -362,7 +362,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl :: getExtensions() throw ( ::com::sun::star::uno::RuntimeException ) {
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() throw ( ::com::sun::star::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) {
CertificateExtension_XmlSecImpl* xExtn ;
Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ;
@@ -391,7 +391,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
}
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl :: findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (::com::sun::star::uno::RuntimeException) {
+::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) {
CertificateExtension_XmlSecImpl* xExtn ;
Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ;
@@ -417,7 +417,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl :: getEncoded() throw ( ::com::sun::star::uno::RuntimeException) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->cbCertEncoded > 0 ) {
Sequence< sal_Int8 > rawCert( m_pCertContext->cbCertEncoded ) ;
@@ -431,7 +431,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
}
//Helper methods
-void X509Certificate_MSCryptImpl :: setMswcryCert( const CERT_CONTEXT* cert ) {
+void X509Certificate_MSCryptImpl::setMswcryCert( const CERT_CONTEXT* cert ) {
if( m_pCertContext != NULL ) {
CertFreeCertificateContext( m_pCertContext ) ;
m_pCertContext = NULL ;
@@ -442,7 +442,7 @@ void X509Certificate_MSCryptImpl :: setMswcryCert( const CERT_CONTEXT* cert ) {
}
}
-const CERT_CONTEXT* X509Certificate_MSCryptImpl :: getMswcryCert() const {
+const CERT_CONTEXT* X509Certificate_MSCryptImpl::getMswcryCert() const {
if( m_pCertContext != NULL ) {
return m_pCertContext ;
} else {
@@ -450,7 +450,7 @@ const CERT_CONTEXT* X509Certificate_MSCryptImpl :: getMswcryCert() const {
}
}
-void X509Certificate_MSCryptImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) {
+void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) {
if( m_pCertContext != NULL ) {
CertFreeCertificateContext( m_pCertContext ) ;
m_pCertContext = NULL ;
@@ -462,7 +462,7 @@ void X509Certificate_MSCryptImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) t
}
/* XUnoTunnel */
-sal_Int64 SAL_CALL X509Certificate_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) {
+sal_Int64 SAL_CALL X509Certificate_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) {
if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
return ( sal_Int64 )this ;
}
@@ -476,12 +476,12 @@ namespace
class theX509Certificate_MSCryptImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theX509Certificate_MSCryptImplUnoTunnelId > {};
}
-const Sequence< sal_Int8>& X509Certificate_MSCryptImpl :: getUnoTunnelId() {
+const Sequence< sal_Int8>& X509Certificate_MSCryptImpl::getUnoTunnelId() {
return theX509Certificate_MSCryptImplUnoTunnelId::get().getSeq();
}
/* XUnoTunnel extension */
-X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( const Reference< XInterface >& rObj ) {
+X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl::getImplementation( const Reference< XInterface >& rObj ) {
Reference< XUnoTunnel > xUT( rObj , UNO_QUERY ) ;
if( xUT.is() ) {
return ( X509Certificate_MSCryptImpl* )xUT->getSomething( getUnoTunnelId() ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 1ee9831..93c20b8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -47,15 +47,15 @@ using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
using ::com::sun::star::xml::crypto::XMLEncryptionException ;
-XMLEncryption_MSCryptImpl :: XMLEncryption_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_xServiceManager( aFactory ) {
+XMLEncryption_MSCryptImpl::XMLEncryption_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_xServiceManager( aFactory ) {
}
-XMLEncryption_MSCryptImpl :: ~XMLEncryption_MSCryptImpl() {
+XMLEncryption_MSCryptImpl::~XMLEncryption_MSCryptImpl() {
}
/* XXMLEncryption */
Reference< XXMLEncryptionTemplate >
-SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
+SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
) throw( com::sun::star::xml::crypto::XMLEncryptionException,
@@ -191,7 +191,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
/* XXMLEncryption */
Reference< XXMLEncryptionTemplate > SAL_CALL
-XMLEncryption_MSCryptImpl :: decrypt(
+XMLEncryption_MSCryptImpl::decrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
@@ -320,12 +320,12 @@ XMLEncryption_MSCryptImpl :: decrypt(
}
/* XServiceInfo */
-OUString SAL_CALL XMLEncryption_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLEncryption_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryption_MSCryptImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -336,28 +336,28 @@ sal_Bool SAL_CALL XMLEncryption_MSCryptImpl :: supportsService( const OUString&
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > XMLEncryption_MSCryptImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryption";
return seqServiceNames ;
}
-OUString XMLEncryption_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLEncryption_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
return Reference< XInterface >( *new XMLEncryption_MSCryptImpl( aServiceManager ) ) ;
}
-Reference< XSingleServiceFactory > XMLEncryption_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > XMLEncryption_MSCryptImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
//Reference< XSingleServiceFactory > xFactory ;
//xFactory = ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName , impl_createInstance , impl_getSupportedServiceNames ) ;
//return xFactory ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index dbe738b..018c003 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -34,7 +34,7 @@ using ::com::sun::star::lang::XSingleServiceFactory ;
using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
-XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl()
+XMLSecurityContext_MSCryptImpl::XMLSecurityContext_MSCryptImpl()
://m_pKeysMngr( NULL ) ,
m_xSecurityEnvironment( NULL )
{
@@ -57,7 +57,7 @@ XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl()
}
}
-XMLSecurityContext_MSCryptImpl :: ~XMLSecurityContext_MSCryptImpl() {
+XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl() {
xmlDisableStreamInputCallbacks() ;
xmlSecCryptoShutdown() ;
xmlSecShutdown() ;
@@ -116,12 +116,12 @@ void SAL_CALL XMLSecurityContext_MSCryptImpl::setDefaultSecurityEnvironmentIndex
}
/* XServiceInfo */
-OUString SAL_CALL XMLSecurityContext_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLSecurityContext_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -132,28 +132,28 @@ sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl :: supportsService( const OUStr
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > XMLSecurityContext_MSCryptImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSecurityContext";
return seqServiceNames ;
}
-OUString XMLSecurityContext_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSecurityContext_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
return Reference< XInterface >( *new XMLSecurityContext_MSCryptImpl ) ;
}
-Reference< XSingleServiceFactory > XMLSecurityContext_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > XMLSecurityContext_MSCryptImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
//Reference< XSingleServiceFactory > xFactory ;
//xFactory = ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName , impl_createInstance , impl_getSupportedServiceNames ) ;
//return xFactory ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 939704f..9dbaac4 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -44,15 +44,15 @@ using ::com::sun::star::xml::crypto::XUriBinding ;
using ::com::sun::star::xml::crypto::XMLSignatureException ;
-XMLSignature_MSCryptImpl :: XMLSignature_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_xServiceManager( aFactory ) {
+XMLSignature_MSCryptImpl::XMLSignature_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_xServiceManager( aFactory ) {
}
-XMLSignature_MSCryptImpl :: ~XMLSignature_MSCryptImpl() {
+XMLSignature_MSCryptImpl::~XMLSignature_MSCryptImpl() {
}
/* XXMLSignature */
Reference< XXMLSignatureTemplate >
-SAL_CALL XMLSignature_MSCryptImpl :: generate(
+SAL_CALL XMLSignature_MSCryptImpl::generate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
) throw( com::sun::star::xml::crypto::XMLSignatureException,
@@ -148,7 +148,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: generate(
/* XXMLSignature */
Reference< XXMLSignatureTemplate >
-SAL_CALL XMLSignature_MSCryptImpl :: validate(
+SAL_CALL XMLSignature_MSCryptImpl::validate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
) throw( com::sun::star::uno::RuntimeException,
@@ -249,12 +249,12 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
}
/* XServiceInfo */
-OUString SAL_CALL XMLSignature_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLSignature_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL XMLSignature_MSCryptImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
const OUString* pArray = seqServiceNames.getConstArray() ;
for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -265,28 +265,28 @@ sal_Bool SAL_CALL XMLSignature_MSCryptImpl :: supportsService( const OUString& s
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
return impl_getSupportedServiceNames() ;
}
//Helper for XServiceInfo
-Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() {
+Sequence< OUString > XMLSignature_MSCryptImpl::impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignature";
return seqServiceNames ;
}
-OUString XMLSignature_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSignature_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl") ;
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
return Reference< XInterface >( *new XMLSignature_MSCryptImpl( aServiceManager ) ) ;
}
-Reference< XSingleServiceFactory > XMLSignature_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
+Reference< XSingleServiceFactory > XMLSignature_MSCryptImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
}
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index c8b061a..e45f7f8 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -40,25 +40,25 @@ using namespace ::com::sun::star::security ;
using ::com::sun::star::security::XCertificateExtension ;
-SanExtensionImpl :: SanExtensionImpl() :
+SanExtensionImpl::SanExtensionImpl() :
m_critical( false )
{
}
-SanExtensionImpl :: ~SanExtensionImpl() {
+SanExtensionImpl::~SanExtensionImpl() {
}
//Methods from XCertificateExtension
-sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
return m_xExtnValue ;
}
@@ -82,7 +82,7 @@ namespace {
}
//Methods from XSanExtension
-::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl :: getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ){
+::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ){
if (!m_Entries.hasElements())
{
@@ -182,7 +182,7 @@ namespace {
return m_Entries;
}
-OString SanExtensionImpl :: removeOIDFromString( const OString &oidString)
+OString SanExtensionImpl::removeOIDFromString( const OString &oidString)
{
OString objID;
OString oid("OID.");
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 7127538..f9c3e72 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -105,13 +105,13 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
return NULL;
}
-SecurityEnvironment_NssImpl :: SecurityEnvironment_NssImpl() :
+SecurityEnvironment_NssImpl::SecurityEnvironment_NssImpl() :
m_pHandler( NULL ) , m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList() {
PK11_SetPasswordFunc( GetPasswordFunction ) ;
}
-SecurityEnvironment_NssImpl :: ~SecurityEnvironment_NssImpl() {
+SecurityEnvironment_NssImpl::~SecurityEnvironment_NssImpl() {
PK11_SetPasswordFunc( NULL ) ;
@@ -143,12 +143,12 @@ SecurityEnvironment_NssImpl :: ~SecurityEnvironment_NssImpl() {
}
/* XServiceInfo */
-OUString SAL_CALL SecurityEnvironment_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL SecurityEnvironment_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) {
return impl_getImplementationName() ;
}
/* XServiceInfo */
-sal_Bool SAL_CALL SecurityEnvironment_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list