CWS-TOOLING: integrate CWS os137

15 files changed, 89 insertions, 87 deletions

diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 39710b6728..edfbe2883c 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -180,8 +180,6 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
                                 Window *pParent, const SfxItemSet &rSet)
 {
     SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog(pParent, rSet);
-//	const SfxDocumentInfoItem& rItem = (const SfxDocumentInfoItem&)rSet.Get(SID_DOCINFO);
-//	if(rItem.IsOwnFormat())
     //nur mit Statistik, wenn dieses Doc auch angezeigt wird, nicht
     //aus dem Doc-Manager
     SwDocShell* pDocSh = (SwDocShell*) SfxObjectShell::Current();
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index 67f550acf5..183764a5b2 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -110,8 +110,7 @@ namespace /* private */
 MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) :
     mailserver_ (mailserver),
     run_(false),    
-    shutdown_requested_(false),
-    bIsInRun(false)
+    shutdown_requested_(false)
 {            
     wakening_call_.reset();
     mail_dispatcher_active_.reset();
@@ -206,12 +205,6 @@ bool MailDispatcher::isStarted() const
     return run_;
 }
 
-bool MailDispatcher::isRunning() const
-{
-    return bIsInRun;
-} 
-
-
 void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener)
 {
     OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
@@ -267,7 +260,6 @@ void MailDispatcher::run()
     // signal that the mail dispatcher thread is now alive
     mail_dispatcher_active_.set();
     
-    bIsInRun = true;
     for(;;)
     {       
         wakening_call_.wait();
@@ -295,7 +287,6 @@ void MailDispatcher::run()
             std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this));               
         }                                                    
     } // end for        SSH ALI
