Wed Feb 6 07:42:06 PST 2013

Rebased ref, commits from common ancestor:
commit c1f5e74248928ba52b5089f6f39a9d3fb72b5e25
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Nov 7 09:30:48 2012 -0500

    Let's use a separate class to manage storage of cell text widths.
    
    Change-Id: I5c823dea4d2e1fd17fae466be26ebff2aa24ecb6

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 865f5f0..10605bf 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 	sc/source/core/data/bcaslot \
 	sc/source/core/data/cell \
 	sc/source/core/data/cell2 \
+	sc/source/core/data/celltextwidths \
 	sc/source/core/data/clipparam \
 	sc/source/core/data/column \
 	sc/source/core/data/column2 \
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index d146a98..455fdc8 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -38,7 +38,6 @@
 #include "scdllapi.h"
 
 #define USE_MEMPOOL
-#define TEXTWIDTH_DIRTY     0xffff
 
 // in addition to SCRIPTTYPE_... flags from scripttypeitem.hxx:
 // set (in nScriptType) if type has not been determined yet
diff --git a/sc/inc/celltextwidths.hxx b/sc/inc/celltextwidths.hxx
new file mode 100644
index 0000000..ef4499b
--- /dev/null
+++ b/sc/inc/celltextwidths.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __SC_CELLTEXTWIDTHS_HXX__
+#define __SC_CELLTEXTWIDTHS_HXX__
+
+#include "address.hxx"
+#include "sal/types.h"
+
+#include <mdds/multi_type_vector.hpp>
+#include <mdds/multi_type_vector_trait.hpp>
+
+class ScCellTextWidths
+{
+    typedef mdds::multi_type_vector<mdds::mtv::element_block_func> StoreType;
+    StoreType maStore;
+
+public:
+    static sal_uInt16 Dirty;
+
+    ScCellTextWidths();
+
+    sal_uInt16 get(SCROW nRow) const;
+    void set(SCROW nRow, sal_uInt16 nWidth);
+};
+
+#define TEXTWIDTH_DIRTY ScCellTextWidths::Dirty
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 0967e81..78cdd46 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -40,6 +40,7 @@
 #include "externalrefmgr.hxx"
 #include "macromgr.hxx"
 #include "dbdata.hxx"
+#include "celltextwidths.hxx"
 
 #include <editeng/editobj.hxx>
 #include <svl/intitem.hxx>
diff --git a/sc/source/core/data/celltextwidths.cxx b/sc/source/core/data/celltextwidths.cxx
new file mode 100644
index 0000000..39240d3
--- /dev/null
+++ b/sc/source/core/data/celltextwidths.cxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "celltextwidths.hxx"
+
+sal_uInt16 ScCellTextWidths::Dirty = 0xFFFF;
+
+ScCellTextWidths::ScCellTextWidths() :
+    maStore(MAXROWCOUNT) {}
+
+sal_uInt16 ScCellTextWidths::get(SCROW nRow) const
+{
+    switch (maStore.get_type(nRow))
+    {
+        case mdds::mtv::element_type_ushort:
+            return maStore.get<unsigned short>(nRow);
+        default:
+            ;
+    }
+    return Dirty;
+}
+
+void ScCellTextWidths::set(SCROW nRow, sal_uInt16 nWidth)
+{
+    // We only use unsigned short type in this container.
+    maStore.set(nRow, static_cast<unsigned short>(nWidth));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 682a7bb..b8b1b84 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -29,6 +29,7 @@
 #include "markdata.hxx"
 #include "detfunc.hxx"          // for Notes in Sort/Swap
 #include "postit.hxx"
+#include "celltextwidths.hxx"
 
 #include <svl/poolcach.hxx>
 #include <svl/zforlist.hxx>
@@ -36,8 +37,6 @@
 
 #include <cstring>
 #include <map>
-#include <mdds/multi_type_vector.hpp>
-#include <mdds/multi_type_vector_trait.hpp>
 
 using ::editeng::SvxBorderLine;
 using namespace formula;
@@ -57,11 +56,7 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 
 struct ScColumnImpl
 {
-    typedef mdds::multi_type_vector<mdds::mtv::element_block_func> TextWidthType;
-
-    TextWidthType maTextWidths;
-
-    ScColumnImpl() : maTextWidths(MAXROWCOUNT) {}
+    ScCellTextWidths maTextWidths;
 };
 
 ScNeededSizeOptions::ScNeededSizeOptions() :
@@ -2296,14 +2291,7 @@ bool ScColumn::SearchStyleRange(
 
 sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
 {
-    switch (mpImpl->maTextWidths.get_type(nRow))
-    {
-        case mdds::mtv::element_type_ushort:
-            return mpImpl->maTextWidths.get<unsigned short>(nRow);
-        default:
-            ;
-    }
-    return TEXTWIDTH_DIRTY;
+    return mpImpl->maTextWidths.get(nRow);
 }
 
 void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 134fdf3..dda01d7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -85,6 +85,7 @@
 #include "dpobject.hxx"
 #include "docuno.hxx"
 #include "scresid.hxx"
+#include "celltextwidths.hxx"
 
 #define GET_SCALEVALUE(set,id)  ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 446686e..49083b7 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -44,6 +44,7 @@
 #include "dbdata.hxx"
 #include "colorscale.hxx"
 #include "conditio.hxx"
+#include "celltextwidths.hxx"
 
 #include <vector>
 
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index ffbda84..0e9a81d 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -36,6 +36,8 @@
 #include "tabprotection.hxx"
 #include "globstr.hrc"
 #include "segmenttree.hxx"
+#include "celltextwidths.hxx"
+
 #include <com/sun/star/sheet/TablePageBreakData.hpp>
 
 #include <algorithm>
commit 2ca47d7e7d23660518cabe7eaefee0bf005f2fa4
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 22:08:42 2012 -0500

    Add accessor methods for text widths using mdds::multi_type_vector.
    
    We only use unsigned short and empty types in this container.  Empty type
    represents empty cells whereas unsigned short type represents non-empty
    cells.
    
    Change-Id: Id9b6e0941fdfabc48fc8bb2aa6479f466270381c

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4a64616..682a7bb 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -36,6 +36,8 @@
 
 #include <cstring>
 #include <map>
+#include <mdds/multi_type_vector.hpp>
+#include <mdds/multi_type_vector_trait.hpp>
 
 using ::editeng::SvxBorderLine;
 using namespace formula;
@@ -55,6 +57,11 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 
 struct ScColumnImpl
 {
+    typedef mdds::multi_type_vector<mdds::mtv::element_block_func> TextWidthType;
+
+    TextWidthType maTextWidths;
+
+    ScColumnImpl() : maTextWidths(MAXROWCOUNT) {}
 };
 
 ScNeededSizeOptions::ScNeededSizeOptions() :
@@ -2287,5 +2294,22 @@ bool ScColumn::SearchStyleRange(
         return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, NULL );
 }
 
+sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
+{
+    switch (mpImpl->maTextWidths.get_type(nRow))
+    {
+        case mdds::mtv::element_type_ushort:
+            return mpImpl->maTextWidths.get<unsigned short>(nRow);
+        default:
+            ;
+    }
+    return TEXTWIDTH_DIRTY;
+}
+
+void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
+{
+    // We only use unsigned short type in this container.
+    mpImpl->maTextWidths.set(nRow, static_cast<unsigned short>(nWidth));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index b764155..df5c172 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1956,13 +1956,4 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
     return nStringLen;
 }
 
-sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
-{
-    return 0;
-}
-
-void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2f83663006e1d7cd4cf4a1f7edfe417e5e68dfab
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 19:17:19 2012 -0500

    Re-order the header includes. Make sure column.hxx comes first.
    
    Change-Id: I9f93724c4e0b565a9148d0893feda9e82109bff7

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 12d22d1..4a64616 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -17,15 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <map>
-
-#include <svl/poolcach.hxx>
-#include <svl/zforlist.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <string.h>
-
-#include "scitems.hxx"
 #include "column.hxx"
+#include "scitems.hxx"
 #include "cell.hxx"
 #include "document.hxx"
 #include "docpool.hxx"
@@ -37,6 +30,13 @@
 #include "detfunc.hxx"          // for Notes in Sort/Swap
 #include "postit.hxx"
 
+#include <svl/poolcach.hxx>
+#include <svl/zforlist.hxx>
+#include <editeng/scripttypeitem.hxx>
+
+#include <cstring>
+#include <map>
+
 using ::editeng::SvxBorderLine;
 using namespace formula;
 
commit b76d21228dbd7e769f816b5e5549752bb554a32c
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 19:15:11 2012 -0500

    Let's start using impl class for ScColumn.
    
    No need to migrate the existing data members to it for now, but let's
    define new members in the impl class from now on.
    
    Change-Id: Idee66dae87beb4bb6efc9c7d7ffd658148ed887c

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8653bfd..39f9753 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -58,6 +58,7 @@ struct ScMergePatternState;
 class ScFlatBoolRowSegments;
 struct ScSetStringParam;
 struct ScColWidthParam;
+struct ScColumnImpl;
 
 struct ScNeededSizeOptions
 {
@@ -79,6 +80,8 @@ struct ColEntry
 class ScColumn
 {
 private:
+    ScColumnImpl* mpImpl;
+
     SCCOL           nCol;
     SCTAB           nTab;
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index e9e829c..12d22d1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -40,6 +40,8 @@
 using ::editeng::SvxBorderLine;
 using namespace formula;
 
+namespace {
+
 inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 {
     //! move to a header file
@@ -49,12 +51,19 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
              nScript != 0 );
 }
 
+}
+
+struct ScColumnImpl
+{
+};
+
 ScNeededSizeOptions::ScNeededSizeOptions() :
     pPattern(NULL), bFormula(false), bSkipMerged(true), bGetFont(true), bTotalSize(false)
 {
 }
 
 ScColumn::ScColumn() :
+    mpImpl(new ScColumnImpl),
     nCol( 0 ),
     pAttrArray( NULL ),
     pDocument( NULL )
commit c6f6edaa46d28ee223569288ab372dabd6d23c2f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 19:07:08 2012 -0500

    Use initializer to initialize data members.
    
    Change-Id: I912cede3a240ccd4e1cc94be46c7dfee36a85af6

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e3e34d5..8653bfd 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -67,14 +67,7 @@ struct ScNeededSizeOptions
     bool                bGetFont;
     bool                bTotalSize;
 
-    ScNeededSizeOptions()
-    {
-        pPattern = NULL;
-        bFormula = false;
-        bSkipMerged = true;
-        bGetFont = true;
-        bTotalSize = false;
-    }
+    ScNeededSizeOptions();
 };
 
 struct ColEntry
@@ -83,7 +76,6 @@ struct ColEntry
     ScBaseCell* pCell;
 };
 
-
 class ScColumn
 {
 private:
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9fdfce6..e9e829c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -49,6 +49,11 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
              nScript != 0 );
 }
 
+ScNeededSizeOptions::ScNeededSizeOptions() :
+    pPattern(NULL), bFormula(false), bSkipMerged(true), bGetFont(true), bTotalSize(false)
+{
+}
+
 ScColumn::ScColumn() :
     nCol( 0 ),
     pAttrArray( NULL ),
commit 81b094f9f4bc83c19b9bb72f86012fbcc5292f86
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 17:17:22 2012 -0500

    Make ScColumn explicitly non-copyable.
    
    Change-Id: I0e3f552f8ed8a57f399ba9e01c06a23d9a9da854

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 5ed130b..e3e34d5 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -107,6 +107,9 @@ friend class ScCellIterator;
 friend class ScHorizontalCellIterator;
 friend class ScHorizontalAttrIterator;
 
+    ScColumn(const ScColumn&); // disabled
+    ScColumn& operator= (const ScColumn&); // disabled
+
 public:
                 ScColumn();
                 ~ScColumn();
commit f0f383173e7a4181379a36c91a498dcfb46571d9
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 17:14:54 2012 -0500

    Add empty GetTextWidth() to ScColumn. Will be implemented later.
    
    Change-Id: I4df0719fee426ab5d54bfc2ac8fa4c37325906e2

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 392b08d..5ed130b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -376,6 +376,7 @@ public:
     xub_StrLen  GetMaxNumberStringLen( sal_uInt16& nPrecision,
                                        SCROW nRowStart, SCROW nRowEnd ) const;
 
