[Libreoffice-commits] core.git: accessibility/inc basic/source chart2/source xmloff/source xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Fri Apr 26 09:03:07 PDT 2013
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 3
basic/source/classes/errobject.cxx | 2
basic/source/classes/sb.cxx | 1
basic/source/classes/sbxmod.cxx | 2
basic/source/inc/runtime.hxx | 8 -
basic/source/runtime/methods.cxx | 2
basic/source/runtime/methods1.cxx | 3
chart2/source/view/axes/Tickmarks.hxx | 5
chart2/source/view/axes/Tickmarks_Equidistant.hxx | 5
chart2/source/view/axes/VCartesianAxis.cxx | 1
chart2/source/view/axes/VCartesianAxis.hxx | 6 -
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 4
xmloff/source/text/txtparaimphint.hxx | 57 ++++------
xmlsecurity/source/component/certificatecontainer.cxx | 3
xmlsecurity/source/component/certificatecontainer.hxx | 45 ++-----
xmlsecurity/source/component/registerservices.cxx | 2
16 files changed, 59 insertions(+), 90 deletions(-)
New commits:
commit 1e83da9aedda51aaef7e105187ae9a6a385f15d3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Apr 26 17:14:48 2013 +0200
some more namespace cleanup
Change-Id: Ib1e80d717f199db8f8ac4181d4377a86d88e3244
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 44cdbd8..e92e495 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX
#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX
@@ -28,8 +27,6 @@
#include <memory>
-using namespace ::svt::table;
-
// ============================================================================
namespace accessibility {
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index f1c9b71..7cfce56 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -173,7 +173,7 @@ void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const u
}
// SbxErrObject
-SbxErrObject::SbxErrObject( const OUString& rName, const Any& rUnoObj )
+SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj )
: SbUnoObject( rName, rUnoObj )
, m_pErrObject( NULL )
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 7154e1e..09746ad 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -57,6 +57,7 @@ TYPEINIT1(StarBASIC,SbxObject)
#define RTLNAME "@SBRTL"
// i#i68894#
using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index a48bffc..28d10e2 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -74,7 +74,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::reflection;
using namespace com::sun::star::beans;
using namespace com::sun::star::script;
-
+using namespace com::sun::star::uno;
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/awt/DialogProvider.hpp>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index fd0911a..0012deb 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -35,10 +35,6 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <unotools/localedatawrapper.hxx>
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
-
class SbiInstance; // active StarBASIC process
class SbiRuntime; // active StarBASIC procedure instance
@@ -70,7 +66,7 @@ struct SbiForStack { // for/next stack:
sal_Int32* pArrayCurIndices;
sal_Int32* pArrayLowerBounds;
sal_Int32* pArrayUpperBounds;
- Reference< XEnumeration > xEnumeration;
+ css::uno::Reference< css::container::XEnumeration > xEnumeration;
SbiForStack( void )
: pArrayCurIndices( NULL )
@@ -115,7 +111,7 @@ public:
OUString sFullNameToBeChecked;
WildCard* pWildCard;
- Sequence< OUString > aDirSeq;
+ css::uno::Sequence< OUString > aDirSeq;
SbiRTLData();
~SbiRTLData();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1e5fe15..9e1b3ba 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -57,6 +57,8 @@
using namespace comphelper;
using namespace osl;
using namespace com::sun::star;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::uno;
#include "date.hxx"
#include "stdobj.hxx"
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index f9872b4..5847754 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -55,9 +55,10 @@
#include <com/sun/star/sheet/XFunctionAccess.hpp>
using namespace comphelper;
+using namespace com::sun::star::i18n;
+using namespace com::sun::star::lang;
using namespace com::sun::star::sheet;
using namespace com::sun::star::uno;
-using namespace com::sun::star::i18n;
void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL );
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index ae9a152..79c8314 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -34,11 +34,6 @@ namespace chart
{
//.............................................................................
-using ::basegfx::B2DVector;
-//-----------------------------------------------------------------------------
-/**
-*/
-
struct TickInfo
{
double fScaledTickValue;
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
index 63548e2..f171b2f 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
@@ -26,11 +26,6 @@ namespace chart
{
//.............................................................................
-using ::basegfx::B2DVector;
-//-----------------------------------------------------------------------------
-/**
-*/
-
class EquidistantTickIter : public TickIter
{
public:
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 9d62fac..3361743 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -51,6 +51,7 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using namespace ::rtl::math;
+using ::basegfx::B2DVector;
using ::com::sun::star::uno::Reference;
//-----------------------------------------------------------------------------
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index df48791..aaa1718 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -29,10 +29,6 @@ namespace chart
{
//.............................................................................
-//-----------------------------------------------------------------------------
-/**
-*/
-
class VCartesianAxis : public VAxisBase
{
//-------------------------------------------------------------------------
@@ -97,7 +93,7 @@ public:
double fLogicY;
double fLogicZ;
- B2DVector aScreenPos;
+ ::basegfx::B2DVector aScreenPos;
};
protected: //methods
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 73c9954..982f564 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include <xmloff/xmlimp.hxx>
@@ -30,13 +29,14 @@
// OD 2004-04-21 #i26791#
#include <txtparaimphint.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
+namespace drawing = com::sun::star::drawing;
+
TYPEINIT1( XMLTextFrameHyperlinkContext, SvXMLImportContext );
XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 893eb51..f92e12f 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -25,11 +25,6 @@
#include "XMLTextFrameContext.hxx"
#include <xmloff/XMLEventsImportContext.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::xmloff::token;
-
// ---------------------------------------------------------------------
#define XML_HINT_STYLE 1
@@ -42,16 +37,16 @@ using namespace ::xmloff::token;
class XMLHint_Impl
{
- Reference < XTextRange > xStart;
- Reference < XTextRange > xEnd;
+ css::uno::Reference < css::text::XTextRange > xStart;
+ css::uno::Reference < css::text::XTextRange > xEnd;
sal_uInt8 nType;
public:
XMLHint_Impl( sal_uInt8 nTyp,
- const Reference < XTextRange > & rS,
- const Reference < XTextRange > & rE ) :
+ const css::uno::Reference < css::text::XTextRange > & rS,
+ const css::uno::Reference < css::text::XTextRange > & rE ) :
xStart( rS ),
xEnd( rE ),
nType( nTyp )
@@ -59,7 +54,7 @@ public:
}
XMLHint_Impl( sal_uInt8 nTyp,
- const Reference < XTextRange > & rS ) :
+ const css::uno::Reference < css::text::XTextRange > & rS ) :
xStart( rS ),
nType( nTyp )
{
@@ -67,9 +62,9 @@ public:
virtual ~XMLHint_Impl() {}
- const Reference < XTextRange > & GetStart() const { return xStart; }
- const Reference < XTextRange > & GetEnd() const { return xEnd; }
- void SetEnd( const Reference < XTextRange > & rPos ) { xEnd = rPos; }
+ const css::uno::Reference < css::text::XTextRange > & GetStart() const { return xStart; }
+ const css::uno::Reference < css::text::XTextRange > & GetEnd() const { return xEnd; }
+ void SetEnd( const css::uno::Reference < css::text::XTextRange > & rPos ) { xEnd = rPos; }
// We don't use virtual methods to differ between the sub classes,
// because this seems to be to expensive if compared to inline methods.
@@ -87,7 +82,7 @@ class XMLStyleHint_Impl : public XMLHint_Impl
public:
XMLStyleHint_Impl( const OUString& rStyleName,
- const Reference < XTextRange > & rPos ) :
+ const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_STYLE, rPos, rPos ),
sStyleName( rStyleName )
{
@@ -104,7 +99,7 @@ class XMLReferenceHint_Impl : public XMLHint_Impl
public:
XMLReferenceHint_Impl( const OUString& rRefName,
- const Reference < XTextRange > & rPos ) :
+ const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_REFERENCE, rPos, rPos ),
sRefName( rRefName )
{
@@ -126,7 +121,7 @@ class XMLHyperlinkHint_Impl : public XMLHint_Impl
public:
- XMLHyperlinkHint_Impl( const Reference < XTextRange > & rPos ) :
+ XMLHyperlinkHint_Impl( const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_HYPERLINK, rPos, rPos ),
pEvents( NULL )
{
@@ -163,22 +158,22 @@ public:
class XMLIndexMarkHint_Impl : public XMLHint_Impl
{
- const Reference<beans::XPropertySet> xIndexMarkPropSet;
+ const css::uno::Reference<css::beans::XPropertySet> xIndexMarkPropSet;
const OUString sID;
public:
- XMLIndexMarkHint_Impl( const Reference < beans::XPropertySet > & rPropSet,
- const Reference < XTextRange > & rPos ) :
+ XMLIndexMarkHint_Impl( const css::uno::Reference < css::beans::XPropertySet > & rPropSet,
+ const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_INDEX_MARK, rPos, rPos ),
xIndexMarkPropSet( rPropSet ),
sID()
{
}
- XMLIndexMarkHint_Impl( const Reference < beans::XPropertySet > & rPropSet,
- const Reference < XTextRange > & rPos,
+ XMLIndexMarkHint_Impl( const css::uno::Reference < css::beans::XPropertySet > & rPropSet,
+ const css::uno::Reference < css::text::XTextRange > & rPos,
OUString sIDString) :
XMLHint_Impl( XML_HINT_INDEX_MARK, rPos, rPos ),
xIndexMarkPropSet( rPropSet ),
@@ -188,7 +183,7 @@ public:
virtual ~XMLIndexMarkHint_Impl() {}
- const Reference<beans::XPropertySet> & GetMark() const
+ const css::uno::Reference<css::beans::XPropertySet> & GetMark() const
{ return xIndexMarkPropSet; }
const OUString& GetID() const { return sID; }
};
@@ -202,7 +197,7 @@ class XMLTextFrameHint_Impl : public XMLHint_Impl
public:
XMLTextFrameHint_Impl( SvXMLImportContext* pContext,
- const Reference < XTextRange > & rPos ) :
+ const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_TEXT_FRAME, rPos, rPos ),
xContext( pContext )
{
@@ -212,9 +207,9 @@ public:
{
}
- Reference < XTextContent > GetTextContent() const
+ css::uno::Reference < css::text::XTextContent > GetTextContent() const
{
- Reference <XTextContent > xTxt;
+ css::uno::Reference < css::text::XTextContent > xTxt;
SvXMLImportContext *pContext = &xContext;
if( pContext->ISA( XMLTextFrameContext ) )
xTxt = PTR_CAST( XMLTextFrameContext, pContext )->GetTextContent();
@@ -226,9 +221,9 @@ public:
}
// Frame "to character": anchor moves from first to last char after saving (#i33242#)
- Reference < drawing::XShape > GetShape() const
+ css::uno::Reference < css::drawing::XShape > GetShape() const
{
- Reference < drawing::XShape > xShape;
+ css::uno::Reference < css::drawing::XShape > xShape;
SvXMLImportContext *pContext = &xContext;
if( pContext->ISA( XMLTextFrameContext ) )
xShape = PTR_CAST( XMLTextFrameContext, pContext )->GetShape();
@@ -243,11 +238,11 @@ public:
sal_Bool bRet = sal_False;
SvXMLImportContext *pContext = &xContext;
if( pContext->ISA( XMLTextFrameContext ) )
- bRet = TextContentAnchorType_AT_CHARACTER ==
+ bRet = css::text::TextContentAnchorType_AT_CHARACTER ==
PTR_CAST( XMLTextFrameContext, pContext )
->GetAnchorType();
else if( pContext->ISA( XMLTextFrameHyperlinkContext ) )
- bRet = TextContentAnchorType_AT_CHARACTER ==
+ bRet = css::text::TextContentAnchorType_AT_CHARACTER ==
PTR_CAST( XMLTextFrameHyperlinkContext, pContext )
->GetAnchorType();
return bRet;
@@ -262,7 +257,7 @@ class XMLDrawHint_Impl : public XMLHint_Impl
public:
XMLDrawHint_Impl( SvXMLShapeContext* pContext,
- const Reference < XTextRange > & rPos ) :
+ const css::uno::Reference < css::text::XTextRange > & rPos ) :
XMLHint_Impl( XML_HINT_DRAW, rPos, rPos ),
xContext( pContext )
{
@@ -273,7 +268,7 @@ public:
}
// Frame "to character": anchor moves from first to last char after saving (#i33242#)
- Reference < drawing::XShape > GetShape() const
+ css::uno::Reference < css::drawing::XShape > GetShape() const
{
return static_cast<SvXMLShapeContext*>(&xContext)->getShape();
}
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 7fc736b..f96f766 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -21,9 +21,10 @@
#include <sal/config.h>
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
sal_Bool
CertificateContainer::searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap )
{
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 03b6086..a3b2f6b 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -27,19 +27,12 @@
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/security/XCertificateContainer.hpp>
-
#include <com/sun/star/security/CertificateContainerStatus.hpp>
-
#include <vector>
#include <map>
-using namespace com::sun::star;
-using namespace cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-
-class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer >
+class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo, css::security::XCertificateContainer >
{
private:
typedef std::map< OUString, OUString > Map;
@@ -47,39 +40,35 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::l
Map certTrustMap;
::sal_Bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
- virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
public:
- CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {};
+ CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {};
virtual ~CertificateContainer(){};
- virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(css::uno::RuntimeException);
+ virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+
// provide factory
- static OUString SAL_CALL
- impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
+ static css::uno::Sequence< OUString > SAL_CALL
+ impl_getStaticSupportedServiceNames( ) throw(css::uno::RuntimeException);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException );
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL
+ impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException );
- // XServiceInfo
- virtual OUString SAL_CALL
- getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual css::uno::Sequence< OUString > SAL_CALL
+ getSupportedServiceNames( ) throw(css::uno::RuntimeException);
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 82ccbec..5891487 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -22,11 +22,11 @@
#include <cppuhelper/factory.hxx>
-
#include <documentdigitalsignatures.hxx>
#include <certificatecontainer.hxx>
using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
extern "C"
{
More information about the Libreoffice-commits
mailing list