-    bIsInRun = false;
 }
 /*-- 27.08.2004 12:04:46---------------------------------------------------
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index d20f32463e..e34dc9387e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1480,14 +1480,16 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
     uno::Reference < embed::XStorage > xStg;
     if( rMedium.IsStorage() && (xStg = rMedium.GetStorage()).is() )
     {
-        SvStringsDtor aArr( 10, 10 );
+        SvStrings aArr( 10, 10 );
         sal_uInt32 nFormat = SotStorage::GetFormatID( xStg );
         if ( nFormat == SOT_FORMATSTR_ID_STARWRITER_60 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_60 ||
             nFormat == SOT_FORMATSTR_ID_STARWRITER_8 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_8)
-            SwGetReaderXML()->GetSectionList( rMedium, (SvStrings&) aArr );
+            SwGetReaderXML()->GetSectionList( rMedium, aArr );
 
         for( USHORT n = 0; n < aArr.Count(); ++n )
             rBox.InsertEntry( *aArr[ n ] );
+
+        aArr.DeleteAndDestroy(0, aArr.Count());
     }
 }
 /* -----------------21.05.99 10:16-------------------
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 56aa93d855..4dec023a6f 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -40,13 +40,9 @@
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
 #include <swtypes.hxx>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
 #include <fldbas.hxx>
 #include <docufld.hxx>
 #include <wrtsh.hxx>
@@ -63,13 +59,17 @@
 #ifndef _VIEW_HXX
 #include <view.hxx>
 #endif
-#include <svl/zformat.hxx>
+#include <svtools/zformat.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/Date.hpp>
 
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
 using namespace nsSwDocInfoSubType;
-
+using namespace com::sun::star;
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
@@ -103,7 +103,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
 
     SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, FALSE );
     if ( pItem )
-        pItem->GetValue() >>= aPropertyNames;
+        pItem->GetValue() >>= xCustomPropertySet;
 }
 
 /*--------------------------------------------------------------------
@@ -168,24 +168,31 @@ void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& )
         {
             if (DI_CUSTOM == i)
             {
-                if (aPropertyNames.getLength() )
+                if(xCustomPropertySet.is() )
                 {
+                    uno::Reference< beans::XPropertySetInfo > xSetInfo = xCustomPropertySet->getPropertySetInfo();
+                    const uno::Sequence< beans::Property > rProperties = xSetInfo->getProperties();
+//                    uno::Sequence< ::rtl::OUString > aPropertyNames(rProperties.getLength());
+//                    for (sal_Int32 i = 0; i < rProperties.getLength(); ++i) {
+//                        aPropertyNames[i] = rProperties[i].Name;
+//                    }
                     //if ( !IsFldEdit() )
+                    if( rProperties.getLength() )
                     {
                         pInfo = aTypeTLB.InsertEntry( String(SW_RES( STR_CUSTOM )) );
                         pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
-                    }
 
-                    for (sal_Int32 n=0; n<aPropertyNames.getLength(); n++)
-                    {
-                        rtl::OUString sEntry = aPropertyNames[n];
-                        pEntry = aTypeTLB.InsertEntry(sEntry, pInfo);
-                        if(m_sOldCustomFieldName.equals( sEntry ))
+                        for (sal_Int32 n=0; n < rProperties.getLength(); n++)
                         {
-                            pSelEntry = pEntry;
-                            aTypeTLB.Expand( pInfo );
+                            rtl::OUString sEntry = rProperties[n].Name;
+                            pEntry = aTypeTLB.InsertEntry(sEntry, pInfo);
+                            if(m_sOldCustomFieldName.equals( sEntry ))
+                            {
+                                pSelEntry = pEntry;
+                                aTypeTLB.Expand( pInfo );
+                            }
+                            pEntry->SetUserData(reinterpret_cast<void*>(i));
                         }
-                        pEntry->SetUserData(reinterpret_cast<void*>(i));
                     }
                 }
             }
@@ -263,12 +270,12 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG )
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
-
 IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
 {
     USHORT nSubType = (USHORT)(ULONG)pSelEntry->GetUserData();
     USHORT nPos = aSelectionLB.GetSelectEntryPos();
     USHORT nExtSubType;
+    USHORT nNewType = 0;
 
     if (nSubType != DI_EDIT)
     {
@@ -279,7 +286,33 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
                 aFormatLB.Clear();
                 aFormatLB.Enable(FALSE);
                 aFormatFT.Enable(FALSE);
-                return 0;
+                if( nSubType == DI_CUSTOM )
+                {
+                    //find out which type the custom field has - for a start set to DATE format 
+                    ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry);
+                    try
+                    {
+                        uno::Any aVal = xCustomPropertySet->getPropertyValue( sName );
+                        const uno::Type& rValueType = aVal.getValueType();
+                        if( rValueType == ::getCppuType( (util::DateTime*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_DATETIME;
+                        }
+                        else if( rValueType == ::getCppuType( (util::Date*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_DATE;
+                        }
+                        else if( rValueType == ::getCppuType( (util::Time*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_TIME;
+                        }
+                    }
+                    catch( const uno::Exception& )
+                    {
+                    }    
+                }
+                else
+                    return 0;
             }
             nPos = 0;
         }
@@ -290,7 +323,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
         nExtSubType = DI_SUB_TIME;
 
     USHORT nOldType = 0;
-    USHORT nNewType = 0;
     BOOL bEnable = FALSE;
     BOOL bOneArea = FALSE;
 
@@ -312,7 +344,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
             bOneArea = TRUE;
             break;
     }
-
     if (!nNewType)
     {
         aFormatLB.Clear();
@@ -334,7 +365,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
     if (IsFldEdit())
     {
         nPos = aSelectionLB.GetSelectEntryPos();
-        if (nPos != LISTBOX_ENTRY_NOTFOUND)
+        if (nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             nSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos);
 
@@ -346,18 +377,21 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
                     SwWrtShell *pSh = GetWrtShell();
                     if(pSh)
                     {
-
                         SvNumberFormatter* pFormatter = pSh->GetNumberFormatter();
                         LanguageType eLang = aFormatLB.GetCurLanguage();
                         if (nNewType == NUMBERFORMAT_DATE)
                             nFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLang);
                         else if (nNewType == NUMBERFORMAT_TIME)
-                            nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang);
+                            nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang);                        
                     }
                 }
                 aFormatLB.SetDefFormat(nFormat);
             }
         }
+        else if( (nSubType == DI_CUSTOM)  && (nNewType != 0) )
+        {
+            aFormatLB.SetDefFormat(nFormat);
+        }
     }
 
     aFormatLB.Enable(bEnable);
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 9f57450577..66e78ae64c 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -33,15 +33,16 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/group.hxx>
 #include <svtools/svtreebx.hxx>
 
 #include "numfmtlb.hxx"
 #include "fldpage.hxx"
 
+namespace com{namespace sun{ namespace star{ namespace beans{
+    class XPropertySet;
+}}}}    
 /*--------------------------------------------------------------------
    Beschreibung:
  --------------------------------------------------------------------*/