+    sal_uInt16 GetTextWidth(SCROW nRow) const;
     void SetTextWidth(SCROW nRow, sal_uInt16 nWidth);
 
 private:
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index dc11a28..b764155 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1956,6 +1956,11 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
     return nStringLen;
 }
 
+sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
+{
+    return 0;
+}
+
 void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
 {
 }
commit a71ec8d5dc2a712bc64dd0e81420c057779492a7
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 16:13:37 2012 -0500

    Identify all places that modify the cell array & call CellStorageModified().
    
    CellStorageModified() is empty at the moment.
    
    Change-Id: I9498b4d7819bba1778cbab644e7b46ce25d66ae4

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 390d953..392b08d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -376,6 +376,8 @@ public:
     xub_StrLen  GetMaxNumberStringLen( sal_uInt16& nPrecision,
                                        SCROW nRowStart, SCROW nRowEnd ) const;
 
+    void SetTextWidth(SCROW nRow, sal_uInt16 nWidth);
+
 private:
     ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos) const;
 
@@ -383,8 +385,10 @@ private:
     SCROW FindNextVisibleRow(SCROW nRow, bool bForward) const;
 
     /**
-     * Called whenever the state of cell array gets modified i.e. a new cell
-     * is inserted, a cell is moved or removed, cells are swapped, and so on.
+     * Called whenever the state of cell array gets modified i.e. new cell
+     * insertion, cell removal or relocation, cell value update and so on.
+     *
+     * Call this only from those methods where maItems is modified directly.
      */
     void CellStorageModified();
 };
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d803755..9fdfce6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -790,14 +790,14 @@ void lclTakeBroadcaster( ScBaseCell*& rpCell, SvtBroadcaster* pBC )
 
 void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 {
+    if (nRow1 == nRow2)
+        // Nothing to swap.
+        return;
+
     /*  Simple swap of cell pointers does not work if broadcasters exist (crash
         if cell broadcasts directly or indirectly to itself). While swapping
         the cells, broadcasters have to remain at old positions! */
 
-    /*  While cloning cells, do not clone notes, but move note pointers to new
-        cells. This prevents creation of new caption drawing objects for every
-        swap operation while sorting. */
-
     ScBaseCell* pCell1 = 0;
     SCSIZE nIndex1;
     if ( Search( nRow1, nIndex1 ) )
@@ -847,6 +847,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
             SvtBroadcaster* pBC2 = pCell2->ReleaseBroadcaster();
             pCell1->TakeBroadcaster( pBC2 );
             pCell2->TakeBroadcaster( pBC1 );
+
+            CellStorageModified();
         }
         else
         {
@@ -855,11 +857,13 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
             {
                 // insert dummy note cell (without note) containing old broadcaster
                 maItems[nIndex1].pCell = pDummyCell;
+                CellStorageModified();
             }
             else
             {
                 // remove ColEntry at old position
                 maItems.erase( maItems.begin() + nIndex1 );
+                CellStorageModified();
             }
 
             // insert ColEntry at new position
@@ -907,8 +911,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
     }
 
     /*  Create clone of pCell1 at position of pCell2 (pCell1 exists always, see
-        variable swapping above). Do not clone the note, but move pointer of
-        old note to new cell. */
+        variable swapping above).*/
     ScBaseCell* pNew2 = pCell1->Clone( *pDocument, aPos2, SC_CLONECELL_ADJUST3DREL );
 
     /*  Create clone of pCell2 at position of pCell1. Do not clone the note,
@@ -968,7 +971,10 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
     {
         // Tauschen
         maItems[nIndex1].pCell = pCell2;
+        CellStorageModified();
         rCol.maItems[nIndex2].pCell = pCell1;
+        rCol.CellStorageModified();
+
         // Referenzen aktualisieren
         SCsCOL dx = rCol.nCol - nCol;
         if ( pFmlaCell1 )
@@ -990,6 +996,8 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
     {
         // Loeschen
         maItems.erase(maItems.begin() + nIndex1);
+        CellStorageModified();
+
         // Referenzen aktualisieren
         SCsCOL dx = rCol.nCol - nCol;
         if ( pFmlaCell1 )
@@ -1145,6 +1153,8 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
     }
 
     pDocument->SetAutoCalc( bOldAutoCalc );
+
+    CellStorageModified();
 }
 
 
@@ -1540,6 +1550,8 @@ void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const
 void ScColumn::SwapCol(ScColumn& rCol)
 {
     maItems.swap(rCol.maItems);
+    CellStorageModified();
+    rCol.CellStorageModified();
 
     ScAttrArray* pTempAttr = rCol.pAttrArray;
     rCol.pAttrArray = pAttrArray;
@@ -1632,9 +1644,11 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol)
             }
             // Erase the slots containing pointers to the dummy cell instance.
             maItems.erase(maItems.begin() + nStartPos, maItems.begin() + nStopPos);
+            CellStorageModified();
         }
         pNoteCell->Delete(); // Delete the dummy cell instance.
     }
+
 }
 
 bool ScColumn::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
@@ -1775,6 +1789,7 @@ void ScColumn::UpdateInsertTabOnlyCells(SCTAB nInsPos, SCTAB nNewSheets)
             {
                 ScEditCell* p = static_cast<ScEditCell*>(maItems[i].pCell);
                 p->UpdateFields(nTab);
+                SetTextWidth(maItems[i].nRow, TEXTWIDTH_DIRTY);
             }
             break;
             default:
@@ -1805,6 +1820,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nNewPos)
             {
                 ScEditCell* p = static_cast<ScEditCell*>(maItems[i].pCell);
                 p->UpdateFields(nTab);
+                SetTextWidth(maItems[i].nRow, TEXTWIDTH_DIRTY);
             }
             break;
             default:
@@ -1854,6 +1870,7 @@ void ScColumn::UpdateDeleteTab(SCTAB nDelPos, bool bIsMove, ScColumn* pRefUndo,
             {
                 ScEditCell* p = static_cast<ScEditCell*>(maItems[i].pCell);
                 p->UpdateFields(nTab);
+                SetTextWidth(maItems[i].nRow, TEXTWIDTH_DIRTY);
             }
             break;
             default:
@@ -1886,6 +1903,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
             {
                 ScEditCell* p = static_cast<ScEditCell*>(maItems[i].pCell);
                 p->UpdateFields(nTab);
+                SetTextWidth(maItems[i].nRow, TEXTWIDTH_DIRTY);
             }
             break;
             default:
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 043cec9..dc11a28 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -87,12 +87,14 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
             }
             pOldCell->Delete();
             maItems[nIndex].pCell = pNewCell;
+            CellStorageModified();
         }
         else
         {
             maItems.insert(maItems.begin() + nIndex, ColEntry());
             maItems[nIndex].pCell = pNewCell;
             maItems[nIndex].nRow  = nRow;
+            CellStorageModified();
         }
     }
     // Bei aus Clipboard sind hier noch falsche (alte) Referenzen!
@@ -136,6 +138,8 @@ void ScColumn::Append( SCROW nRow, ScBaseCell* pCell )
     maItems.push_back(ColEntry());
     maItems.back().pCell = pCell;
     maItems.back().nRow  = nRow;
+
+    CellStorageModified();
 }
 
 
@@ -162,6 +166,8 @@ void ScColumn::Delete( SCROW nRow )
         }
         pCell->EndListeningTo( pDocument );
         pCell->Delete();
+
+        CellStorageModified();
     }
 }
 
@@ -177,6 +183,8 @@ void ScColumn::DeleteAtIndex( SCSIZE nIndex )
     maItems.erase(maItems.begin() + nIndex);
     pCell->EndListeningTo( pDocument );
     pCell->Delete();
+
+    CellStorageModified();
 }
 
 
@@ -185,6 +193,8 @@ void ScColumn::FreeAll()
     for (SCSIZE i = 0; i < maItems.size(); i++)
         maItems[i].pCell->Delete();
     maItems.clear();
+
+    CellStorageModified();
 }
 
 
@@ -481,6 +491,7 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDe
         if (bRemoved)
             nShift += maItems.size() - nStartSegment;
         maItems.erase(maItems.end() - nShift, maItems.end());
+        CellStorageModified();
     }
 
     // *** delete all formula cells ***
@@ -1408,8 +1419,11 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                     if ( i >= maItems.size() || maItems[i].nRow != nRow )
                         Search(nRow, i);
                 }
+
                 pOldCell->Delete();
                 maItems[i].pCell = pNewCell;         // ersetzen
+                CellStorageModified();
+
                 if ( pNewCell->GetCellType() == CELLTYPE_FORMULA )
                 {
                     pNewCell->StartListeningTo( pDocument );
@@ -1631,6 +1645,8 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow )
                         maItems[nIndex].pCell = new ScStringCell( aString );
                     }
                     delete pFormula;
+
+                    CellStorageModified();
                 }
                 ++nIndex;
             }
@@ -1940,4 +1956,8 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
     return nStringLen;
 }
 
+void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
+{
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c9ee24c35ebe29fbec7090a7e0901de931c0be5a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 14:00:54 2012 -0500

    Rename ScColumn::Resize() to ReserveSize().
    
    The new name is more aligned with what it actually does.
    
    Change-Id: I703e20253fe5957c775026d8d08f2906f2d7889c

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7ed545a..390d953 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -121,7 +121,7 @@ public:
     void        Delete( SCROW nRow );
     void        DeleteAtIndex( SCSIZE nIndex );
     void        FreeAll();
-    void        Resize( SCSIZE nSize );
+    void ReserveSize( SCSIZE nSize );
     void        SwapRow( SCROW nRow1, SCROW nRow2 );
     void        SwapCell( SCROW nRow, ScColumn& rCol);
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index f29dc2d..d803755 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -760,8 +760,7 @@ ScBaseCell* ScColumn::GetCell( SCROW nRow ) const
     return NULL;
 }
 
-
-void ScColumn::Resize( SCSIZE nSize )
+void ScColumn::ReserveSize( SCSIZE nSize )
 {
     if (nSize > sal::static_int_cast<SCSIZE>(MAXROWCOUNT))
         nSize = MAXROWCOUNT;
@@ -1178,7 +1177,7 @@ void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, bool bKee
 
     if (nBlockCount)
     {
-        rColumn.Resize( rColumn.GetCellCount() + nBlockCount );
+        rColumn.ReserveSize(rColumn.GetCellCount() + nBlockCount);
         ScAddress aOwnPos( nCol, 0, nTab );
         ScAddress aDestPos( rColumn.nCol, 0, rColumn.nTab );
         for (i = nStartIndex; i <= nEndIndex; i++)
@@ -1368,7 +1367,7 @@ void ScColumn::CopyToColumn(
 
         if (nBlockCount)
         {
-            rColumn.Resize( rColumn.GetCellCount() + nBlockCount );
+            rColumn.ReserveSize(rColumn.GetCellCount() + nBlockCount);
             ScAddress aDestPos( rColumn.nCol, 0, rColumn.nTab );
             for (i = nStartIndex; i <= nEndIndex; i++)
             {
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 1e0ce3c..043cec9 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -681,7 +681,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
         //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen"
         //! einzeln ausgewaehlt werden koennen!
 
-        Resize( maItems.size() + static_cast<SCSIZE>(nRow2-nRow1+1) );
+        ReserveSize(maItems.size() + static_cast<SCSIZE>(nRow2-nRow1+1));
 
         ScAddress aDestPos( nCol, 0, nTab );        // Row wird angepasst
 
@@ -715,8 +715,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
         //! Always do the Resize from the outside, where the number of repetitions is known
         //! (then it can be removed here)
 
-        SCSIZE nNew = maItems.size() + nColCount;
-        Resize( nNew );
+        ReserveSize(maItems.size() + nColCount);
     }
 
     sal_Bool bAtEnd = false;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index a04dece..446686e 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1868,7 +1868,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable)
 void ScTable::DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd )
 {
     for (SCCOL nCol=nCol1; nCol<=nCol2; nCol++)
-        aCol[nCol].Resize(aCol[nCol].GetCellCount() + nAdd);
+        aCol[nCol].ReserveSize(aCol[nCol].GetCellCount() + nAdd);
 }
 
 void ScTable::SetRepeatColRange( const ScRange* pNew )
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 00aa1c3..38adeb8 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -694,7 +694,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     nInc,nMinDigits, pListData,nListIndex);
 
         if (bVertical)
-            aCol[nCol].Resize( aCol[nCol].GetCellCount() + nFillCount );
+            aCol[nCol].ReserveSize(aCol[nCol].GetCellCount() + nFillCount);
 
         if (pListData)
         {
@@ -1389,7 +1389,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         ScBaseCell* pSrcCell = aCol[nCol].GetCell(static_cast<SCROW>(nRow));
 
         if (bVertical && bAttribs)
-            aCol[nCol].Resize( aCol[nCol].GetCellCount() + nFillCount );
+            aCol[nCol].ReserveSize(aCol[nCol].GetCellCount() + nFillCount);
 
         if (bAttribs)
         {
commit d99d40015ed686d5585ed355cc8338bbc6e0af6a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 6 13:53:57 2012 -0500

    Redundant use of 'public' modifier.
    
    Plus added a new method that will get called whenever cell array
    state changes.  It's not used yet.
    
    Change-Id: I96719db0460bfb72d8dbe98a80a3880d8f279c33

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f6dff3b..7ed545a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -347,7 +347,6 @@ public:
         SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight, OutputDevice* pDev,
         double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY,
         bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart) const;
-public:
 
                 /// Including current, may return -1
     SCsROW      GetNextUnprotected( SCROW nRow, bool bUp ) const;
@@ -382,6 +381,12 @@ private:
 
     SCROW FindNextVisibleRowWithContent(SCROW nRow, bool bForward) const;
     SCROW FindNextVisibleRow(SCROW nRow, bool bForward) const;
+
+    /**
+     * Called whenever the state of cell array gets modified i.e. a new cell
+     * is inserted, a cell is moved or removed, cells are swapped, and so on.
+     */
+    void CellStorageModified();
 };
 
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5f30ebd..2f4f87a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1389,6 +1389,10 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, bool bForward) const
     }
 }
 
