CWS-TOOLING: integrate CWS sw32bf04

2009-09-22 Michael Stahl galobj.hxx: do not export SgaObject methods (fixes wntmsci12 build)
2009-09-21 Michael Stahl #i105149# #i93308# svx: unofield.cxx: support field services with proper case
2009-09-21 Michael Stahl #i105149# #i102468# sc: servuno.cxx: support field services with proper case
2009-09-21 Michael Stahl #i105149# txtflde.cxx: support docinfo field services with proper case
2009-09-18 Michael Stahl #i105148# fmtatr2.cxx: SwFmtMeta::Clone(): avoid assert on clone pool default
2009-09-18 Michael Stahl #i105148# fmtatr2.cxx: SwFmtMeta::~SwFmtMeta(): check if m_pMeta != 0
2009-09-18 Michael Stahl #i105179# unocoll.cxx: SwXFrames::getByName(): add missing breaks
2009-09-18 Michael Stahl dbgoutsw.cxx: explicitly convert from SwNodeIndex to SwPosition
2009-09-18 Michael Stahl galobj.hxx: export class SgaObject from svxcore, needed by unogalitem.cxx
2009-09-17 Michael Stahl #i105149# txtflde.cxx: compare text field prefix case-insensitively
2009-09-16 Michael Stahl #i105117# docdde.cxx: fix possible NULL dereference (patch by cmc)
2009-09-16 Michael Stahl #i105124# docdde.cxx: fix use-after-free bug: make _FindItem member String

4 files changed, 37 insertions, 10 deletions

diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index ce2b481bdcdf..a33a1b5cbd81 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -85,7 +85,7 @@ enum GalSoundType
 // - SgaObject -
 // -------------
 
-class SgaObject
+class SVX_DLLPUBLIC SgaObject
 {
     friend class GalleryTheme;
 
@@ -122,8 +122,8 @@ public:
     BOOL                    IsValid() const { return bIsValid; }
     BOOL                    IsThumbBitmap() const { return bIsThumbBmp; }
 
-    SVX_DLLPUBLIC const String          GetTitle() const;
-    SVX_DLLPUBLIC void                  SetTitle( const String& rTitle );
+    const String            GetTitle() const;
+    void                    SetTitle( const String& rTitle );
 
     friend SvStream&        operator<<( SvStream& rOut, const SgaObject& rObj );
     friend SvStream&        operator>>( SvStream& rIn, SgaObject& rObj );
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 7f7aedf860e9..c0e301f3792e 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -252,7 +252,10 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField(
         {
             nId = ID_EXT_FILEFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DocInfo.Title") ) )
+        else if (aFieldType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("docinfo.Title") ) ||
+                 aFieldType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("DocInfo.Title") ) )
         {
             nId = ID_FILEFIELD;
         }
diff --git a/svx/source/unoedit/unofield.cxx b/svx/source/unoedit/unofield.cxx
index efb4226f9c12..6ff4c2aafe3e 100644
--- a/svx/source/unoedit/unofield.cxx
+++ b/svx/source/unoedit/unofield.cxx
@@ -1062,7 +1062,7 @@ OUString SAL_CALL SvxUnoTextField::getImplementationName() throw(uno::RuntimeExc
     return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextField"));
 }
 
-static const sal_Char* pServiceNames[] =
+static const sal_Char* pOldServiceNames[] =
 {
     "com.sun.star.text.TextField.DateTime",
     "com.sun.star.text.TextField.URL",
@@ -1081,14 +1081,34 @@ static const sal_Char* pServiceNames[] =
     "com.sun.star.presentation.TextField.DateTime"
 };
 
+static const sal_Char* pNewServiceNames[] =
+{
+    "com.sun.star.text.textfield.DateTime",
+    "com.sun.star.text.textfield.URL",
+    "com.sun.star.text.textfield.PageNumber",
+    "com.sun.star.text.textfield.PageCount",
+    "com.sun.star.text.textfield.DateTime",
+    "com.sun.star.text.textfield.docinfo.Title",    // SvxFileField is used for title
+    "com.sun.star.text.textfield.SheetName",
+    "com.sun.star.text.textfield.DateTime",
+    "com.sun.star.text.textfield.FileName",
+    "com.sun.star.text.textfield.Author",
+    "com.sun.star.text.textfield.Measure",
+    "com.sun.star.text.textfield.DateTime",
+    "com.sun.star.presentation.textfield.Header",
+    "com.sun.star.presentation.textfield.Footer",
+    "com.sun.star.presentation.textfield.DateTime"
+};
+
 uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
-    uno::Sequence< OUString > aSeq( 3 );
+    uno::Sequence< OUString > aSeq( 4 );
     OUString* pServices = aSeq.getArray();
-    pServices[0] = OUString::createFromAscii( pServiceNames[mnServiceId] );
-    pServices[1] = OUString::createFromAscii( "com.sun.star.text.TextContent" ),
-    pServices[2] = OUString::createFromAscii( "com.sun.star.text.TextField" );
+    pServices[0] = OUString::createFromAscii( pNewServiceNames[mnServiceId] );
+    pServices[1] = OUString::createFromAscii( pOldServiceNames[mnServiceId] );
+    pServices[2] = OUString::createFromAscii( "com.sun.star.text.TextContent" ),
+    pServices[3] = OUString::createFromAscii( "com.sun.star.text.TextField" );
 
     return aSeq;
 }
diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx
index 4f034b098db7..5db6cc809bce 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/svx/source/xml/xmltxtexp.cxx
@@ -247,7 +247,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co
         return uno::Reference< uno::XInterface >(
             SvxCreateNumRule( (SdrModel*)NULL ), uno::UNO_QUERY );
     }
-    if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime") ) )
+    if (   (0 == aServiceSpecifier.reverseCompareToAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.textfield.DateTime")))
+        || (0 == aServiceSpecifier.reverseCompareToAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime")))
+       )
     {
         return (::cppu::OWeakObject * )new SvxUnoTextField( ID_EXT_DATEFIELD );
     }