INTEGRATION: CWS xmlfilter02 (1.2.12); FILE MERGED

2007/11/14 12:57:46 hbrinkm 1.2.12.1: namespace clean up

8 files changed, 45 insertions, 37 deletions

diff --git a/writerfilter/source/doctok/WW8Annotation.cxx b/writerfilter/source/doctok/WW8Annotation.cxx
index 74b9aa0b4a69..a193fc7f28b6 100644
--- a/writerfilter/source/doctok/WW8Annotation.cxx
+++ b/writerfilter/source/doctok/WW8Annotation.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8Annotation.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:29 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:44:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,10 +35,11 @@
 
 #include <resources.hxx>
 
+namespace writerfilter {
 namespace doctok
 {
 rtl::OUString WW8ATRD::get_xstUsrInitl()
 {
     return getString(0x0);
 }
-}
+}}
diff --git a/writerfilter/source/doctok/WW8BinTable.hxx b/writerfilter/source/doctok/WW8BinTable.hxx
index adb603bd13e4..ecd9ec7395e0 100644
--- a/writerfilter/source/doctok/WW8BinTable.hxx
+++ b/writerfilter/source/doctok/WW8BinTable.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8BinTable.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:30 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:44:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -43,6 +43,7 @@
 #include <WW8FKP.hxx>
 #endif
 
+namespace writerfilter {
 namespace doctok
 {
 
@@ -93,6 +94,6 @@ public:
      */
     virtual string toString() const = 0;
 };
-}
+}}
 
 #endif // INCLUDED_WW8_BIN_TABLE_HXX
diff --git a/writerfilter/source/doctok/WW8BinTableImpl.cxx b/writerfilter/source/doctok/WW8BinTableImpl.cxx
index 4467be2b4c4b..beb4f6f0f880 100644
--- a/writerfilter/source/doctok/WW8BinTableImpl.cxx
+++ b/writerfilter/source/doctok/WW8BinTableImpl.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8BinTableImpl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:30 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:44:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,6 +35,7 @@
 
 #include "WW8BinTableImpl.hxx"
 
+namespace writerfilter {
 namespace doctok
 {
 using namespace ::std;
@@ -110,4 +111,4 @@ string WW8BinTableImpl::toString() const
 
     return aResult;
 }
-}
+}}
diff --git a/writerfilter/source/doctok/WW8BinTableImpl.hxx b/writerfilter/source/doctok/WW8BinTableImpl.hxx
index 9049de3193d5..18ed0b57872e 100644
--- a/writerfilter/source/doctok/WW8BinTableImpl.hxx
+++ b/writerfilter/source/doctok/WW8BinTableImpl.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8BinTableImpl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:30 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:44:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,6 +46,7 @@
 
 #include <hash_map>
 
+namespace writerfilter {
 namespace doctok
 {
 using namespace ::std;
@@ -104,6 +105,6 @@ public:
     virtual string toString() const;
 };
 
-}
+}}
 
 #endif // INCLUDED_WW8_BIN_TABLE_IMPL_HXX
diff --git a/writerfilter/source/doctok/WW8FKP.hxx b/writerfilter/source/doctok/WW8FKP.hxx
index 42b2c73257de..7dd05d5f8866 100644
--- a/writerfilter/source/doctok/WW8FKP.hxx
+++ b/writerfilter/source/doctok/WW8FKP.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8FKP.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:30 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:46:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -43,6 +43,7 @@
 #include <WW8StructBase.hxx>
 #endif
 
+namespace writerfilter {
 namespace doctok
 {
 
@@ -110,7 +111,7 @@ public:
 
        @param rFc   FC to look for
      */
-    virtual doctok::Reference<Properties>::Pointer_t
+    virtual writerfilter::Reference<Properties>::Pointer_t
     getProperties(const Fc & rFc)
         const = 0;
 };
@@ -135,6 +136,6 @@ public:
      */
     virtual WW8FKP::Pointer_t get(sal_uInt32 nPageNumber, bool bComplex) = 0;
 };
-}
+}}
 
 #endif // INCLUDED_WW8_FKP_HXX
diff --git a/writerfilter/source/doctok/WW8FontTable.cxx b/writerfilter/source/doctok/WW8FontTable.cxx
index 3ea4450ef446..0e193ce3b461 100644
--- a/writerfilter/source/doctok/WW8FontTable.cxx
+++ b/writerfilter/source/doctok/WW8FontTable.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8FontTable.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:31 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:47:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,6 +35,7 @@
 
 #include <resources.hxx>
 
+namespace writerfilter {
 namespace doctok {
 
 void WW8FontTable::initPayload()
@@ -69,10 +70,10 @@ sal_uInt32 WW8FontTable::getEntryCount()
     return entryOffsets.size() - 1;
 }
 
-doctok::Reference<Properties>::Pointer_t
+writerfilter::Reference<Properties>::Pointer_t
 WW8FontTable::getEntry(sal_uInt32 nIndex)
 {
-    doctok::Reference<Properties>::Pointer_t pResult;
+    writerfilter::Reference<Properties>::Pointer_t pResult;
 
     sal_uInt32 nCount = entryOffsets[nIndex + 1] - entryOffsets[nIndex];
 
@@ -83,7 +84,7 @@ WW8FontTable::getEntry(sal_uInt32 nIndex)
 
         pFont->setIndex(nIndex);
 
-        pResult = doctok::Reference<Properties>::Pointer_t(pFont);
+        pResult = writerfilter::Reference<Properties>::Pointer_t(pFont);
     }
 
     return pResult;
@@ -122,4 +123,4 @@ rtl::OUString WW8Font::get_altName()
     return rtl::OUString(pNew);
 }
 
-}
+}}
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx
index 202cdeb62bd9..e1bba55f589d 100644
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ b/writerfilter/source/doctok/WW8LFOTable.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8LFOTable.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:31 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:47:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,12 +36,13 @@
 /*
    $RCSfile: WW8LFOTable.cxx,v $
 
-   $Revision: 1.2 $
+   $Revision: 1.3 $
 
 */
 
 #include "resources.hxx"
 
+namespace writerfilter {
 namespace doctok {
 
 void WW8LFOTable::initPayload()
@@ -90,14 +91,14 @@ sal_uInt32 WW8LFOTable::getEntryCount()
     return getU32(0);
 }
 
-doctok::Reference<Properties>::Pointer_t
+writerfilter::Reference<Properties>::Pointer_t
 WW8LFOTable::getEntry(sal_uInt32 nIndex)
 {
     WW8LFO * pLFO = new WW8LFO(this, entryOffsets[nIndex]);
 
     pLFO->setIndex(nIndex);
 
-    return doctok::Reference<Properties>::Pointer_t(pLFO);
+    return writerfilter::Reference<Properties>::Pointer_t(pLFO);
 }
 
 sal_uInt32 WW8LFO::get_lfolevel_count()
@@ -105,7 +106,7 @@ sal_uInt32 WW8LFO::get_lfolevel_count()
     return get_clfolvl();
 }
 
-doctok::Reference<Properties>::Pointer_t
+writerfilter::Reference<Properties>::Pointer_t
 WW8LFO::get_lfolevel(sal_uInt32 nIndex)
 {
     WW8LFOTable * pLFOTable = dynamic_cast<WW8LFOTable *>(mpParent);
@@ -113,7 +114,7 @@ WW8LFO::get_lfolevel(sal_uInt32 nIndex)
     sal_uInt32 nPayloadOffset = pLFOTable->getPayloadOffset(nPayloadIndex);
     sal_uInt32 nPayloadSize = pLFOTable->getPayloadSize(nPayloadIndex);
 
-    return doctok::Reference<Properties>::Pointer_t
+    return writerfilter::Reference<Properties>::Pointer_t
         (new WW8LFOLevel(mpParent, nPayloadOffset, nPayloadSize));
 }
 
@@ -140,4 +141,4 @@ sal_uInt32 WW8LFOLevel::calcSize()
     return nResult;
 }
 
-}
+}}
diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx
index a04cc4e95ac6..769450dad373 100644
--- a/writerfilter/source/doctok/WW8ListTable.cxx
+++ b/writerfilter/source/doctok/WW8ListTable.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WW8ListTable.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:31 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:47:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,6 +35,7 @@
 
 #include <resources.hxx>
 
+namespace writerfilter {
 namespace doctok {
 
 void WW8ListTable::initPayload()
@@ -88,14 +89,14 @@ sal_uInt32 WW8ListTable::getEntryCount()
     return getU16(0);
 }
 
-doctok::Reference<Properties>::Pointer_t
+writerfilter::Reference<Properties>::Pointer_t
 WW8ListTable::getEntry(sal_uInt32 nIndex)
 {
     WW8List * pList = new WW8List(this, entryOffsets[nIndex]);
 
     pList->setIndex(nIndex);
 
-    return doctok::Reference<Properties>::Pointer_t
+    return writerfilter::Reference<Properties>::Pointer_t
         (pList);
 }
 
@@ -107,7 +108,7 @@ sal_uInt32 WW8List::get_listlevel_count()
     return 9;
 }
 
-doctok::Reference<Properties>::Pointer_t
+writerfilter::Reference<Properties>::Pointer_t
 WW8List::get_listlevel(sal_uInt32 nIndex)
 {
     WW8ListTable * pListTable = dynamic_cast<WW8ListTable *>(mpParent);
@@ -115,7 +116,7 @@ WW8List::get_listlevel(sal_uInt32 nIndex)
     sal_uInt32 nPayloadOffset = pListTable->getPayloadOffset(nPayloadIndex);
     sal_uInt32 nPayloadSize = pListTable->getPayloadSize(nPayloadIndex);
 
-    return doctok::Reference<Properties>::Pointer_t
+    return writerfilter::Reference<Properties>::Pointer_t
         (new WW8ListLevel(mpParent, nPayloadOffset, nPayloadSize));
 }
 
@@ -157,4 +158,4 @@ sal_uInt32 WW8ListLevel::calcSize()
 
     return nResult;
 }
-}
+}}