[Libreoffice-commits] core.git: desktop/inc desktop/source desktop/unx sw/source
Thomas Arnhold
thomas at arnhold.org
Sun Apr 28 01:37:24 PDT 2013
desktop/inc/app.hxx | 14 +---
desktop/source/app/appfirststart.cxx | 2
desktop/source/app/appinit.cxx | 4 -
desktop/source/app/check_ext_deps.cxx | 3 +
desktop/source/deployment/gui/license_dialog.hxx | 18 ++----
desktop/source/offacc/acceptor.cxx | 7 ++
desktop/source/offacc/acceptor.hxx | 63 ++++++++-------------
desktop/unx/splash/unxsplash.cxx | 1
desktop/unx/splash/unxsplash.hxx | 23 +++----
sw/source/filter/ww1/w1class.hxx | 68 +++++++++++------------
10 files changed, 93 insertions(+), 110 deletions(-)
New commits:
commit 2094610175140023cf8f904f8506c189e36dec06
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Apr 28 10:36:40 2013 +0200
namespacing cleanup
Change-Id: I1384bf53a29e174bb97db4c0644f9dce39c0e36d
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index f53f08c..d949304 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -37,10 +37,6 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
-using namespace com::sun::star::task;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-
namespace desktop
{
@@ -49,7 +45,7 @@ namespace desktop
--------------------------------------------------------------------*/
class CommandLineArgs;
class Lockfile;
-class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
+class AcceptorMap : public std::map< OUString, css::uno::Reference<css::lang::XInitialization> > {};
struct ConvertData;
class Desktop : public Application
{
@@ -137,8 +133,8 @@ class Desktop : public Application
private:
void RegisterServices(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > const & context);
+ css::uno::Reference<
+ css::uno::XComponentContext > const & context);
void DeregisterServices();
void CreateTemporaryDirectory();
@@ -148,7 +144,7 @@ class Desktop : public Application
bool InitializeConfiguration();
void FlushConfiguration();
static sal_Bool shouldLaunchQuickstart();
- sal_Bool InitializeQuickstartMode( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
+ sal_Bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
void StartSetup( const OUString& aParameters );
@@ -160,7 +156,7 @@ class Desktop : public Application
static void PreloadModuleData( const CommandLineArgs& );
static void PreloadConfigurationData();
- Reference<XStatusIndicator> m_rSplashScreen;
+ css::uno::Reference<css::task::XStatusIndicator> m_rSplashScreen;
void OpenSplashScreen();
void CloseSplashScreen();
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index af9eb05..97ca6e1 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -33,6 +33,8 @@
using namespace ::desktop;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 42f2b6b..05b3b30 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -30,8 +30,6 @@
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/XCurrentContext.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
-
-
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/ucb/UniversalContentBroker.hpp>
#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
@@ -55,7 +53,6 @@
#include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx>
-
using namespace desktop;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -63,7 +60,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::ucb;
-
namespace desktop
{
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 2ea7f84..bb9aadb 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -57,6 +57,9 @@
using namespace desktop;
using namespace com::sun::star;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::task;
+using namespace com::sun::star::uno;
namespace
{
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 8dc0f2c..24cfae6 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -27,17 +27,13 @@
#include "boost/bind.hpp"
-using namespace ::dp_misc;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
namespace dp_gui {
class LicenseDialog
- : public ::cppu::WeakImplHelper1<ui::dialogs::XExecutableDialog>
+ : public ::cppu::WeakImplHelper1<css::ui::dialogs::XExecutableDialog>
{
- Reference<XComponentContext> const m_xComponentContext;
- Reference<awt::XWindow> /* const */ m_parent;
+ css::uno::Reference<css::uno::XComponentContext> const m_xComponentContext;
+ css::uno::Reference<css::awt::XWindow> /* const */ m_parent;
OUString m_sExtensionName;
OUString /* const */ m_sLicenseText;
OUString m_initialTitle;
@@ -45,13 +41,13 @@ class LicenseDialog
sal_Int16 solar_execute();
public:
- LicenseDialog( Sequence<Any> const & args,
- Reference<XComponentContext> const & xComponentContext );
+ LicenseDialog( css::uno::Sequence<css::uno::Any> const & args,
+ css::uno::Reference<css::uno::XComponentContext> const & xComponentContext );
// XExecutableDialog
virtual void SAL_CALL setTitle( OUString const & title )
- throw (RuntimeException);
- virtual sal_Int16 SAL_CALL execute() throw (RuntimeException);
+ throw (css::uno::RuntimeException);
+ virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException);
};
}
#endif
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 21b97f4..a9b08f4 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -25,6 +25,13 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
+using namespace ::osl;
+using namespace css::bridge;
+using namespace css::connection;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::uno;
+
namespace desktop
{
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 0cb2dd3..76d08a4 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -37,38 +37,27 @@
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
-
-using namespace ::rtl;
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::bridge;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::connection;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::registry;
-
namespace desktop {
class Acceptor
- : public ::cppu::WeakImplHelper2<XServiceInfo, XInitialization>
+ : public ::cppu::WeakImplHelper2<css::lang::XServiceInfo, css::lang::XInitialization>
{
private:
static const sal_Char *serviceName;
static const sal_Char *implementationName;
static const sal_Char *supportedServiceNames[];
- static Mutex m_aMutex;
+ static ::osl::Mutex m_aMutex;
oslThread m_thread;
comphelper::WeakBag< com::sun::star::bridge::XBridge > m_bridges;
- Condition m_cEnable;
+ ::osl::Condition m_cEnable;
- Reference< XMultiServiceFactory > m_rSMgr;
- Reference< XComponentContext > m_rContext;
- Reference< XAcceptor > m_rAcceptor;
- Reference< XBridgeFactory2 > m_rBridgeFactory;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_rSMgr;
+ css::uno::Reference< css::uno::XComponentContext > m_rContext;
+ css::uno::Reference< css::connection::XAcceptor > m_rAcceptor;
+ css::uno::Reference< css::bridge::XBridgeFactory2 > m_rBridgeFactory;
OUString m_aAcceptString;
OUString m_aConnectString;
@@ -78,42 +67,42 @@ private:
bool m_bDying;
public:
- Acceptor( const Reference< XMultiServiceFactory >& aFactory );
+ Acceptor( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
virtual ~Acceptor();
void SAL_CALL run();
// XService info
- static OUString impl_getImplementationName();
- virtual OUString SAL_CALL getImplementationName()
- throw (RuntimeException);
- static Sequence<OUString> impl_getSupportedServiceNames();
- virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
- throw (RuntimeException);
+ static OUString impl_getImplementationName();
+ virtual OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException);
+ static css::uno::Sequence<OUString> impl_getSupportedServiceNames();
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+ throw (css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
+ throw (css::uno::RuntimeException);
// XInitialize
- virtual void SAL_CALL initialize( const Sequence<Any>& aArguments )
- throw ( Exception );
+ virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
+ throw ( css::uno::Exception );
- static Reference<XInterface> impl_getInstance( const Reference< XMultiServiceFactory >& aFactory );
+ static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
};
-class AccInstanceProvider : public ::cppu::WeakImplHelper1<XInstanceProvider>
+class AccInstanceProvider : public ::cppu::WeakImplHelper1<css::bridge::XInstanceProvider>
{
private:
- Reference<XMultiServiceFactory> m_rSMgr;
- Reference<XConnection> m_rConnection;
+ css::uno::Reference<css::lang::XMultiServiceFactory> m_rSMgr;
+ css::uno::Reference<css::connection::XConnection> m_rConnection;
public:
- AccInstanceProvider(const Reference< XMultiServiceFactory >& aFactory,
- const Reference< XConnection >& rConnection);
+ AccInstanceProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory,
+ const css::uno::Reference< css::connection::XConnection >& rConnection);
virtual ~AccInstanceProvider();
// XInstanceProvider
- virtual Reference<XInterface> SAL_CALL getInstance (const OUString& aName )
- throw ( NoSuchElementException );
+ virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName )
+ throw ( css::container::NoSuchElementException );
};
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 812cc00..35c20b1 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -31,6 +31,7 @@
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::registry;
+using namespace ::com::sun::star::uno;
namespace desktop
{
diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx
index b25e858..04586e1 100644
--- a/desktop/unx/splash/unxsplash.hxx
+++ b/desktop/unx/splash/unxsplash.hxx
@@ -40,14 +40,9 @@
#include <osl/mutex.hxx>
#include <rtl/bootstrap.hxx>
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::task;
-
namespace desktop {
-class UnxSplashScreen : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
+class UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization >
{
private:
// don't allow anybody but ourselves to create instances of this class
@@ -60,22 +55,22 @@ private:
static UnxSplashScreen *m_pINSTANCE;
static osl::Mutex m_aMutex;
- Reference< XComponentContext > m_xCtx;
+ css::uno::Reference< css::uno::XComponentContext > m_xCtx;
FILE *m_pOutFd;
public:
- UnxSplashScreen( const Reference< XComponentContext >& xCtx );
+ UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx );
// XStatusIndicator
- virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( RuntimeException );
- virtual void SAL_CALL end() throw ( RuntimeException );
- virtual void SAL_CALL reset() throw ( RuntimeException );
- virtual void SAL_CALL setText( const OUString& aText ) throw ( RuntimeException );
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( RuntimeException );
+ virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL end() throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL reset() throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException );
// XInitialize
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw ( RuntimeException );
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
};
}
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index b6cb854..804220b 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -27,8 +27,6 @@
#include <ostream>
-using std::ostream;
-
namespace editeng { class SvxBorderLine; }
class SvxFontItem;
@@ -103,7 +101,7 @@ class Ww1Fib
SvStream& rStream;
public:
Ww1Fib(SvStream&);
- friend ostream& operator <<(ostream&, Ww1Fib&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Fib&);
W1_FIB& GetFIB() { return aFib; }
sal_Bool GetError() { return !bOK; }
SvStream& GetStream() { return rStream; }
@@ -124,7 +122,7 @@ public:
return !bOK; }
W1_DOP& GetDOP() {
return aDop; }
- friend ostream& operator <<(ostream&, Ww1Dop&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Dop&);
void Out(Ww1Shell&);
};
@@ -168,7 +166,7 @@ public:
sal_Unicode Out( Ww1Shell&, sal_uLong& );
sal_Unicode Out( String&, sal_uLong=0xffffffff);
sal_Unicode Out( sal_Unicode& );
- friend ostream& operator <<(ostream&, Ww1PlainText&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlainText&);
String& Fill( String&, sal_uLong=0, sal_uLong=0xffffffff );
sal_Unicode operator []( sal_uLong );
String GetText( sal_uLong ulOffset, sal_uLong nLen ) const;
@@ -265,7 +263,7 @@ public:
sal_uInt16 ReadChpx(sal_uInt8*&, sal_uInt16&);
sal_uInt16 ReadPapx(sal_uInt8*&, sal_uInt16&);
sal_uInt16 ReadEstcp(sal_uInt8*&, sal_uInt16&);
- friend ostream& operator <<(ostream&, Ww1Style&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Style&);
void Out(Ww1Shell&, Ww1Manager&);
};
@@ -294,7 +292,7 @@ public:
return aStyles[stc]; }
sal_uInt16 Count() {
return 256; }
- friend ostream& operator <<(ostream&, Ww1StyleSheet&);
+ friend std::ostream& operator <<(std::ostream&, Ww1StyleSheet&);
void Out(Ww1Shell&, Ww1Manager&);
friend class Ww1Style;
sal_Bool GetError() {
@@ -324,7 +322,7 @@ public:
W1_FFN* GetFFN(sal_uInt16 nNum);
sal_uInt16 Count() {
return nMax; }
- friend ostream& operator <<(ostream&, Ww1Fonts&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Fonts&);
sal_Bool GetError() {
return !bOK; }
SvxFontItem GetFont(sal_uInt16);
@@ -359,12 +357,12 @@ public:
//
void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- virtual ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ virtual std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
const sal_Char* sName;
#else
virtual void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
virtual void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
#endif
virtual sal_uInt16 Size(sal_uInt8*);
sal_uInt16 nCountBytes;
@@ -397,7 +395,7 @@ public:
class Ww1SingleSprmByte : public Ww1SingleSprm {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
Ww1SingleSprmByte(sal_Char* sName = 0) :
Ww1SingleSprm(1, sName) {
}
@@ -405,7 +403,7 @@ public:
class Ww1SingleSprmBool : public Ww1SingleSprmByte {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
Ww1SingleSprmBool(sal_Char* sName = 0) :
Ww1SingleSprmByte(sName) {
}
@@ -413,7 +411,7 @@ public:
class Ww1SingleSprm4State : public Ww1SingleSprmByte {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
Ww1SingleSprm4State(sal_Char* sName = 0) :
Ww1SingleSprmByte(sName) {
}
@@ -421,14 +419,14 @@ public:
class Ww1SingleSprmWord : public Ww1SingleSprm {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
Ww1SingleSprmWord(sal_Char* sName = 0)
: Ww1SingleSprm(2, sName) {}
};
class Ww1SingleSprmLong : public Ww1SingleSprm {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
Ww1SingleSprmLong(sal_Char* sName = 0) :
Ww1SingleSprm(4, sName) {
}
@@ -436,7 +434,7 @@ public:
class Ww1SingleSprmTab : public Ww1SingleSprm {
public:
- ostream& Dump(ostream&, sal_uInt8*, sal_uInt16);
+ std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
sal_uInt16 Size(sal_uInt8*);
Ww1SingleSprmTab(sal_uInt16 nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
@@ -741,7 +739,7 @@ public:
Ww1Sprm(sal_uInt8*, sal_uInt16);
Ww1Sprm(SvStream&, sal_uLong);
~Ww1Sprm();
- friend ostream& operator <<(ostream&, Ww1Sprm&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Sprm&);
void Start(Ww1Shell&, Ww1Manager&);
void Start(Ww1Shell&, Ww1Manager&, sal_uInt16);
void Stop(Ww1Shell&, Ww1Manager&);
@@ -769,7 +767,7 @@ public:
}
sal_Bool GetError() {
return !bOK; }
- friend ostream& operator <<(ostream&, Ww1Picture&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Picture&);
void Out(Ww1Shell&, Ww1Manager&);
void WriteBmp(SvStream&);
};
@@ -793,7 +791,7 @@ protected:
public:
Ww1Plc(Ww1Fib&, sal_uLong, sal_uInt16, sal_uInt16);
~Ww1Plc();
- friend ostream& operator <<(ostream&, Ww1Plc&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Plc&);
sal_uLong Where(sal_uInt16); // wie im jeweiligen plc
void Seek(sal_uLong, sal_uInt16&);
void Fill(sal_uInt16 nIndex, sal_uLong& begin, sal_uLong& end) {
@@ -849,7 +847,7 @@ public:
aRef(rFib),
aTxt(rFib) {
}
- friend ostream& operator <<(ostream&, Ww1Annotation&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Annotation&);
};
//////////////////////////////////////////////////////////////// PlcSep
@@ -860,7 +858,7 @@ public:
Ww1Plc(rFibL, rFibL.GetFIB().fcPlcfsedGet(),
rFibL.GetFIB().cbPlcfsedGet(), 6) {
}
- friend ostream& operator <<(ostream&, Ww1PlcSep&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcSep&);
};
//////////////////////////////////////////////////////////////// PlcChp
@@ -871,7 +869,7 @@ public:
Ww1Plc(rFibL, rFibL.GetFIB().fcPlcfbteChpxGet(),
rFibL.GetFIB().cbPlcfbteChpxGet(), 2) {
}
- friend ostream& operator <<(ostream&, Ww1PlcChp&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcChp&);
};
//////////////////////////////////////////////////////////////// PlcPap
@@ -882,7 +880,7 @@ public:
Ww1Plc(rFibL, rFibL.GetFIB().fcPlcfbtePapxGet(),
rFibL.GetFIB().cbPlcfbtePapxGet(), 2) {
}
- friend ostream& operator <<(ostream&, Ww1PlcPap&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcPap&);
};
//////////////////////////////////////////////////////// PlcFootnoteRef
@@ -893,7 +891,7 @@ public:
Ww1Plc(rFibL, rFibL.GetFIB().fcPlcffndRefGet(),
rFibL.GetFIB().cbPlcffndRefGet(), 2) {
}
- friend ostream& operator <<(ostream&, Ww1PlcFootnoteRef&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcFootnoteRef&);
};
//////////////////////////////////////////////////////// PlcFootnoteTxt
@@ -904,7 +902,7 @@ public:
Ww1Plc(rFibL, rFibL.GetFIB().fcPlcffndTxtGet(),
rFibL.GetFIB().cbPlcffndTxtGet(), 0) {
}
- friend ostream& operator <<(ostream&, Ww1PlcFootnoteTxt&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcFootnoteTxt&);
};
///////////////////////////////////////////////////////////// PlcFields
@@ -918,7 +916,7 @@ public:
{ return (W1_FLD*)Ww1Plc::GetData(nIndex); }
sal_uLong Where(sal_uInt16 nIndex) // absolut im file
{ return Ww1Plc::Where(nIndex) + rFib.GetFIB().fcMinGet(); }
- friend ostream& operator <<(ostream&, Ww1PlcFields&);
+ friend std::ostream& operator <<(std::ostream&, Ww1PlcFields&);
};
///////////////////////////////////////////////////////////// PlcBookmarks
@@ -987,7 +985,7 @@ protected:
sal_uInt8* GetData(sal_uInt16);
public:
Ww1Fkp(SvStream&, sal_uLong, sal_uInt16);
- friend ostream& operator <<(ostream&, Ww1Fkp&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Fkp&);
sal_uInt16 Count() const { return SVBT8ToByte(aFkp+511); }
sal_uLong Where(sal_uInt16); // wie im entsprechenden fkp
};
@@ -999,7 +997,7 @@ public:
Ww1FkpPap(SvStream& rStream, sal_uLong ulFilePos)
: Ww1Fkp(rStream, ulFilePos, 1)
{}
- friend ostream& operator <<(ostream&, Ww1FkpPap&);
+ friend std::ostream& operator <<(std::ostream&, Ww1FkpPap&);
sal_Bool Fill(sal_uInt16, sal_uInt8*&, sal_uInt16&);
};
@@ -1018,7 +1016,7 @@ public:
#endif
{}
- friend ostream& operator <<(ostream&, Ww1FkpChp&);
+ friend std::ostream& operator <<(std::ostream&, Ww1FkpChp&);
sal_Bool Fill(sal_uInt16, W1_CHP&);
};
@@ -1030,7 +1028,7 @@ class Ww1SprmPapx : public Ww1Sprm
sal_uInt16 SprmSize(sal_uInt8* p, sal_uInt16 nSize);
public:
Ww1SprmPapx(sal_uInt8* p, sal_uInt16 nSize);
- friend ostream& operator <<(ostream&, Ww1SprmPapx&);
+ friend std::ostream& operator <<(std::ostream&, Ww1SprmPapx&);
void Start(Ww1Shell&, Ww1Manager&);
void Stop(Ww1Shell&, Ww1Manager&);
};
@@ -1042,7 +1040,7 @@ public:
Ww1SprmSep(Ww1Fib& rFib, sal_uLong ulFilePos)
: Ww1Sprm(rFib.GetStream(), ulFilePos)
{}
- friend ostream& operator <<(ostream&, Ww1SprmSep&);
+ friend std::ostream& operator <<(std::ostream&, Ww1SprmSep&);
};
///////////////////////////////////////////////////////////////// Assoc
@@ -1063,7 +1061,7 @@ public:
Ww1Assoc(Ww1Fib&);
~Ww1Assoc() { delete pBuffer; }
sal_Bool GetError() const { return !bOK; }
- friend ostream& operator <<(ostream&, Ww1Assoc&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Assoc&);
void Out(Ww1Shell&);
};
@@ -1234,7 +1232,7 @@ public:
return Ww1PlcFields::GetData(nPlcIndex);
}
sal_uLong GetLength();
- friend ostream& operator <<(ostream&, Ww1Manager&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Manager&);
void Start(Ww1Shell&, Ww1Manager&);
void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
void Out(Ww1Shell&, Ww1Manager&, sal_uInt16=0);
@@ -1300,7 +1298,7 @@ public:
sal_Bool GetIsEnd() const { return ( nIsEnd ) ? sal_True : sal_False; }
const String GetName() const;
long Len() const;
- friend ostream& operator <<(ostream&, Ww1Bookmarks&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Bookmarks&);
void Start(Ww1Shell&, Ww1Manager&);
void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
void Out(Ww1Shell&, Ww1Manager&, sal_uInt16=0);
@@ -1554,7 +1552,7 @@ public:
}
SvxFontItem GetFont(sal_uInt16 nFCode);
friend Ww1Shell& operator <<(Ww1Shell&, Ww1Manager&);
- friend ostream& operator <<(ostream&, Ww1Manager&);
+ friend std::ostream& operator <<(std::ostream&, Ww1Manager&);
sal_Bool Pushed() { return pDoc != &aDoc; }
void Pop();
void Push0(Ww1PlainText* pDoc, sal_uLong, Ww1Fields* = 0);
More information about the Libreoffice-commits
mailing list