@@ -57,7 +58,7 @@ class SwFldDokInfPage : public SwFldPage
     CheckBox			aFixedCB;
 
     SvLBoxEntry*		pSelEntry;
-    com::sun::star::uno::Sequence < ::rtl::OUString > aPropertyNames;
+    com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet;
 
     String				aInfoStr;
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 2826df5dd0..ffc3e84ba7 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -226,15 +226,15 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
                 uno::Reference< beans::XPropertySet > xUDProps(
                     xDocProps->getUserDefinedProperties(),
                     uno::UNO_QUERY_THROW);
-                uno::Reference< beans::XPropertySetInfo > xSetInfo
-                    = xUDProps->getPropertySetInfo();
-                const uno::Sequence< beans::Property > props
-                    = xSetInfo->getProperties();
-                uno::Sequence< ::rtl::OUString > names(props.getLength());
-                for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-                    names[i] = props[i].Name;
-                }
-                pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(names) ) );
+//                uno::Reference< beans::XPropertySetInfo > xSetInfo
+//                    = xUDProps->getPropertySetInfo();
+//                const uno::Sequence< beans::Property > props
+//                    = xSetInfo->getProperties();
+//                uno::Sequence< ::rtl::OUString > names(props.getLength());
+//                for (sal_Int32 i = 0; i < props.getLength(); ++i) {
+//                    names[i] = props[i].Name;
+//                }
+                pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
                 pTabPage = SwFldDokInfPage::Create(this, *pSet);
                 nHelpId = HID_EDIT_FLD_DOKINF;
                 break;
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 3e2d031c0a..e594b04e8b 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -48,47 +48,23 @@
 #include <vcl/msgbox.hxx>
 #include <svx/htmlmode.hxx>
 #include <viewopt.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <fldwrap.hxx>
-#ifndef _FLDDB_HXX
 #include <flddb.hxx>
-#endif
-#ifndef _FLDDINF_HXX
 #include <flddinf.hxx>
-#endif
-#ifndef _FLDVAR_HXX
 #include <fldvar.hxx>
-#endif
-#ifndef _FLDDOK_HXX
 #include <flddok.hxx>
-#endif
-#ifndef _FLDFUNC_HXX
 #include <fldfunc.hxx>
-#endif
-#ifndef _FLDREF_HXX
 #include <fldref.hxx>
-#endif
 #include <wrtsh.hxx>
 #include <view.hxx>
-#ifndef _FLDTDLG_HXX
 #include <fldtdlg.hxx>
-#endif
 #include <swmodule.hxx>
 
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#ifndef _FLDUI_HRC
 #include <fldui.hrc>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _FLDTDLG_HRC
 #include <fldtdlg.hrc>
-#endif
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -245,15 +221,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID  )
         uno::Reference< beans::XPropertySet > xUDProps(
             xDocProps->getUserDefinedProperties(),
             uno::UNO_QUERY_THROW);
-        uno::Reference< beans::XPropertySetInfo > xSetInfo
-            = xUDProps->getPropertySetInfo();
-        const uno::Sequence< beans::Property > props
-            = xSetInfo->getProperties();
-        uno::Sequence< ::rtl::OUString > names(props.getLength());
-        for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-            names[i] = props[i].Name;
-        }
-        pISet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(names) ) );
+        pISet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
         return pISet;
     }
     else
diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk
index a94fdaef17..23160cf80f 100644
--- a/sw/source/ui/fldui/makefile.mk
+++ b/sw/source/ui/fldui/makefile.mk
@@ -80,6 +80,7 @@ SLOFILES =  \
 EXCEPTIONSFILES =  \
         $(SLO)$/fldtdlg.obj \
         $(SLO)$/fldedt.obj \
+        $(SLO)$/flddinf.obj \
         $(SLO)$/xfldui.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx
index 898e715470..b88569191f 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -131,7 +131,6 @@ public:
     /** returns if the thread is still running
     */
     using osl::Thread::isRunning;
-    bool isRunning() const;
     
     /** returns if shutdown has already been called
     */
@@ -167,7 +166,6 @@ private:
     ::rtl::Reference<MailDispatcher> m_xSelfReference;
     bool run_;    
     bool shutdown_requested_;
-    bool bIsInRun;    
 };
 
 #endif // INCLUDED_MAILDISPATCHER_HXX
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 4da05104ef..ea4b4c6e87 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -177,7 +177,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     PushButton BT_AUTOFORMAT
     {
         Pos = MAP_APPFONT ( 12 , 152 ) ;
-        Size = MAP_APPFONT ( 66 , 14 ) ;
+        Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
         Hide = TRUE ;
         Text [ en-US ] = "Auto~Format..." ;
diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src
index 58b4bbb44d..11ea4ca90c 100644
--- a/sw/source/ui/table/instable.src
+++ b/sw/source/ui/table/instable.src
@@ -159,7 +159,7 @@ ModalDialog DLG_INSERT_TABLE
     PushButton BT_AUTOFORMAT
     {
         Pos = MAP_APPFONT ( 12 , 146 ) ;
-        Size = MAP_APPFONT ( 66 , 14 ) ;
+        Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Auto~Format..." ;
     };
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index c721bf2d97..60238e1346 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -252,7 +252,10 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, BOOL bSilent,
             QueryBox aBox( &GetEditWin(), SW_RES( DLG_PRT_FIELDNAME ) );
             USHORT nRet = aBox.Execute();
             if( RET_CANCEL == nRet)
+            {
+                   delete pProgress;
                 return ERRCODE_IO_ABORT;
+            }
             // disable field commands
             if( RET_NO != nRet )
             {
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 56f61013db..6a2c3f1f30 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -169,6 +169,7 @@ ShellResource::ShellResource()
     aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
     aStrNone( SW_RES( STR_TEMPLATE_NONE )),
     aFixedStr( SW_RES( STR_FIELD_FIXED )),
+    sDurationFormat( SW_RES( STR_DURATION_FORMAT )),
 
     aTOXIndexName(          SW_RES(STR_TOI)),
     aTOXUserName(			SW_RES(STR_TOU)),
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc
index 571ee01134..cfeb63ebda 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/ui/utlui/initui.hrc
@@ -64,5 +64,6 @@
 #define STR_PAGEDESC_FOLLOWNAME		27
 #define STR_HYPERLINK_CLICK         28
 #define STR_GETREFFLD_REFITEMNOTFOUND   29
+#define STR_DURATION_FORMAT             30
 #endif
 
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src
index 8111f8259b..55f0a496b8 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/ui/utlui/initui.src
@@ -112,6 +112,10 @@ Resource RID_SW_SHELLRES
     {
         Text [ en-US ] = "(fixed)" ;
     };
+    String STR_DURATION_FORMAT
+    {
+        Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
+    };
     String STR_TOI
     {
         Text [ en-US ] = "Alphabetical Index" ;