[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source

[Lionel Elie Mamane]

 xmloff/source/forms/elementexport.cxx |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

New commits:
commit e810928cea6535dd2fc187e18adea23e1a158e11
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Feb 5 17:25:55 2015 +0100

    Revert "xmloff: dead code gives MSVC fits"
    
    This reverts commit 29e1b2f1ca6e2dcbf9a04c63a3ac1d554cfdcb52.
    in preparation for reverting 2d4b87f0c1bfd97185a89c18d5b7680d11a958d6
    
    Change-Id: I9a262bf136b239c9f737f1d5523543ff425885ff
    Reviewed-on: https://gerrit.libreoffice.org/14337
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 494fe00..099a8bf 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1155,6 +1155,36 @@ namespace xmloff
             }
         }
 
+        // the string properties
+        {
+            static const sal_Int32 nStringPropertyAttributeIds[] =
+            {   // attribute flags
+            };
+            static const OUString pStringPropertyNames[] =
+            {   // property names
+            };
+
+            static const sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
+        #if OSL_DEBUG_LEVEL > 0
+            static const sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
+            OSL_ENSURE( ( nIdCount == nNameCount ),
+                "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
+        #endif
+            for ( i = 0; i < nIdCount; ++i )
+                if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
+                {
+                    exportStringPropertyAttribute(
+                        OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
+                        OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
+                        pStringPropertyNames[i]
+                    );
+            #if OSL_DEBUG_LEVEL > 0
+                //  reset the bit for later checking
+                m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
+            #endif
+                }
+        }
+
         if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
         {
             // need to export the min value and the max value as attributes