+void ScColumn::CellStorageModified()
+{
+}
+
 void ScColumn::FindDataAreaPos(SCROW& rRow, bool bDown) const
 {
     // check if we are in a data area
commit 765aca651a3d53b14dc3bfac0d05b36d4f01dbb4
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Feb 6 09:31:56 2013 -0500

    API CHANGE: unpublish com.sun.star.document.MediaDescriptor.
    
    This is a service that basically describes the properties passed to
    loadComponentFromURL and possibly other load/save related APIs.  As
    some properties get deprecated (some already have), new ones added as
    the loading processs gets re-worked (including the type detection
    process), we need the flexibility to change its property set.
    
    Since all properties described here are optional, leaving it published
    would make little sense.
    
    Change-Id: I59384e62c7b6ab5c599141c8fc73a37c8bfe56e7

diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index b99a3d4..417f6f1 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -53,7 +53,7 @@ module com { module sun { module star { module document {
 
     @see com::sun::star::beans::PropertyValue
  */
-published service MediaDescriptor
+service MediaDescriptor
 {
     /** May be set by filters or detection services if user has chosen to
         abort loading/saving, e.g. while entering a password.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 75de5a2..9b696b6 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit 83a65d8b5c8eca89c63d8c917caa72bcc5b7ef16
Author: Andras Timar <atimar at suse.com>
Date:   Wed Feb 6 15:11:50 2013 +0100

    remove obsolete no_localization files
    
    Change-Id: Ib6e570a9f409a4700b73da133c57628e9c10eeb1

diff --git a/configmgr/qa/unit/no_localization b/configmgr/qa/unit/no_localization
deleted file mode 100755
index e69de29..0000000
diff --git a/desktop/test/no_localization b/desktop/test/no_localization
deleted file mode 100644
index 6cd356d..0000000
--- a/desktop/test/no_localization
+++ /dev/null
@@ -1 +0,0 @@
-Touch me to prevent that the localisation process extracts strings #i85733#
diff --git a/odk/no_localization b/odk/no_localization
deleted file mode 100644
index 3ce3aa0..0000000
--- a/odk/no_localization
+++ /dev/null
@@ -1 +0,0 @@
-Touch me to prevent that the localisation process extracts strings #i85733# 
commit 4623d5c0f56bfa3e18a80b18f2cf1dddf5864aaf
Author: Andras Timar <atimar at suse.com>
Date:   Wed Feb 6 15:12:43 2013 +0100

    Updated core
    Project: help  46d83d5e6cc036c9ec5cad7d3d0d285d6b04dc33

diff --git a/helpcontent2 b/helpcontent2
index a35db52..46d83d5 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a35db526f704f87c082cba926ccb3559bb2d561d
+Subproject commit 46d83d5e6cc036c9ec5cad7d3d0d285d6b04dc33
commit 39518d155ea31e57cb9d01af7c0a49ddc0caa6d9
Author: Andras Timar <atimar at suse.com>
Date:   Wed Feb 6 13:28:07 2013 +0100

    remove a useless PMD report, possibly checked in by mistake
    
    Change-Id: Ia3ce43629346c6c705ea6f0aff8e3002b420913b

diff --git a/formula/util/hh.html b/formula/util/hh.html
deleted file mode 100644
index bf2b04a..0000000
--- a/formula/util/hh.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<html><head><title>PMD</title></head><body>
-<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align="center" cellspacing="0" cellpadding="3"><tr>
-<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">1</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">222</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">2</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">346</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">3</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">368</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">4</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">387</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">5</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">407</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">6</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">410</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">7</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">415</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">8</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\SDBCReportDataFactory.java</td>
-<td align="center" width="5%">468</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">9</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\StorageRepository.java</td>
-<td align="center" width="5%">149</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">10</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\StorageRepository.java</td>
-<td align="center" width="5%">332</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">11</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFormulaParser.java</td>
-<td align="center" width="5%">210</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">12</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFormulaParser.java</td>
-<td align="center" width="5%">213</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">13</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFormulaParser.java</td>
-<td align="center" width="5%">359</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#UnnecessaryFinalModifier">Unnecessary final modifier in final class</a></td>
-</tr>
-<tr> 
-<td align="center">14</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFormulaParser.java</td>
-<td align="center" width="5%">364</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#UnnecessaryFinalModifier">Unnecessary final modifier in final class</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">15</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFunctionManager.java</td>
-<td align="center" width="5%">172</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">16</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOFunctionManager.java</td>
-<td align="center" width="5%">193</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">17</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\SOReportJobFactory.java</td>
-<td align="center" width="5%">355</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">18</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\AbstractReportElementLayoutController.java</td>
-<td align="center" width="5%">243</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">19</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\ObjectOleLayoutController.java</td>
-<td align="center" width="5%">77</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">20</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\ObjectOleLayoutController.java</td>
-<td align="center" width="5%">110</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">21</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\TableCellLayoutController.java</td>
-<td align="center" width="5%">83</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">22</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\TableCellLayoutController.java</td>
-<td align="center" width="5%">151</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">23</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\layoutprocessor\TableCellLayoutController.java</td>
-<td align="center" width="5%">171</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">24</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\output\ImageProducer.java</td>
-<td align="center" width="5%">315</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">25</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\output\StyleUtilities.java</td>
-<td align="center" width="5%">271</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr> 
-<td align="center">26</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\output\text\TextRawReportTarget.java</td>
-<td align="center" width="5%">363</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">Avoid empty catch blocks</a></td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td align="center">27</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\output\text\TextRawReportTarget.java</td>
-<td align="center" width="5%">659</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#CollapsibleIfStatements">These nested if statements could be combined</a></td>
-</tr>
-<tr> 
-<td align="center">28</td>
-<td width="*%">D:\src\cws\frmdlg\reportdesign\java\com\sun\star\report\pentaho\output\text\TextRawReportTarget.java</td>
-<td align="center" width="5%">1389</td>
-<td width="*"><a href="http://pmd.sourceforge.net/rules/basic.html#CollapsibleIfStatements">These nested if statements could be combined</a></td>
-</tr>
-</table><hr/><center><h3>Processing errors</h3></center><table align="center" cellspacing="0" cellpadding="3"><tr>
-<th>File</th><th>Problem</th></tr>
-<tr bgcolor="lightgrey"> 
-<td>D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_dummy.java</td>
-<td>Error while parsing D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_dummy.java</td>
-</tr>
-<tr> 
-<td>D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_metadata_dummy.java</td>
-<td>Error while parsing D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_metadata_dummy.java</td>
-</tr>
-<tr bgcolor="lightgrey"> 
-<td>D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_util_dummy.java</td>
-<td>Error while parsing D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\rpt_java_css_util_dummy.java</td>
-</tr>
-<tr> 
-<td>D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\sun-report-builder_dummy.java</td>
-<td>Error while parsing D:\src\cws\frmdlg\reportdesign\wntmsci12\misc\sun-report-builder_dummy.java</td>
-</tr>
-</table></body></html>
commit 5acf58bbde3f872cf8b33bef689f624e85be4481
Author: Andras Timar <atimar at suse.com>
Date:   Wed Feb 6 13:21:09 2013 +0100

    remove obsolete hidother.src files
    
    Change-Id: Ieb30afd81d16d184e0276ce7699b848f26a00013

diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src
deleted file mode 100644
index 989c477..0000000
--- a/chart2/source/controller/dialogs/hidother.src
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "HelpIds.hrc"
-
-hidspecial HID_SCH_CB_XAXIS {HelpId= HID_SCH_CB_XAXIS; };
-hidspecial HID_SCH_CB_YAXIS {HelpId= HID_SCH_CB_YAXIS; };
-hidspecial HID_SCH_CB_ZAXIS {HelpId= HID_SCH_CB_ZAXIS; };
-hidspecial HID_SCH_CB_SECONDARY_XAXIS {HelpId= HID_SCH_CB_SECONDARY_XAXIS; };
-hidspecial HID_SCH_CB_SECONDARY_YAXIS {HelpId= HID_SCH_CB_SECONDARY_YAXIS; };
-hidspecial HID_SCH_CB_SECONDARY_ZAXIS {HelpId= HID_SCH_CB_SECONDARY_ZAXIS; };
-
-hidspecial HID_SCH_CB_XGRID {HelpId= HID_SCH_CB_XGRID; };
-hidspecial HID_SCH_CB_YGRID {HelpId= HID_SCH_CB_YGRID; };
-hidspecial HID_SCH_CB_ZGRID {HelpId= HID_SCH_CB_ZGRID; };
-hidspecial HID_SCH_CB_SECONDARY_XGRID {HelpId= HID_SCH_CB_SECONDARY_XGRID; };
-hidspecial HID_SCH_CB_SECONDARY_YGRID {HelpId= HID_SCH_CB_SECONDARY_YGRID; };
-hidspecial HID_SCH_CB_SECONDARY_ZGRID {HelpId= HID_SCH_CB_SECONDARY_ZGRID; };
-
-hidspecial HID_SCH_CT_INDICATE {HelpId= HID_SCH_CT_INDICATE; };
-
-hidspecial HID_SCH_STATISTIK_MEANVALUE {HelpId= HID_SCH_STATISTIK_MEANVALUE; };
-hidspecial HID_SCH_STATISTIK_NO_ERROR {HelpId= HID_SCH_STATISTIK_NO_ERROR; };
-hidspecial HID_SCH_STATISTIK_VARIANT {HelpId= HID_SCH_STATISTIK_VARIANT; };
-hidspecial HID_SCH_STATISTIK_SIGMA {HelpId= HID_SCH_STATISTIK_SIGMA; };
-hidspecial HID_SCH_STATISTIK_PERCENT {HelpId= HID_SCH_STATISTIK_PERCENT; };
-hidspecial HID_SCH_STATISTIK_FUNCTION {HelpId= HID_SCH_STATISTIK_FUNCTION; };
-hidspecial HID_SCH_STATISTIK_RANGE {HelpId= HID_SCH_STATISTIK_RANGE; };
-hidspecial HID_SCH_STATISTIK_FUNCTION_LB {HelpId= HID_SCH_STATISTIK_FUNCTION_LB; };
-hidspecial HID_SCH_STATISTIK_POSITIVE_VALUE {HelpId= HID_SCH_STATISTIK_POSITIVE_VALUE; };
-hidspecial HID_SCH_STATISTIK_POSITIVE_RANGE {HelpId= HID_SCH_STATISTIK_POSITIVE_RANGE; };
-hidspecial HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER {HelpId= HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER; };
-hidspecial HID_SCH_STATISTIK_NEGATIVE_VALUE {HelpId= HID_SCH_STATISTIK_NEGATIVE_VALUE; };
-hidspecial HID_SCH_STATISTIK_NEGATIVE_RANGE {HelpId= HID_SCH_STATISTIK_NEGATIVE_RANGE; };
-hidspecial HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER {HelpId= HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER; };
-hidspecial HID_SCH_STATISTIK_SAME_FOR_BOTH {HelpId= HID_SCH_STATISTIK_SAME_FOR_BOTH; };
-hidspecial HID_SCH_STATISTIK_SHOW_BOTH {HelpId= HID_SCH_STATISTIK_SHOW_BOTH; };
-hidspecial HID_SCH_STATISTIK_SHOW_POSITIVE {HelpId= HID_SCH_STATISTIK_SHOW_POSITIVE; };
-hidspecial HID_SCH_STATISTIK_SHOW_NEGATIVE {HelpId= HID_SCH_STATISTIK_SHOW_NEGATIVE; };
-hidspecial HID_SCH_STATISTIK_BIGERROR {HelpId= HID_SCH_STATISTIK_BIGERROR; };
-hidspecial HID_SCH_STATISTIK_CONSTERROR {HelpId= HID_SCH_STATISTIK_CONSTERROR; };
-hidspecial HID_SCH_STATISTIK_PERCENT_VALUE {HelpId= HID_SCH_STATISTIK_PERCENT_VALUE; };
-hidspecial HID_SCH_STATISTIK_BIGERROR_VALUE {HelpId= HID_SCH_STATISTIK_BIGERROR_VALUE; };
-hidspecial HID_SCH_STATISTIK_PLUS_VALUE {HelpId= HID_SCH_STATISTIK_PLUS_VALUE; };
-hidspecial HID_SCH_STATISTIK_MINUS_VALUE {HelpId= HID_SCH_STATISTIK_MINUS_VALUE; };
-
-hidspecial HID_SCH_LEGEND_SHOW          {HelpId= HID_SCH_LEGEND_SHOW; };
-hidspecial HID_SCH_LEGEND_POS_LEFT      {HelpId= HID_SCH_LEGEND_POS_LEFT; };
-hidspecial HID_SCH_LEGEND_POS_TOP       {HelpId= HID_SCH_LEGEND_POS_TOP; };
-hidspecial HID_SCH_LEGEND_POS_RIGHT     {HelpId= HID_SCH_LEGEND_POS_RIGHT; };
-hidspecial HID_SCH_LEGEND_POS_BOTTOM    {HelpId= HID_SCH_LEGEND_POS_BOTTOM; };
-
-hidspecial HID_SCH_DATALABEL_VALUE {HelpId= HID_SCH_DATALABEL_VALUE; };
-hidspecial HID_SCH_DATALABEL_NUMBER {HelpId= HID_SCH_DATALABEL_NUMBER; };
-hidspecial HID_SCH_DATALABEL_PERCENT {HelpId= HID_SCH_DATALABEL_PERCENT; };
-hidspecial HID_SCH_DATALABEL_TEXT {HelpId= HID_SCH_DATALABEL_TEXT; };
-hidspecial HID_SCH_DATALABEL_SYMBOL {HelpId= HID_SCH_DATALABEL_SYMBOL; };
-hidspecial HID_SCH_PB_NUMBERFORMAT {HelpId= HID_SCH_PB_NUMBERFORMAT; };
-hidspecial HID_SCH_PB_PERCENT_NUMBERFORMAT {HelpId= HID_SCH_PB_PERCENT_NUMBERFORMAT; };
-hidspecial HID_SCH_DATALABEL_SEPARATOR {HelpId= HID_SCH_DATALABEL_SEPARATOR; };
-hidspecial HID_SCH_DATALABEL_PLACEMENT {HelpId= HID_SCH_DATALABEL_PLACEMENT; };
-hidspecial HID_SCH_TEXTDIRECTION {HelpId= HID_SCH_TEXTDIRECTION; };
-hidspecial HID_SCH_TEXTDIRECTION_TITLE {HelpId= HID_SCH_TEXTDIRECTION_TITLE; };
-hidspecial HID_SCH_TEXTDIRECTION_EQUATION {HelpId= HID_SCH_TEXTDIRECTION_EQUATION; };
-hidspecial HID_SCH_DATALABEL_ROTATION_KNOB {HelpId= HID_SCH_DATALABEL_ROTATION_KNOB; };
-hidspecial HID_SCH_DATALABEL_ROTATION_EDIT {HelpId= HID_SCH_DATALABEL_ROTATION_EDIT; };
-
-hidspecial HID_SCH_TITLE_MAIN {HelpId= HID_SCH_TITLE_MAIN; };
-hidspecial HID_SCH_TITLE_SUB {HelpId= HID_SCH_TITLE_SUB; };
-hidspecial HID_SCH_TITLE_X {HelpId= HID_SCH_TITLE_X; };
-hidspecial HID_SCH_TITLE_Y {HelpId= HID_SCH_TITLE_Y; };
-hidspecial HID_SCH_TITLE_Z {HelpId= HID_SCH_TITLE_Z; };
-hidspecial HID_SCH_TITLE_SECONDARY_X {HelpId= HID_SCH_TITLE_SECONDARY_X; };
-hidspecial HID_SCH_TITLE_SECONDARY_Y {HelpId= HID_SCH_TITLE_SECONDARY_Y; };
-
-hidspecial HID_SCH_NUM_OF_LINES {HelpId= HID_SCH_NUM_OF_LINES; };
-
-hidspecial HID_SCH_WIZARD_ROADMAP {HelpId= HID_SCH_WIZARD_ROADMAP; };
-hidspecial HID_SCH_WIN_DOCUMENT {HelpId= HID_SCH_WIN_DOCUMENT; };
-hidspecial HID_SCH_DATA_SERIES_LABEL {HelpId= HID_SCH_DATA_SERIES_LABEL; };
-
-hidspecial HID_SCH_STARTING_ANGLE_DIAL {HelpId= HID_SCH_STARTING_ANGLE_DIAL; };
-
-hidspecial HID_SCH_TRENDLINE_RB_NONE {HelpId= HID_SCH_TRENDLINE_RB_NONE; };
-hidspecial HID_SCH_TRENDLINE_RB_LINEAR {HelpId= HID_SCH_TRENDLINE_RB_LINEAR; };
-hidspecial HID_SCH_TRENDLINE_RB_LOGARITHMIC {HelpId= HID_SCH_TRENDLINE_RB_LOGARITHMIC; };
-hidspecial HID_SCH_TRENDLINE_RB_EXPONENTIAL {HelpId= HID_SCH_TRENDLINE_RB_EXPONENTIAL; };
-hidspecial HID_SCH_TRENDLINE_RB_POWER {HelpId= HID_SCH_TRENDLINE_RB_POWER; };
-hidspecial HID_SCH_TRENDLINE_SHOW_EQUATION {HelpId= HID_SCH_TRENDLINE_SHOW_EQUATION; };
-hidspecial HID_SCH_TRENDLINE_SHOW_R_SQUARED {HelpId= HID_SCH_TRENDLINE_SHOW_R_SQUARED; };
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
deleted file mode 100644
index 6cc8044..0000000
--- a/cui/util/hidother.src
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "../source/inc/helpid.hrc"            // HID_XXX
-
-hidspecial HID_AUTOCORR_LANGUAGE                    { HelpId = HID_AUTOCORR_LANGUAGE; };
-hidspecial HID_CLB_EDIT_MODULES_DICS            { HelpID =  HID_CLB_EDIT_MODULES_DICS       ;};
-hidspecial HID_CLB_EDIT_MODULES_MODULES         { HelpID =  HID_CLB_EDIT_MODULES_MODULES    ;};
-hidspecial HID_CLB_LINGU_MODULES                { HelpID =  HID_CLB_LINGU_MODULES           ;};
-hidspecial HID_CLB_LINGU_OPTIONS                { HelpID =  HID_CLB_LINGU_OPTIONS           ;};
-hidspecial HID_COLORPAGE_ANCHOR_CB                     { HelpID =  HID_COLORPAGE_ANCHOR_CB                      ; };
-hidspecial HID_COLORPAGE_ANCHOR_LB                     { HelpID =  HID_COLORPAGE_ANCHOR_LB                      ; };
-hidspecial HID_COLORPAGE_APPBACKGROUND_CB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_CB               ; };
-hidspecial HID_COLORPAGE_APPBACKGROUND_LB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_LB               ; };
-hidspecial HID_COLORPAGE_BASICCOMMENT_CB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_CB                ; };
-hidspecial HID_COLORPAGE_BASICCOMMENT_LB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_LB                ; };
-hidspecial HID_COLORPAGE_BASICERROR_CB                 { HelpID =  HID_COLORPAGE_BASICERROR_CB                  ; };
-hidspecial HID_COLORPAGE_BASICERROR_LB                 { HelpID =  HID_COLORPAGE_BASICERROR_LB                  ; };
-hidspecial HID_COLORPAGE_BASICIDENTIFIER_CB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_CB             ; };
-hidspecial HID_COLORPAGE_BASICIDENTIFIER_LB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_LB             ; };
-hidspecial HID_COLORPAGE_BASICKEYWORD_CB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_CB                ; };
-hidspecial HID_COLORPAGE_BASICKEYWORD_LB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_LB                ; };
-hidspecial HID_COLORPAGE_BASICNUMBER_CB                { HelpID =  HID_COLORPAGE_BASICNUMBER_CB                 ; };
-hidspecial HID_COLORPAGE_BASICNUMBER_LB                { HelpID =  HID_COLORPAGE_BASICNUMBER_LB                 ; };
-hidspecial HID_COLORPAGE_BASICOPERATOR_CB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_CB               ; };
-hidspecial HID_COLORPAGE_BASICOPERATOR_LB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_LB               ; };
-hidspecial HID_COLORPAGE_BASICSTRING_CB                { HelpID =  HID_COLORPAGE_BASICSTRING_CB                 ; };
-hidspecial HID_COLORPAGE_BASICSTRING_LB                { HelpID =  HID_COLORPAGE_BASICSTRING_LB                 ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_CB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_CB          ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_LB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_LB          ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVE_CB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_CB               ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVE_LB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_LB               ; };
-hidspecial HID_COLORPAGE_CALCGRID_CB                   { HelpID =  HID_COLORPAGE_CALCGRID_CB                    ; };
-hidspecial HID_COLORPAGE_CALCGRID_LB                   { HelpID =  HID_COLORPAGE_CALCGRID_LB                    ; };
-hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_CB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_CB         ; };
-hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_LB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_LB         ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB      ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB      ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB         ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB         ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAK_CB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_CB               ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAK_LB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_LB               ; };
-hidspecial HID_COLORPAGE_CALCREFERENCE_CB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_CB               ; };
-hidspecial HID_COLORPAGE_CALCREFERENCE_LB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_LB               ; };
-hidspecial HID_COLORPAGE_DOCBOUNDARIES_CB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_CB               ; };
-hidspecial HID_COLORPAGE_DOCBOUNDARIES_LB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_LB               ; };
-hidspecial HID_COLORPAGE_DOCCOLOR_CB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_CB                    ; };
-hidspecial HID_COLORPAGE_DOCCOLOR_LB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_LB                    ; };
-hidspecial HID_COLORPAGE_DRAWDRAWING_CB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_CB                 ; };
-hidspecial HID_COLORPAGE_DRAWDRAWING_LB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_LB                 ; };
-hidspecial HID_COLORPAGE_DRAWFILL_CB                   { HelpID =  HID_COLORPAGE_DRAWFILL_CB                    ; };
-hidspecial HID_COLORPAGE_DRAWFILL_LB                   { HelpID =  HID_COLORPAGE_DRAWFILL_LB                    ; };
-hidspecial HID_COLORPAGE_DRAWGRID_CB                   { HelpID =  HID_COLORPAGE_DRAWGRID_CB                    ; };
-hidspecial HID_COLORPAGE_DRAWGRID_LB                   { HelpID =  HID_COLORPAGE_DRAWGRID_LB                    ; };
-hidspecial HID_COLORPAGE_FONTCOLOR_CB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_CB                   ; };
-hidspecial HID_COLORPAGE_FONTCOLOR_LB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_LB                   ; };
-hidspecial HID_COLORPAGE_HTMLCOMMENT_CB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_CB                 ; };
-hidspecial HID_COLORPAGE_HTMLCOMMENT_LB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_LB                 ; };
-hidspecial HID_COLORPAGE_HTMLKEYWORD_CB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_CB                 ; };
-hidspecial HID_COLORPAGE_HTMLKEYWORD_LB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_LB                 ; };
-hidspecial HID_COLORPAGE_HTMLSGML_CB                   { HelpID =  HID_COLORPAGE_HTMLSGML_CB                    ; };
-hidspecial HID_COLORPAGE_HTMLSGML_LB                   { HelpID =  HID_COLORPAGE_HTMLSGML_LB                    ; };
-hidspecial HID_COLORPAGE_HTMLUNKNOWN_CB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_CB                 ; };
-hidspecial HID_COLORPAGE_HTMLUNKNOWN_LB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_LB                 ; };
-hidspecial HID_COLORPAGE_LINKSVISITED_CB               { HelpID =  HID_COLORPAGE_LINKSVISITED_CB                ; };
-hidspecial HID_COLORPAGE_LINKSVISITED_LB               { HelpID =  HID_COLORPAGE_LINKSVISITED_LB                ; };
-hidspecial HID_COLORPAGE_LINKS_CB                      { HelpID =  HID_COLORPAGE_LINKS_CB                       ; };
-hidspecial HID_COLORPAGE_LINKS_LB                      { HelpID =  HID_COLORPAGE_LINKS_LB                       ; };
-hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_CB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_CB            ; };
-hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_LB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_LB            ; };
-hidspecial HID_COLORPAGE_SPELL_CB                      { HelpID =  HID_COLORPAGE_SPELL_CB                       ; };
-hidspecial HID_COLORPAGE_SPELL_LB                      { HelpID =  HID_COLORPAGE_SPELL_LB                       ; };
-hidspecial HID_COLORPAGE_TABLEBOUNDARIES_CB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_CB             ; };
-hidspecial HID_COLORPAGE_TABLEBOUNDARIES_LB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_LB             ; };
-hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_CB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_CB          ; };
-hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_LB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_LB          ; };
-hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_CB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_CB         ; };
-hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_LB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_LB         ; };
-hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_CB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_CB           ; };
-hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_LB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_LB           ; };
-hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_CB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_CB        ; };
-hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_LB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_LB        ; };
-hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_CB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_CB            ; };
-hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_LB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_LB            ; };
-hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB       ; };
-hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB       ; };
-hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB     ; };
-hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB     ; };
-hidspecial HID_COLORPAGE_WRITERTEXTGRID_CB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_CB              ; };
-hidspecial HID_COLORPAGE_WRITERTEXTGRID_LB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_LB              ; };
-hidspecial HID_DBPATH_CTL_PATH                      { HelpId = HID_DBPATH_CTL_PATH; };
-hidspecial HID_DBPATH_HEADERBAR                     { HelpId = HID_DBPATH_HEADERBAR; };
-hidspecial HID_GALLERY_EDIT_MSNAME                     { HelpID =  HID_GALLERY_EDIT_MSNAME ; };
-hidspecial HID_GALLERY_NEWTHEME_ADDFILES        { HelpID = HID_GALLERY_NEWTHEME_ADDFILES; };
-hidspecial HID_GALLERY_NEWTHEME_FINDFILES       { HelpID = HID_GALLERY_NEWTHEME_FINDFILES; };
-hidspecial HID_HANGULDLG_BUTTON_CHANGE          { HelpID =  HID_HANGULDLG_BUTTON_CHANGE   ; };
-hidspecial HID_HANGULDLG_BUTTON_CHANGEALL       { HelpID =  HID_HANGULDLG_BUTTON_CHANGEALL; };
-hidspecial HID_HANGULDLG_BUTTON_CLOSE           { HelpID =  HID_HANGULDLG_BUTTON_CLOSE    ; };
-hidspecial HID_HANGULDLG_BUTTON_IGNORE          { HelpID =  HID_HANGULDLG_BUTTON_IGNORE   ; };
-hidspecial HID_HANGULDLG_BUTTON_IGNOREALL       { HelpID =  HID_HANGULDLG_BUTTON_IGNOREALL; };
-hidspecial HID_HANGULDLG_BUTTON_OPTIONS             { HelpId = HID_HANGULDLG_BUTTON_OPTIONS; };
-hidspecial HID_HANGULDLG_EDIT_NEWWORD       { HelpID =  HID_HANGULDLG_EDIT_NEWWORD ; };
-hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; };
-hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; };
-hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; };
-hidspecial HID_HYPERLINK_DIALOG             { HelpID = HID_HYPERLINK_DIALOG ;};
-hidspecial HID_HYPERDLG_DOC_PATH            { HelpID = HID_HYPERDLG_DOC_PATH ;};
-hidspecial HID_HYPERDLG_INET_PATH           { HelpID = HID_HYPERDLG_INET_PATH ;};
-hidspecial HID_HYPERDLG_MAIL_PATH           { HelpID = HID_HYPERDLG_MAIL_PATH ;};
-hidspecial HID_ICCDIALOG_CANCEL_BTN         { HelpID = HID_ICCDIALOG_CANCEL_BTN ;};
-hidspecial HID_ICCDIALOG_CHOICECTRL         { HelpID = HID_ICCDIALOG_CHOICECTRL ;};
-hidspecial HID_ICCDIALOG_OK_BTN             { HelpID = HID_ICCDIALOG_OK_BTN ;};
-hidspecial HID_ICCDIALOG_RESET_BTN          { HelpID = HID_ICCDIALOG_RESET_BTN ;};
-hidspecial HID_LINKDLG_TABLB    { HelpId = HID_LINKDLG_TABLB; };
-hidspecial HID_NUMBERINGOPT_SEL_GRF_FROM_FILE   { HelpID = HID_NUMBERINGOPT_SEL_GRF_FROM_FILE; };
-hidspecial HID_OFADLG_TREELISTBOX                   { HelpId = HID_OFADLG_TREELISTBOX; };
-hidspecial HID_OFAPAGE_AUTOCORR_CLB                 { HelpId = HID_OFAPAGE_AUTOCORR_CLB; };
-hidspecial HID_OFAPAGE_AUTOFORMAT_CLB               { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; };
-hidspecial HID_OFAPAGE_MSFLTR2_CLB                   { HelpId = HID_OFAPAGE_MSFLTR2_CLB             ; };
-hidspecial HID_OFAPAGE_QUOTE_CLB                    { HelpId = HID_OFAPAGE_QUOTE_CLB; };
-hidspecial HID_OFAPAGE_QUOTE_SW_CLB                 { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; };
-hidspecial HID_OFA_CONNPOOL_DRIVERLIST              { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
-hidspecial HID_OFA_FONT_SUBST_CLB                   { HelpId = HID_OFA_FONT_SUBST_CLB; };
-hidspecial HID_OPTIONS_COLORCONFIG_SAVE_SCHEME  { HelpID = HID_OPTIONS_COLORCONFIG_SAVE_SCHEME ;};
-hidspecial HID_OPTIONS_JAVA_LIST { HelpId = HID_OPTIONS_JAVA_LIST; };
-hidspecial HID_OPTIONS_PATHS_SELECTFOLDER       { HelpID = HID_OPTIONS_PATHS_SELECTFOLDER; };
-hidspecial HID_OPTPATH_CTL_PATH             { HelpId = HID_OPTPATH_CTL_PATH     ;};
-hidspecial HID_OPTPATH_HEADERBAR            { HelpId = HID_OPTPATH_HEADERBAR    ;};
-hidspecial HID_PASTE_DLG        { HelpId = HID_PASTE_DLG; };
-hidspecial HID_REDLINING_DLG                { HelpID = HID_REDLINING_DLG; };
-hidspecial HID_REDLINING_EDIT               { HelpID = HID_REDLINING_EDIT; };
-hidspecial HID_REDLINING_NEXT               { HelpID = HID_REDLINING_NEXT; };
-hidspecial HID_REDLINING_PREV               { HelpID = HID_REDLINING_PREV; };
-hidspecial HID_SVX_CONFIG_EVENT       { HelpId = HID_SVX_CONFIG_EVENT; };
-hidspecial HID_SVX_CONFIG_ICON_SELECTOR { HelpId = HID_SVX_CONFIG_ICON_SELECTOR; };
-hidspecial HID_SVX_CONFIG_MENU        { HelpId = HID_SVX_CONFIG_MENU; };
-hidspecial HID_SVX_CONFIG_MENU_CONTENTS { HelpId = HID_SVX_CONFIG_MENU_CONTENTS; };
-hidspecial HID_SVX_CONFIG_MENU_ORGANIZER { HelpId = HID_SVX_CONFIG_MENU_ORGANIZER; };
-hidspecial HID_SVX_CONFIG_NAME_SUBMENU { HelpId = HID_SVX_CONFIG_NAME_SUBMENU; };
-hidspecial HID_SVX_CONFIG_RENAME_MENU  { HelpId = HID_SVX_CONFIG_RENAME_MENU; };
-hidspecial HID_SVX_CONFIG_RENAME_MENU_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_MENU_ITEM; };
-hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR    { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR; };
-hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM; };
-hidspecial HID_SVX_CONFIG_TOOLBAR     { HelpId = HID_SVX_CONFIG_TOOLBAR; };
-hidspecial HID_SVX_CONFIG_TOOLBAR_CONTENTS { HelpId = HID_SVX_CONFIG_TOOLBAR_CONTENTS; };
-hidspecial HID_SVX_MACRO_LB_EVENT     { HelpId = HID_SVX_MACRO_LB_EVENT; };
-hidspecial HID_SVX_MODIFY_TOOLBAR      { HelpId = HID_SVX_MODIFY_TOOLBAR; };
-hidspecial HID_SVX_MODIFY_TOOLBAR_ITEM { HelpId = HID_SVX_MODIFY_TOOLBAR_ITEM; };
-hidspecial HID_SVX_NEW_TOOLBAR         { HelpId = HID_SVX_NEW_TOOLBAR; };
-hidspecial HID_SVX_NEW_TOOLBAR_ITEM    { HelpId = HID_SVX_NEW_TOOLBAR_ITEM; };
-hidspecial HID_SVX_SAVE_IN             { HelpId = HID_SVX_SAVE_IN; };
-hidspecial HID_TPCOLOR_CMYK_1               { HelpID = HID_TPCOLOR_CMYK_1; };
-hidspecial HID_TPCOLOR_CMYK_2               { HelpID = HID_TPCOLOR_CMYK_2; };
-hidspecial HID_TPCOLOR_CMYK_3               { HelpID = HID_TPCOLOR_CMYK_3; };
-hidspecial HID_TPCOLOR_RGB_1                { HelpID = HID_TPCOLOR_RGB_1; };
-hidspecial HID_TPCOLOR_RGB_2                { HelpID = HID_TPCOLOR_RGB_2; };
-hidspecial HID_TPCOLOR_RGB_3                { HelpID = HID_TPCOLOR_RGB_3; };
-hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICATE ;};
-hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK         { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
-hidspecial UID_SEARCH_RECORDSTATUS          { HelpID = UID_SEARCH_RECORDSTATUS ;};
-hidspecial HID_MACRO_HEADERTABLISTBOX       { HelpID = HID_MACRO_HEADERTABLISTBOX ;};
-hidspecial HID_DLG_PASSWORD_TO_OPEN_MODIFY  { HelpID = HID_DLG_PASSWORD_TO_OPEN_MODIFY ;};
-
diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src
deleted file mode 100644
index 92f6ffd..0000000
--- a/dbaccess/util/hidother.src
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "../inc/dbaccess_helpid.hrc"
-
-hidspecial HID_DLG_FILTERCRIT                           { HelpId = HID_DLG_FILTERCRIT; };
-hidspecial HID_DLG_ORDERCRIT                            { HelpId = HID_DLG_ORDERCRIT; };
-hidspecial HID_DATABROWSE_HEADER                        { HelpId = HID_DATABROWSE_HEADER; };
-hidspecial HID_CTL_TABBROWSER                           { HelpId = HID_CTL_TABBROWSER; };
-hidspecial UID_DATABROWSE_DATAWINDOW                    { HelpId = UID_DATABROWSE_DATAWINDOW; };
-hidspecial HID_CTL_TREEVIEW                             { HelpId = HID_CTL_TREEVIEW; };
-hidspecial UID_CTL_CONTENT                              { HelpId = UID_CTL_CONTENT; };
-hidspecial HID_TLB_TABBROWSER                           { HelpId = HID_TLB_TABBROWSER; };
-hidspecial HID_TLB_TREELISTBOX                          { HelpId = HID_TLB_TREELISTBOX; };
-
-hidspecial HID_DSADMIN_DIALOG                           { HelpId = HID_DSADMIN_DIALOG; };
-hidspecial HID_DSADMIN_CHARSET                          { HelpId = HID_DSADMIN_CHARSET; };
-hidspecial HID_DSADMIN_TABCONTROL                       { HelpId = HID_DSADMIN_TABCONTROL; };
-hidspecial HID_DSADMIN_PAGE_GENERAL                     { HelpId = HID_DSADMIN_PAGE_GENERAL; };
-hidspecial HID_DSADMIN_PAGE_DBASE                       { HelpId = HID_DSADMIN_PAGE_DBASE; };
-hidspecial HID_DSADMIN_PAGE_JDBC                        { HelpId = HID_DSADMIN_PAGE_JDBC; };
-hidspecial HID_DSADMIN_PAGE_ODBC                        { HelpId = HID_DSADMIN_PAGE_ODBC; };
-hidspecial HID_DSADMIN_PAGE_TEXT                        { HelpId = HID_DSADMIN_PAGE_TEXT; };
-hidspecial HID_DSADMIN_TABLE_SUBSCRIPTION               { HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; };
-hidspecial HID_DSADMIN_DSACTIONS_NEWDS                  { HelpId = HID_DSADMIN_DSACTIONS_NEWDS; };
-hidspecial HID_DSADMIN_DSACTIONS_DELETEDS               { HelpId = HID_DSADMIN_DSACTIONS_DELETEDS; };
-hidspecial HID_DSADMIN_DSACTIONS_RESTOREDS              { HelpId = HID_DSADMIN_DSACTIONS_RESTOREDS; };
-hidspecial HID_DSADMIN_DSNAME                           { HelpId = HID_DSADMIN_DSNAME; };
-hidspecial HID_DSADMIN_DSTYPE                           { HelpId = HID_DSADMIN_DSTYPE; };
-hidspecial HID_DSADMIN_URL_GENERAL                      { HelpId = HID_DSADMIN_URL_GENERAL; };
-hidspecial HID_DSADMIN_BROWSECONN                       { HelpId = HID_DSADMIN_BROWSECONN; };
-hidspecial HID_DSADMIN_LOGINTIMEOUT_NUMBER              { HelpId = HID_DSADMIN_LOGINTIMEOUT_NUMBER; };
-hidspecial HID_DSADMIN_LOGINTIMEOUT_UNIT                { HelpId = HID_DSADMIN_LOGINTIMEOUT_UNIT; };
-hidspecial HID_DSADMIN_SHOWDELETED                      { HelpId = HID_DSADMIN_SHOWDELETED; };
-hidspecial HID_DSADMIN_ALLOWLONG                        { HelpId = HID_DSADMIN_ALLOWLONG; };
-hidspecial HID_DSADMIN_DBASE_INDICIES                   { HelpId = HID_DSADMIN_DBASE_INDICIES; };
-hidspecial HID_DSADMIN_DRIVERCLASS                      { HelpId = HID_DSADMIN_DRIVERCLASS; };
-hidspecial HID_DSADMIN_ODBC_OPTIONS                     { HelpId = HID_DSADMIN_ODBC_OPTIONS; };
-hidspecial HID_DSADMIN_TEXT_HEADER                      { HelpId = HID_DSADMIN_TEXT_HEADER; };
-hidspecial HID_DSADMIN_FIELD_SEPARATOR                  { HelpId = HID_DSADMIN_FIELD_SEPARATOR; };
-hidspecial HID_DSADMIN_TEXT_SEPARATOR                   { HelpId = HID_DSADMIN_TEXT_SEPARATOR; };
-hidspecial HID_DSADMIN_DECIMAL_SEPARATOR                { HelpId = HID_DSADMIN_DECIMAL_SEPARATOR; };
-hidspecial HID_DSADMIN_THOUSANDS_SEPARATOR              { HelpId = HID_DSADMIN_THOUSANDS_SEPARATOR; };
-hidspecial HID_DSADMIN_EXTENSION                        { HelpId = HID_DSADMIN_EXTENSION; };
-hidspecial HID_DSADMIN_ALL_TABLES                       { HelpId = HID_DSADMIN_ALL_TABLES; };
-hidspecial HID_DSADMIN_NO_TABLES                        { HelpId = HID_DSADMIN_NO_TABLES; };
-hidspecial HID_DSADMIN_SELECT_TABLES                    { HelpId = HID_DSADMIN_SELECT_TABLES; };
-hidspecial HID_DSADMIN_TABLE_SELECTOR                   { HelpId = HID_DSADMIN_TABLE_SELECTOR; };
-hidspecial HID_DSADMIN_SUPPRESS_VERSIONCL               { HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL; };
-hidspecial HID_GENERIC_SQL_ERROR                        { HelpId = HID_GENERIC_SQL_ERROR; };
-hidspecial HID_BROWSER_COLUMNFORMAT                     { HelpId = HID_BROWSER_COLUMNFORMAT; };
-hidspecial HID_BROWSER_COLUMNWIDTH                      { HelpId = HID_BROWSER_COLUMNWIDTH; };
-hidspecial HID_BROWSER_TABLEFORMAT                      { HelpId = HID_BROWSER_TABLEFORMAT; };
-hidspecial HID_BROWSER_ROWHEIGHT                        { HelpId = HID_BROWSER_ROWHEIGHT; };
-hidspecial HID_BROWSER_EDIT_DATABASE                    { HelpId = HID_BROWSER_EDIT_DATABASE; };
-hidspecial HID_BROWSER_CLOSECONN                        { HelpId = HID_BROWSER_CLOSECONN; };
-hidspecial HID_BROWSER_REFRESHCONN                      { HelpId = HID_BROWSER_REFRESHCONN; };
-hidspecial HID_DSADMIN_SPECIAL_MESSAGE                  { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; };
-
-hidspecial HID_DLG_ROWHEIGHT                            { HelpId = HID_DLG_ROWHEIGHT; };
-hidspecial HID_DLG_COLWIDTH                             { HelpId = HID_DLG_COLWIDTH; };
-hidspecial HID_TLB_QUERYDESIGN                          { HelpId = HID_TLB_QUERYDESIGN; };
-hidspecial HID_CTL_QRYSQLEDIT                           { HelpId = HID_CTL_QRYSQLEDIT; };
-
-hidspecial HID_DSADMIN_SPECIAL_MESSAGE                  { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; };
-
-hidspecial HID_BROWSER_QUERY_CREATE_DESIGN              { HelpId = HID_BROWSER_QUERY_CREATE_DESIGN; };
-hidspecial HID_BROWSER_QUERY_CREATE_TEXT                { HelpId = HID_BROWSER_QUERY_CREATE_TEXT; };
-
-hidspecial HID_DLG_ERROR                                { HelpId = HID_DLG_ERROR; };
-hidspecial HID_DLG_TEXT                                 { HelpId = HID_DLG_TEXT; };
-hidspecial UID_SQLERROR_BUTTONMORE                      { HelpId = UID_SQLERROR_BUTTONMORE; };
-hidspecial HID_DLG_SAVE_AS                              { HelpId = HID_DLG_SAVE_AS; };
-hidspecial HID_BROWSER_QUERY_EDIT                       { HelpId = HID_BROWSER_QUERY_EDIT; };
-hidspecial HID_BROWSER_QUERY_DELETE                     { HelpId = HID_BROWSER_QUERY_DELETE; };
-
-hidspecial HID_DSADMIN_USER_ADO                         { HelpId = HID_DSADMIN_USER_ADO; };
-hidspecial HID_DSADMIN_PWDREC_ADO                       { HelpId = HID_DSADMIN_PWDREC_ADO; };
-hidspecial HID_DSADMIN_CONNURL_ADOPAGE                  { HelpId = HID_DSADMIN_CONNURL_ADOPAGE; };
-hidspecial HID_DSADMIN_PAGE_ADO                         { HelpId = HID_DSADMIN_PAGE_ADO; };
-
-hidspecial HID_JOINSH_ADDTAB_CLOSE                      { HelpId = HID_JOINSH_ADDTAB_CLOSE; };
-hidspecial HID_JOINSH_ADDTAB_TABLELIST                  { HelpId = HID_JOINSH_ADDTAB_TABLELIST; };
-hidspecial HID_JOINSH_ADDTAB_QUERYLIST                  { HelpId = HID_JOINSH_ADDTAB_QUERYLIST; };
-hidspecial HID_CTL_QRYDGNTAB                            { HelpId = HID_CTL_QRYDGNTAB; };
-hidspecial HID_DLG_QRY_JOIN                             { HelpId = HID_DLG_QRY_JOIN; };
-hidspecial HID_DLG_QRY_JOINTYPE                         { HelpId = HID_DLG_QRY_JOINTYPE; };
-hidspecial HID_DLG_QRY_HELPTEXT                         { HelpId = HID_DLG_QRY_HELPTEXT; };
-
-hidspecial HID_CTL_QRYDGNCRIT                           { HelpId = HID_CTL_QRYDGNCRIT; };
-hidspecial HID_QRYDGN_ROW_VISIBLE                       { HelpId = HID_QRYDGN_ROW_VISIBLE; };
-hidspecial HID_QRYDGN_ROW_TABLE                         { HelpId = HID_QRYDGN_ROW_TABLE; };
-hidspecial HID_QRYDGN_ROW_FIELD                         { HelpId = HID_QRYDGN_ROW_FIELD; };
-hidspecial HID_QRYDGN_ROW_ORDER                         { HelpId = HID_QRYDGN_ROW_ORDER; };
-hidspecial HID_QRYDGN_ROW_FUNCTION                      { HelpId = HID_QRYDGN_ROW_FUNCTION; };
-hidspecial HID_QRYDGN_ROW_ALIAS                         { HelpId = HID_QRYDGN_ROW_ALIAS; };
-hidspecial HID_QRYDGN_ROW_CRIT                          { HelpId = HID_QRYDGN_ROW_CRIT; };
-
-hidspecial HID_QUERY_FUNCTION                           { HelpId = HID_QUERY_FUNCTION; };
-hidspecial HID_QUERY_TABLENAME                          { HelpId = HID_QUERY_TABLENAME; };
-hidspecial HID_QUERY_ALIASNAME                          { HelpId = HID_QUERY_ALIASNAME; };
-hidspecial HID_QUERY_DISTINCT                           { HelpId = HID_QUERY_DISTINCT; };
-
-hidspecial HID_DSADMIN_QUERYADMINISTRATION              { HelpId = HID_DSADMIN_QUERYADMINISTRATION; };
-hidspecial HID_DSADMIN_QUERIES                          { HelpId = HID_DSADMIN_QUERIES; };
-hidspecial HID_DSADMIN_QUERIES_NEW                      { HelpId = HID_DSADMIN_QUERIES_NEW; };
-hidspecial HID_DSADMIN_QUERIES_EDIT                     { HelpId = HID_DSADMIN_QUERIES_EDIT; };
-hidspecial HID_DSADMIN_QUERIES_DELETE                   { HelpId = HID_DSADMIN_QUERIES_DELETE; };
-
-hidspecial HID_TAB_DESIGN_TABLE_DESC                    { HelpId = HID_TAB_DESIGN_TABLE_DESC; };
-hidspecial HID_TAB_DESIGN_FIELDCONTROL                  { HelpId = HID_TAB_DESIGN_FIELDCONTROL; };
-hidspecial HID_TABLE_DESIGN_HELP_WINDOW                 { HelpId = HID_TABLE_DESIGN_HELP_WINDOW; };
-hidspecial HID_TAB_DESIGN_DESCWIN                       { HelpId = HID_TAB_DESIGN_DESCWIN; };
-hidspecial HID_TAB_DESIGN_TABLE_PROPS                   { HelpId = HID_TAB_DESIGN_TABLE_PROPS; };
-hidspecial HID_TABDESIGN_BACKGROUND                     { HelpId = HID_TABDESIGN_BACKGROUND; };
-hidspecial HID_CTL_TABLEEDIT                            { HelpId = HID_CTL_TABLEEDIT; };
-hidspecial HID_TABDESIGN_NAMECELL                       { HelpId = HID_TABDESIGN_NAMECELL; };
-hidspecial HID_TABDESIGN_TYPECELL                       { HelpId = HID_TABDESIGN_TYPECELL; };
-hidspecial HID_TABDESIGN_COMMENTCELL                    { HelpId = HID_TABDESIGN_COMMENTCELL; };
-hidspecial HID_TABDESIGN_HELPTEXT                       { HelpId = HID_TABDESIGN_HELPTEXT; };
-
-hidspecial HID_TLB_TABLEDESIGN                          { HelpId = HID_TLB_TABLEDESIGN; };
-hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME               { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; };
-hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL             { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; };
-hidspecial HID_TAB_ENT_DEFAULT                          { HelpId = HID_TAB_ENT_DEFAULT; };
-hidspecial HID_TAB_ENT_FORMAT_SAMPLE                    { HelpId = HID_TAB_ENT_FORMAT_SAMPLE; };
-hidspecial HID_TAB_ENT_FORMAT                           { HelpId = HID_TAB_ENT_FORMAT; };
-hidspecial HID_TAB_ENT_BOOL_DEFAULT                     { HelpId = HID_TAB_ENT_BOOL_DEFAULT; };
-hidspecial HID_TAB_ENT_REQUIRED                         { HelpId = HID_TAB_ENT_REQUIRED; };
-hidspecial HID_TAB_ENT_AUTOINCREMENT                    { HelpId = HID_TAB_ENT_AUTOINCREMENT; };
-hidspecial HID_TAB_ENT_TEXT_LEN                         { HelpId = HID_TAB_ENT_TEXT_LEN; };
-hidspecial HID_TAB_ENT_TYPE                             { HelpId = HID_TAB_ENT_TYPE; };
-hidspecial HID_TAB_ENT_COLUMNNAME                       { HelpId = HID_TAB_ENT_COLUMNNAME; };
-hidspecial HID_TAB_ENT_NUMTYP                           { HelpId = HID_TAB_ENT_NUMTYP; };
-hidspecial HID_TAB_ENT_LEN                              { HelpId = HID_TAB_ENT_LEN; };
-hidspecial HID_TAB_ENT_SCALE                            { HelpId = HID_TAB_ENT_SCALE; };
-hidspecial HID_BROWSER_TABLE_CREATE_DESIGN              { HelpId = HID_BROWSER_TABLE_CREATE_DESIGN; };
-hidspecial HID_BROWSER_TABLE_EDIT                       { HelpId = HID_BROWSER_TABLE_EDIT; };
-hidspecial HID_BROWSER_TABLE_DELETE                     { HelpId = HID_BROWSER_TABLE_DELETE; };
-hidspecial HID_SQLERROR_EXCHAIN_ERRORS                  { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; };
-hidspecial HID_SQLERROR_EXCHAIN_TEXT                    { HelpId = HID_SQLERROR_EXCHAIN_TEXT; };
-hidspecial HID_TAB_WIZ_COLUMN_SELECT                    { HelpId = HID_TAB_WIZ_COLUMN_SELECT; };
-hidspecial HID_TAB_WIZ_TYPE_SELECT                      { HelpId = HID_TAB_WIZ_TYPE_SELECT; };
-hidspecial HID_TAB_NAMEMATCHING_COLS_AVAIL              { HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; };
-hidspecial HID_TAB_NAMEMATCHING_COLS_ASSIGN             { HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; };
-hidspecial HID_TAB_WIZ_COPYTABLE                        { HelpId = HID_TAB_WIZ_COPYTABLE; };
-hidspecial HID_TAB_WIZ_TABLENAME_EDIT                   { HelpId = HID_TAB_WIZ_TABLENAME_EDIT; };
-hidspecial HID_CTL_RELATIONTAB                          { HelpId = HID_CTL_RELATIONTAB; };
-hidspecial HID_TLB_RELATIONDESIGN                       { HelpId = HID_TLB_RELATIONDESIGN ; };
-hidspecial HID_RELATIONDIALOG_LEFTFIELDCELL             { HelpId = HID_RELATIONDIALOG_LEFTFIELDCELL ; };
-hidspecial HID_RELATIONDIALOG_RIGHTFIELDCELL            { HelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL ; };
-hidspecial HID_RELDLG_KEYFIELDS                         { HelpId = HID_RELDLG_KEYFIELDS ; };
-hidspecial HID_BROWSER_RELATION_DESIGN                  { HelpId = HID_BROWSER_RELATION_DESIGN ; };
-hidspecial HID_TABLE_DESIGN_NO_CONNECTION               { HelpId = HID_TABLE_DESIGN_NO_CONNECTION ; };
-hidspecial HID_DSADMIN_CREATEDATABASE                   { HelpId = HID_DSADMIN_CREATEDATABASE ; };
-hidspecial HID_BROWSER_COLUMNINFO                       { HelpId = HID_BROWSER_COLUMNINFO ; };
-hidspecial HID_DSADMIN_USECATALOG                       { HelpId = HID_DSADMIN_USECATALOG ; };
-hidspecial HID_BROWSER_VIEW_CREATE_DESIGN               { HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; };
-hidspecial HID_DSADMIN_DOCUMENTS                        { HelpId = HID_DSADMIN_DOCUMENTS ; };
-hidspecial HID_DSADMIN_DOCUMENTLINKS                    { HelpId = HID_DSADMIN_DOCUMENTLINKS ; };
-
-hidspecial HID_DSADMIN_FILTER_EXPLANATION               { HelpId = HID_DSADMIN_FILTER_EXPLANATION ; };
-hidspecial HID_CONFIRM_DROP_BUTTON_ALL                  { HelpId = HID_CONFIRM_DROP_BUTTON_ALL ; };
-hidspecial HID_DSBROWSER_BOOKMARK_SELECTED              { HelpId = HID_DSBROWSER_BOOKMARK_SELECTED ; };
-hidspecial HID_DSADMIN_TABLE_TOOLBOX                    { HelpId = HID_DSADMIN_TABLE_TOOLBOX ; };
-hidspecial HID_DSADMIN_QUERY_TOOLBOX                    { HelpId = HID_DSADMIN_QUERY_TOOLBOX ; };
-hidspecial HID_DSADMIN_BOOKMARK_TOOLBOX                 { HelpId = HID_DSADMIN_BOOKMARK_TOOLBOX ; };
-hidspecial HID_DSADMIN_PAGE_LDAP                        { HelpId = HID_DSADMIN_PAGE_LDAP ; };
-hidspecial HID_DSADMIN_LDAP_HOSTNAME                    { HelpId = HID_DSADMIN_LDAP_HOSTNAME ; };
-hidspecial HID_DSADMIN_LDAP_BASEDN                      { HelpId = HID_DSADMIN_LDAP_BASEDN ; };
-hidspecial HID_DSADMIN_LDAP_PORTNUMBER                  { HelpId = HID_DSADMIN_LDAP_PORTNUMBER ; };
-hidspecial HID_DSADMIN_PAGE_MOZILLA                     { HelpId = HID_DSADMIN_PAGE_MOZILLA ; };
-hidspecial HID_DSADMIN_MOZILLA_PROFILE_NAME             { HelpId = HID_DSADMIN_MOZILLA_PROFILE_NAME ; };
-
-hidspecial HID_TAB_PAGE_USERADMIN                       { HelpId = HID_TAB_PAGE_USERADMIN ; };
-hidspecial HID_TAB_PAGE_PBUSER                          { HelpId = HID_TAB_PAGE_PBUSER ; };
-hidspecial HID_TAB_PAGE_PBCHGPWD                        { HelpId = HID_TAB_PAGE_PBCHGPWD ; };
-hidspecial HID_TAB_PAGE_PBUSERDELETE                    { HelpId = HID_TAB_PAGE_PBUSERDELETE ; };
-hidspecial HID_TAB_PAGE_TBLGRANTS                       { HelpId = HID_TAB_PAGE_TBLGRANTS ; };
-hidspecial HID_TAB_PAGE_LBUSER                          { HelpId = HID_TAB_PAGE_LBUSER ; };
-hidspecial HID_DSBROWSER_BOOKMARKSELECTED               { HelpId = HID_DSBROWSER_BOOKMARKSELECTED ; };
-hidspecial HID_DSBROWSER_DISCONNECTING                  { HelpId = HID_DSBROWSER_DISCONNECTING ; };
-hidspecial HID_DSBROWSER_DIRECTSQL                      { HelpId = HID_DSBROWSER_DIRECTSQL   ; };
-hidspecial HID_DSADMIN_LDAP_ROWCOUNT                    { HelpId = HID_DSADMIN_LDAP_ROWCOUNT     ; };
-hidspecial HID_DLG_PASSWORD                             { HelpId = HID_DLG_PASSWORD  ; };
-hidspecial HID_BROWSER_QUERY_EDITSQL                    { HelpId = HID_BROWSER_QUERY_EDITSQL     ; };
-hidspecial HID_BROWSER_OPEN_DOCUMENT                    { HelpId = HID_BROWSER_OPEN_DOCUMENT ; };
-hidspecial HID_BROWSER_EDIT_DOCUMENT                    { HelpId = HID_BROWSER_EDIT_DOCUMENT ; };
-hidspecial HID_BROWSER_BEW_DOCUMENT                     { HelpId = HID_BROWSER_BEW_DOCUMENT ; };
-
-hidspecial HID_DLGIDX_NEWINDEX                          { HelpId = HID_DLGIDX_NEWINDEX; }
-hidspecial HID_DLGIDX_DROPINDEX                         { HelpId = HID_DLGIDX_DROPINDEX; }
-hidspecial HID_DLGIDX_RENAMEINDEX                       { HelpId = HID_DLGIDX_RENAMEINDEX; }
-hidspecial HID_DLGIDX_SAVEINDEX                         { HelpId = HID_DLGIDX_SAVEINDEX; }
-hidspecial HID_DLGIDX_RESETINDEX                        { HelpId = HID_DLGIDX_RESETINDEX; }
-hidspecial HID_DLGIDX_INDEXLIST                         { HelpId = HID_DLGIDX_INDEXLIST; }
-hidspecial UID_DLGINDEX_INDEXDETAILS_BACK               { HelpId = UID_DLGINDEX_INDEXDETAILS_BACK; }
-hidspecial UID_DLGINDEX_INDEXDETAILS_MAIN               { HelpId = UID_DLGINDEX_INDEXDETAILS_MAIN; }
-hidspecial HID_DLGINDEX_INDEXDETAILS_FIELD              { HelpId = HID_DLGINDEX_INDEXDETAILS_FIELD; }
-hidspecial HID_DLGINDEX_INDEXDETAILS_SORTORDER          { HelpId = HID_DLGINDEX_INDEXDETAILS_SORTORDER; }
-hidspecial HID_DOCLINKEDIT_URL                          { HelpId = HID_DOCLINKEDIT_URL; }
-
-hidspecial HID_QUERY_SQLMODE                            { HelpId = HID_QUERY_SQLMODE ; };
-hidspecial HID_BROWSER_REFRESH_REBUILDVIEW              { HelpId = HID_BROWSER_REFRESH_REBUILDVIEW ; };
-hidspecial HID_BROWSER_RENAME_ENTRY                     { HelpId = HID_BROWSER_RENAME_ENTRY ; };
-
-hidspecial HID_QUERY_EDIT_JOINCONNECTION                { HelpId = HID_QUERY_EDIT_JOINCONNECTION ; };
-
-hidspecial HID_DLG_QRY_WINDOW_CONTROL                   { HelpId = HID_DLG_QRY_WINDOW_CONTROL ; };
-hidspecial HID_DLG_QRY_LEFT_TABLE                       { HelpId = HID_DLG_QRY_LEFT_TABLE ; };
-hidspecial HID_DLG_QRY_RIGHT_TABLE                      { HelpId = HID_DLG_QRY_RIGHT_TABLE ; };
-
-hidspecial HID_DLG_REL_CASC_DEL                         { HelpId = HID_DLG_REL_CASC_DEL ; };
-hidspecial HID_DLG_REL_NO_CASC_DEL                      { HelpId = HID_DLG_REL_NO_CASC_DEL ; };
-hidspecial HID_DLG_REL_CASC_DEL_NULL                    { HelpId = HID_DLG_REL_CASC_DEL_NULL ; };
-hidspecial HID_DLG_REL_CASC_DEL_DEFAULT                 { HelpId = HID_DLG_REL_CASC_DEL_DEFAULT ; };
-
-hidspecial HID_DLG_REL_CASC_UPD                         { HelpId = HID_DLG_REL_CASC_UPD ; };
-hidspecial HID_DLG_REL_NO_CASC_UPD                      { HelpId = HID_DLG_REL_NO_CASC_UPD ; };
-hidspecial HID_DLG_REL_CASC_UPD_NULL                    { HelpId = HID_DLG_REL_CASC_UPD_NULL ; };
-hidspecial HID_DLG_REL_CASC_UPD_DEFAULT                 { HelpId = HID_DLG_REL_CASC_UPD_DEFAULT ; };
-hidspecial HID_BROWSER_SAVE_RECORD                      { HelpId = HID_BROWSER_SAVE_RECORD ; };
-hidspecial HID_BROWSER_UNDO_RECORD                      { HelpId = HID_BROWSER_UNDO_RECORD ; };
-
-hidspecial HID_DSADMIN_SQL92CHECK                       { HelpId = HID_DSADMIN_SQL92CHECK ; };
-hidspecial HID_DSADMIN_AUTOINCREMENTVALUE               { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; };
-hidspecial HID_TAB_AUTOINCREMENTVALUE                   { HelpId = HID_TAB_AUTOINCREMENTVALUE ; };
-hidspecial HID_DOCUMENT_CREATE_REPWIZ                   { HelpId = HID_DOCUMENT_CREATE_REPWIZ ; };
-hidspecial HID_DSADMIN_RETRIEVE_AUTO                    { HelpId = HID_DSADMIN_RETRIEVE_AUTO ; };
-hidspecial HID_DSADMIN_AUTORETRIEVEENABLED              { HelpId = HID_DSADMIN_AUTORETRIEVEENABLED ; };
-
-hidspecial HID_DSADMIN_PAGE_MYSQL_ODBC                  { HelpId = HID_DSADMIN_PAGE_MYSQL_ODBC ; };
-hidspecial HID_DSADMIN_PAGE_MYSQL_JDBC                  { HelpId = HID_DSADMIN_PAGE_MYSQL_JDBC ; };
-hidspecial HID_TAB_PAGE_TABLEPRIVILEGES                 { HelpId = HID_TAB_PAGE_TABLEPRIVILEGES ; };
-
-hidspecial HID_DSADMIN_PAGE_USERDRIVER                  { HelpId = HID_DSADMIN_PAGE_USERDRIVER ; };
-hidspecial HID_DSADMIN_USER_DEFINED                     { HelpId = HID_DSADMIN_USER_DEFINED ; };
-hidspecial HID_DSADMIN_USERDEF_OPTIONS                  { HelpId = HID_DSADMIN_USERDEF_OPTIONS ; };
-hidspecial HID_DSADMIN_CHARSET_USERDEF                  { HelpId = HID_DSADMIN_CHARSET_USERDEF ; };
-
-hidspecial HID_DLG_RENAME                               { HelpId = HID_DLG_RENAME ; };
-
-hidspecial HID_DSADMIN_DBASE_PATH                       { HelpId = HID_DSADMIN_DBASE_PATH ; };
-hidspecial HID_DSADMIN_MYSQL_DATABASE                   { HelpId = HID_DSADMIN_MYSQL_DATABASE ; };
-hidspecial HID_DSADMIN_MYSQL_ODBC_DATASOURCE            { HelpId = HID_DSADMIN_MYSQL_ODBC_DATASOURCE ; };
-hidspecial HID_DSADMIN_ODBC_DATASOURCE                  { HelpId = HID_DSADMIN_ODBC_DATASOURCE ; };
-hidspecial HID_DSADMIN_MSACCESS_MDB_FILE                { HelpId = HID_DSADMIN_MSACCESS_MDB_FILE ; };
-hidspecial HID_DSADMIN_PAGE_MSACCESS                    { HelpId = HID_DSADMIN_PAGE_MSACCESS ; };
-hidspecial HID_DSADMIN_FLAT_PATH                        { HelpId = HID_DSADMIN_FLAT_PATH ; };
-hidspecial HID_DSADMIN_CALC_PATH                        { HelpId = HID_DSADMIN_CALC_PATH ; };
-hidspecial HID_DSADMIN_ADVANCED                         { HelpId = HID_DSADMIN_ADVANCED ; };
-hidspecial HID_DSADMIN_BOOLEANCOMPARISON                { HelpId = HID_DSADMIN_BOOLEANCOMPARISON ; };
-hidspecial HID_DSADMIN_ORACLE_DATABASE                  { HelpId = HID_DSADMIN_ORACLE_DATABASE ; };
-
-hidspecial UID_APP_VIEW                                 { HelpId = UID_APP_VIEW ; };
-hidspecial HID_APP_TABLE_TREE                           { HelpId = HID_APP_TABLE_TREE ; };
-hidspecial HID_APP_FORM_TREE                            { HelpId = HID_APP_FORM_TREE ; };
-hidspecial HID_APP_QUERY_TREE                           { HelpId = HID_APP_QUERY_TREE ; };
-hidspecial HID_APP_REPORT_TREE                          { HelpId = HID_APP_REPORT_TREE  ; };
-hidspecial UID_APP_DETAIL_VIEW                          { HelpId = UID_APP_DETAIL_VIEW; };
-hidspecial UID_APP_VIEW_VERT_SPLIT                      { HelpId = UID_APP_VIEW_VERT_SPLIT ; };
-hidspecial UID_APP_VIEW_BORDER_WIN                      { HelpId = UID_APP_VIEW_BORDER_WIN ; };
-hidspecial HID_APP_CREATION_LIST                        { HelpId = HID_APP_CREATION_LIST ; };
-hidspecial UID_APP_SWAP_VIEW                            { HelpId = UID_APP_SWAP_VIEW ; };
-hidspecial HID_APP_SWAP_ICONCONTROL                     { HelpId = HID_APP_SWAP_ICONCONTROL ; };
-
-hidspecial HID_DSADMIN_APPENDTABLEALIAS                 { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; };
-hidspecial HID_DSADMIN_AS_BEFORE_CORRELATION_NAME       { HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME ; };
-hidspecial HID_DSADMIN_CHECK_REQUIRED_FIELDS            { HelpId = HID_DSADMIN_CHECK_REQUIRED_FIELDS ; };
-hidspecial HID_DSADMIN_PARAMETERNAMESUBST               { HelpId = HID_DSADMIN_PARAMETERNAMESUBST ; };
-hidspecial HID_DSADMIN_IGNOREDRIVER_PRIV                { HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV ; };
-hidspecial HID_DSADMIN_HOSTNAME                         { HelpId = HID_DSADMIN_HOSTNAME ; };
-hidspecial HID_DSADMIN_PORTNUMBER                       { HelpId = HID_DSADMIN_PORTNUMBER ; };
-
-hidspecial HID_APP_HELP_TEXT                            { HelpId = HID_APP_HELP_TEXT ; };
-hidspecial HID_EXPLORERDLG_COLLECTION                   { HelpId = HID_EXPLORERDLG_COLLECTION ; };
-hidspecial UID_APP_DATABASE_VIEW                        { HelpId = UID_APP_DATABASE_VIEW ; };
-hidspecial UID_APP_TASKS_VIEW                           { HelpId = UID_APP_TASKS_VIEW ; };
-hidspecial UID_APP_CONTAINER_VIEW                       { HelpId = UID_APP_CONTAINER_VIEW ; };
-hidspecial UID_APP_TASKS_WINDOW                         { HelpId = UID_APP_TASKS_WINDOW ; };
-hidspecial HID_APP_DESCRIPTION_TEXT                     { HelpId = HID_APP_DESCRIPTION_TEXT ; };
-hidspecial UID_APP_DETAILPAGE_HELPER                    { HelpId = UID_APP_DETAILPAGE_HELPER ; };
-
-hidspecial HID_APP_VIEW_PREVIEW_CB                      { HelpId = HID_APP_VIEW_PREVIEW_CB ; };
-hidspecial HID_APP_VIEW_PREVIEW_1                       { HelpId = HID_APP_VIEW_PREVIEW_1 ; };
-hidspecial HID_APP_VIEW_PREVIEW_2                       { HelpId = HID_APP_VIEW_PREVIEW_2 ; };
-hidspecial UID_APP_VIEW_HORZ_SPLIT                      { HelpId = UID_APP_VIEW_HORZ_SPLIT ; };
-hidspecial UID_APP_VIEW_PREVIEW_1                       { HelpId = UID_APP_VIEW_PREVIEW_1 ; };
-hidspecial HID_APP_VIEW_PREVIEW_3                       { HelpId = HID_APP_VIEW_PREVIEW_3 ; };
-
-hidspecial HID_DSADMIN_TYPE_DIALOG                      { HelpId = HID_DSADMIN_TYPE_DIALOG ; };
-hidspecial HID_DSADMIN_ENABLEOUTERJOIN                  { HelpId = HID_DSADMIN_ENABLEOUTERJOIN ; };
-hidspecial HID_DSADMIN_USERADMIN                        { HelpId = HID_DSADMIN_USERADMIN ; };
-
-hidspecial HID_DBWIZ_PREVIOUS                           { HelpId = HID_DBWIZ_PREVIOUS ; };
-hidspecial HID_DBWIZ_NEXT                               { HelpId = HID_DBWIZ_NEXT ; };
-hidspecial HID_DBWIZ_CANCEL                             { HelpId = HID_DBWIZ_CANCEL ; };
-hidspecial HID_DBWIZ_FINISH                             { HelpId = HID_DBWIZ_FINISH ; };
-hidspecial UID_DBWIZ_HELP                               { HelpId = UID_DBWIZ_HELP ; };
-
-hidspecial HID_DSADMIN_CATALOG                          { HelpId = HID_DSADMIN_CATALOG ; };
-hidspecial HID_DSADMIN_SCHEMA                           { HelpId = HID_DSADMIN_SCHEMA ; };
-hidspecial HID_DSADMIN_IGNOREINDEXAPPENDIX              { HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX ; };
-
-hidspecial HID_PAGE_DBWIZARD_GENERALPAGE                        { HelpId = HID_PAGE_DBWIZARD_GENERALPAGE ; };
-hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE        { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE ; };
-hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE     { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE ; };
-
-hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION             { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; };
-hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION             { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; };
-
-hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE           { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE           { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES             { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES             { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES           { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION               { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR             { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR              { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR           { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; };
-hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR         { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; };
-hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION       { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; };
-hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION       { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; };
-hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER                 { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; };
-hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN                     { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; };
-hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER                 { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; };
-hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL                     { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; };
-hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION         { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; };
-hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC            { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; };
-hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC            { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; };
-hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME             { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; };
-hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER         { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; };
-hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT               { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; };
-hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS              { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; };
-hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS          { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL                    { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL                    { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME                { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER            { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT                  { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS                 { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS ; };
-hidspecial HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS             { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS ; };
-
-hidspecial HID_PAGE_DBWIZARD_ADO_ET_ADOURL                      { HelpId = HID_PAGE_DBWIZARD_ADO_ET_ADOURL ; };
-hidspecial HID_PAGE_DBWIZARD_ADO_PB_ADOURL                      { HelpId = HID_PAGE_DBWIZARD_ADO_PB_ADOURL ; };

... etc. - the rest is truncated
