Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

1 files changed, 217 insertions, 0 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
new file mode 100644
index 000000000000..c8f3d99a7b14
--- /dev/null
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -0,0 +1,217 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _CFG_MERGE_HXX
+#define _CFG_MERGE_HXX
+
+#include <tools/string.hxx>
+#include <boost/unordered_map.hpp>
+#include <vector>
+
+typedef boost::unordered_map<rtl::OString, rtl::OString, rtl::OStringHash> ByteStringHashMap;
+
+
+//
+// class CfgStackData
+//
+
+class CfgStackData
+{
+friend class CfgParser;
+friend class CfgExport;
+friend class CfgMerge;
+private:
+    ByteString sTagType;
+    ByteString sIdentifier;
+
+    ByteString sResTyp;
+
+    ByteString sTextTag;
+    ByteString sEndTextTag;
+
+    ByteStringHashMap sText;
+public:
+    CfgStackData( const ByteString &rTag, const ByteString &rId )
+            : sTagType( rTag ), sIdentifier( rId ) {};
+
+    ByteString &GetTagType() { return sTagType; }
+    ByteString &GetIdentifier() { return sIdentifier; }
+
+};
+
+//
+// class CfgStack
+//
+
+typedef ::std::vector< CfgStackData* > CfgStackList;
+
+class CfgStack
+{
+private:
+    CfgStackList maList;
+
+public:
+    CfgStack() {}
+    ~CfgStack();
+
+    size_t Push( CfgStackData *pStackData );
+    CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
+    CfgStackData *Pop()
+        {
+            if ( maList.empty() ) return NULL;
+            CfgStackData* temp = maList.back();
+            maList.pop_back();
+            return temp;
+        }
+
+    CfgStackData *GetStackData( size_t nPos = LIST_APPEND );
+
+    ByteString GetAccessPath( size_t nPos = LIST_APPEND );
+
+    size_t size() const { return maList.size(); }
+};
+
+//
+// class CfgParser
+//
+
+class CfgParser
+{
+protected:
+    ByteString sCurrentResTyp;
+    ByteString sCurrentIsoLang;
+    ByteString sCurrentText;
+
+    ByteString sLastWhitespace;
+
+    CfgStack aStack;
+    CfgStackData *pStackData;
+
+    sal_Bool bLocalize;
+
+    virtual void WorkOnText(
+        ByteString &rText,
+        const ByteString &nLangIndex )=0;
+
+    virtual void WorkOnRessourceEnd()=0;
+
+    virtual void Output( const ByteString& rOutput )=0;
+
+    void Error( const ByteString &rError );
+
+private:
+    int ExecuteAnalyzedToken( int nToken, char *pToken );
+    std::vector<ByteString> aLanguages;
+    void AddText(
+        ByteString &rText,
+        const ByteString &rIsoLang,
+        const ByteString &rResTyp );
+
+sal_Bool IsTokenClosed( const ByteString &rToken );
+
+public:
+    CfgParser();
+    virtual ~CfgParser();
+
+    int Execute( int nToken, char * pToken );
+};
+
+//
+// class CfgOutputParser
+//
+
+class CfgOutputParser : public CfgParser
+{
+protected:
+    SvFileStream *pOutputStream;
+public:
+    CfgOutputParser ( const ByteString &rOutputFile );
+    virtual ~CfgOutputParser();
+};
+
+//
+// class CfgExport
+//
+
+class CfgExport : public CfgOutputParser
+{
+private:
+    ByteString sPrj;
+    ByteString sPath;
+    std::vector<ByteString> aLanguages;
+protected:
+    void WorkOnText(
+        ByteString &rText,
+        const ByteString &rIsoLang
+        );
+
+    void WorkOnRessourceEnd();
+    void Output( const ByteString& rOutput );
+public:
+    CfgExport(
+        const ByteString &rOutputFile,
+        const ByteString &rProject,
+        const ByteString &rFilePath
+    );
+    ~CfgExport();
+};
+
+//
+// class CfgMerge
+//
+
+class CfgMerge : public CfgOutputParser
+{
+private:
+    MergeDataFile *pMergeDataFile;
+    std::vector<ByteString> aLanguages;
+    ResData *pResData;
+
+    ByteString sFilename;
+    sal_Bool bEnglish;
+
+protected:
+    void WorkOnText(
+        ByteString &rText,
+        const ByteString &nLangIndex );
+
+    void WorkOnRessourceEnd();
+
+    void Output( const ByteString& rOutput );
+public:
+    CfgMerge(
+        const ByteString &rMergeSource,
+        const ByteString &rOutputFile,
+        ByteString &rFilename
+    );
+    ~CfgMerge();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */