summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/globdoc.hxx8
-rw-r--r--sw/inc/wdocsh.hxx8
-rw-r--r--sw/source/filter/xml/xmltble.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.cxx12
4 files changed, 16 insertions, 24 deletions
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 34a362e07a1b..6a81bd941cf2 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: globdoc.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: mib $ $Date: 2001-02-06 15:33:31 $
+ * last change: $Author: jp $ $Date: 2001-07-05 17:29:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,10 +76,6 @@ public:
SwGlobalDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
~SwGlobalDocShell();
- // Anforderung der pIo-Struktur fuer den Zugriff auf Substorages
- // und Streams
- virtual void FillRegInfo( SvEmbeddedRegistryInfo * );
-
virtual void FillClass( SvGlobalName * pClassName,
ULONG * pClipFormat,
String * pAppName,
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index b688dac9c6da..14f3884ca9c8 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wdocsh.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: mib $ $Date: 2001-02-06 15:33:31 $
+ * last change: $Author: jp $ $Date: 2001-07-05 17:29:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,10 +79,6 @@ public:
SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
~SwWebDocShell();
- // Anforderung der pIo-Struktur fuer den Zugriff auf Substorages
- // und Streams
- virtual void FillRegInfo( SvEmbeddedRegistryInfo * );
-
virtual void FillClass( SvGlobalName * pClassName,
ULONG * pClipFormat,
String * pAppName,
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index ce69e603449c..993a807468fa 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltble.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: mib $ $Date: 2001-06-28 14:37:44 $
+ * last change: $Author: jp $ $Date: 2001-07-05 17:28:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1094,14 +1094,14 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
// DDE command
const String sCmd = pDDEFldType->GetCmd();
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
- sCmd.GetToken(0, cTokenSeperator) );
+ sCmd.GetToken(0, so3::cTokenSeperator) );
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_ITEM,
- sCmd.GetToken(1, cTokenSeperator) );
+ sCmd.GetToken(1, so3::cTokenSeperator) );
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_TOPIC,
- sCmd.GetToken(2, cTokenSeperator) );
+ sCmd.GetToken(2, so3::cTokenSeperator) );
// auto update
- if (pDDEFldType->GetType() == LINKUPDATE_ALWAYS)
+ if (pDDEFldType->GetType() == so3::LINKUPDATE_ALWAYS)
{
AddAttribute( XML_NAMESPACE_OFFICE,
XML_AUTOMATIC_UPDATE, XML_TRUE );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index f15ad473135d..174b4757f767 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltbli.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: mib $ $Date: 2001-06-28 14:37:44 $
+ * last change: $Author: jp $ $Date: 2001-07-05 17:28:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1179,13 +1179,13 @@ SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
{
// make command string
String sCommand(pContext->GetDDEApplication());
- sCommand += cTokenSeperator;
+ sCommand += so3::cTokenSeperator;
sCommand += String(pContext->GetDDEItem());
- sCommand += cTokenSeperator;
+ sCommand += so3::cTokenSeperator;
sCommand += String(pContext->GetDDETopic());
- sal_uInt16 nType = pContext->GetIsAutomaticUpdate() ? LINKUPDATE_ALWAYS
- : LINKUPDATE_ONCALL;
+ sal_uInt16 nType = pContext->GetIsAutomaticUpdate() ? so3::LINKUPDATE_ALWAYS
+ : so3::LINKUPDATE_ONCALL;
String sName(pContext->GetConnectionName());