CWS-TOOLING: integrate CWS os133

2009-08-17 11:57:21 +0200 od  r275041 : #i41413# correction of fix
         - check, if <Last Name> assignment exist before accessing database
2009-08-13 16:08:34 +0200 tbo  r274949 : #i100286# removed from workaround
2009-08-05 10:57:28 +0200 os  r274642 : #103994# prevent crash after field undo
2009-08-05 07:58:30 +0200 os  r274635 : #103994# prevent crash after field undo
2009-08-04 10:38:40 +0200 os  r274611 : #i41413# warnings fixed
2009-08-04 09:34:50 +0200 os  r274604 : #103233# unnecessary local variable removed
2009-08-04 09:34:21 +0200 os  r274603 : #103233# GetPosition() removed, again
2009-07-27 13:51:58 +0200 os  r274362 : CWS-TOOLING: rebase CWS os133 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 12:18:51 +0200 os  r274267 : #i41413# salutation preview fixed
2009-07-22 13:55:02 +0200 os  r274235 : #i69458# lock expression fields while calculating layout
2009-07-22 10:54:25 +0200 os  r274225 : #i103506# page descriptor has to be copied from the working document, not from the source document
2009-07-07 16:01:50 +0200 os  r273802 : #i103305# Shift+Ctrl+A should work for single selected drawing objects
2009-07-07 15:36:09 +0200 os  r273801 : #ii103137# text:display inversion fixed
2009-07-01 14:19:36 +0200 os  r273580 : #103233# access field position directly instead of a text node iteration
2009-06-28 20:05:18 +0200 tbo  r273450 : #100285# exchange PDF1/2TBO with HID_FILTER_PDF_INITIAL_VIEW/USER_INTERFACE
2009-06-28 20:04:20 +0200 tbo  r273449 : #100285# exchange PDF1/2TBO with HID_FILTER_PDF_INITIAL_VIEW/USER_INTERFACE
2009-06-28 20:03:37 +0200 tbo  r273448 : #100285# exchange PDF1/2TBO with HID_FILTER_PDF_INITIAL_VIEW/USER_INTERFACE
2009-06-26 13:58:46 +0200 os  r273409 : #i20268# misleading CheckBox name changed and function inverted
2009-06-26 13:33:12 +0200 os  r273405 : #i52699# twip convrsion of line width for text documents added
2009-06-26 12:42:47 +0200 os  r273399 : #i102967# Gender field name: accept first entry
2009-06-26 12:38:53 +0200 os  r273398 : #i103121# caption position in all OLEs can only be below
2009-06-25 14:42:42 +0200 os  r273382 : #i99848# member m_xText is not always set
2009-06-25 12:38:30 +0200 os  r273377 : #i100285# HelpIds added
2009-06-23 16:01:42 +0200 os  r273285 : #i103021# BulletId is a unicode character 

3 files changed, 13 insertions, 25 deletions

diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 6d1e07ea56..243c050117 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -80,6 +80,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public UniRefBase
 protected:
 
     UniReference< XMLPropertySetMapper > maPropMapper;
+    SvXMLImport& GetImport() const { return rImport;}
 
 public:
 
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 2b90c86df9..34f1ca038f 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -39,6 +39,7 @@
 #include <tools/string.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/txtprmap.hxx>
+#include <xmloff/xmlimp.hxx>
 #include "txtimppr.hxx"
 
 #define XML_LINE_LEFT 0
@@ -120,11 +121,21 @@ sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
     case CTF_FONTFAMILYNAME:
     case CTF_FONTFAMILYNAME_CJK:
     case CTF_FONTFAMILYNAME_CTL:
-    case CTF_TEXT_DISPLAY:
         bRet = getPropertySetMapper()->importXML( rValue, rProperty,
                                                   rUnitConverter );			
         break;
 
+    case CTF_TEXT_DISPLAY:
+        bRet = getPropertySetMapper()->importXML( rValue, rProperty,
+                                                  rUnitConverter );			
+        if( SvXMLImport::OOo_2x == GetImport().getGeneratorVersion() )
+        {
+            sal_Bool bHidden;
+            rProperty.maValue >>= bHidden;
+            bHidden = !bHidden;
+            rProperty.maValue <<= bHidden;
+        }
+    break;
     default:
         bRet = SvXMLImportPropertyMapper::handleSpecialItem( rProperty,
                     rProperties, rValue, rUnitConverter, rNamespaceMap );
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index bef97fefa9..1e4dab709f 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -547,30 +547,6 @@ void XMLTextStyleContext::FillPropertySet(
                 struct XMLPropertyState& rState = GetProperties()[nIndex];
                 Any rAny = rState.maValue;
                 sal_Int32 nMapperIndex = rState.mnIndex;
-                if( i == 3 )
-                {
-                    if( SvXMLImport::OOo_2x != GetImport().getGeneratorVersion() )
-                        continue;
-                    sal_Bool bHidden;
-                    rAny >>= bHidden;
-                    bHidden = !bHidden;
-                    Any aAny( rAny );
-                    aAny <<= bHidden;
-                    // get property set mapper
-                    UniReference<XMLPropertySetMapper> rPropMapper =
-                        xImpPrMap->getPropertySetMapper();
-
-                    // set property
-                    OUString rPropertyName(
-                        rPropMapper->GetEntryAPIName(nMapperIndex) );
-                    if( !xInfo.is() )
-                        xInfo = rPropSet->getPropertySetInfo();
-                    if ( xInfo->hasPropertyByName( rPropertyName ) )
-                    {
-                        rPropSet->setPropertyValue( rPropertyName, aAny );
-                    }
-                    continue;
-                }
 
                 // Now check for font name in rState and set corrected value,
                 // if necessary.