CWS-TOOLING: integrate CWS dba32d

2009-06-30 08:58:13 +0200 fs  r273488 : merging latest changes from CWS dba32c
2009-06-29 11:40:42 +0200 oj  r273459 : #i101652# fix token handling
2009-06-26 09:27:30 +0200 oj  r273394 : #i101994# wrong condition checked
2009-06-22 12:09:04 +0200 fs  r273210 : merging latest changes from CWS dba32c
2009-06-18 11:01:06 +0200 fs  r273108 : merge latest changes from CWS dba32c
2009-06-17 14:19:33 +0200 oj  r273072 : handle images at the correct position
2009-06-17 13:37:19 +0200 oj  r273067 : compile error
2009-06-17 13:35:58 +0200 oj  r273066 : #i102201# handle images
2009-06-17 13:27:21 +0200 oj  r273065 : #i80917# disable checkbox for internal copy
2009-06-17 13:25:38 +0200 oj  r273064 : #i80917# disable checkbox for internal copy
2009-06-15 12:59:16 +0200 fs  r272978 : merging latest changes from CWS dba32c
2009-06-15 10:45:58 +0200 fs  r272967 : CWS-TOOLING: rebase CWS dba32d to trunk@272827 (milestone: DEV300:m50)
2009-06-15 08:41:05 +0200 fs  r272960 : merging changes from CWS dba32c (resulting from rebasing dba32c to m50)
2009-06-03 12:22:32 +0200 fs  r272554 : merging latest changes from CWS dba32c
2009-06-03 11:11:27 +0200 fs  r272549 : #i100818# special treatment for DataAwareness not needed anymore
2009-06-03 11:07:01 +0200 fs  r272548 : #i10000# removed package declaration
2009-06-03 09:21:03 +0200 oj  r272537 : #i93465# save window states
2009-06-03 08:56:25 +0200 oj  r272535 : solve compiler warnings
2009-06-03 08:55:02 +0200 oj  r272534 : #i102295# export shapes i the first cell
2009-06-03 07:35:18 +0200 oj  r272533 : #i101994# check for - and + prefix
2009-06-03 06:51:38 +0200 oj  r272531 : #i101463# use uncomposed table name
2009-06-03 06:33:06 +0200 oj  r272530 : #i102019# word corrected
2009-06-02 14:58:28 +0200 fs  r272507 : #i102443# call initializeParser from LoadFinished
2009-06-02 14:30:10 +0200 oj  r272504 : #i102019# introduce static ints
2009-06-02 13:51:02 +0200 oj  r272501 : #i102439# wrong method used
2009-06-02 13:44:09 +0200 fs  r272500 : #i102440# when tampering with Order/GroupBy, reset the cached columns
2009-06-02 10:53:01 +0200 fs  r272487 : #i102234# preserve the original filter when using a 0=1 filter
2009-06-02 10:21:21 +0200 oj  r272486 : #i100535# handle time values as float
2009-06-02 10:19:07 +0200 fs  r272485 : merging latest changes from CWS dba32c
2009-05-29 16:00:15 +0200 fs  r272467 : merging latest changes from dba32c
2009-05-29 15:31:25 +0200 fs  r272462 : merging latest changes from dba32c
2009-05-29 10:58:03 +0200 oj  r272438 : #101135# export embedded-text
2009-05-29 08:17:57 +0200 oj  r272431 : #i80917# make attribute not optional
2009-05-29 08:17:32 +0200 oj  r272430 : remoe unused token
2009-05-29 07:17:15 +0200 oj  r272429 : #i80917# make attribute not optional
2009-05-28 12:48:14 +0200 oj  r272401 : #i102201# insert images in context menu
2009-05-28 12:47:44 +0200 oj  r272400 : #i80917# add new attribute to handle first line
2009-05-28 12:16:12 +0200 oj  r272397 : #i96134# add / to path when it doesn't exist
2009-05-28 12:11:08 +0200 oj  r272390 : #i80917# add new attribute to handle first line
2009-05-28 11:33:35 +0200 oj  r272388 : #i101652# add new checkbox to handle header line as column names
2009-05-28 11:30:15 +0200 oj  r272387 : #i101652# add localize
2009-05-28 11:15:53 +0200 oj  r272386 : merge from dba32c
2009-05-28 09:08:25 +0200 fs  r272378 : merged a build fix from CWS dba32c

3 files changed, 20 insertions, 7 deletions

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 63a76c047195..31ac92345a2f 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -996,6 +996,11 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                                     exportSection(xSection);
                             }
                         }
+                    } // if ( aColIter->xElement.is() )
+                    else if ( !bShapeHandled )
+                    {
+                        bShapeHandled = true;
+                        exportShapes(_xSection);
                     }
                     aColIter = aColIter + (aColIter->nColSpan - 1);
                 }
@@ -1617,7 +1622,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
         {
             ::std::auto_ptr<SvXMLElementExport> pSubDocument;
             uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"))),uno::UNO_QUERY);
-            if ( xModel.is() ) // special handlingfor chart object
+            if ( xModel.is() ) // special handling for chart object
             {
                 pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False));
                 exportMasterDetailFields(xShape.get());
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index b8da21afa273..ce1898df0dde 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -207,7 +207,7 @@ ODesignView::~ODesignView()
     if ( m_pAddField )
     {
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) );
-        aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
+        aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) );
         notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         ::std::auto_ptr<Window> aTemp2(m_pAddField);
         m_pAddField = NULL;
@@ -215,7 +215,7 @@ ODesignView::~ODesignView()
     if ( m_pReportExplorer )
     {
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) );
-        aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pReportExplorer->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
+        aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) );
         notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         ::std::auto_ptr<Window> aTemp2(m_pReportExplorer);
         m_pReportExplorer = NULL;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 5e6781ef909c..9b9b4c1f1ab2 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -53,8 +53,7 @@
 #include "AddField.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include "DateTime.hxx"
-#include <svtools/syslocale.hxx>
-#include <vcl/svapp.hxx>
+
 #include <sfx2/filedlghelper.hxx>
 #include <tools/string.hxx>
 #include <tools/diagnose_ex.h>
@@ -104,6 +103,7 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
+#include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 
@@ -142,6 +142,8 @@
 #include <svtools/itemset.hxx>
 #include <svtools/aeitem.hxx> //CHINA001
 #include <svtools/cliplistener.hxx>
+#include <svtools/syslocale.hxx>
+#include <svtools/viewoptions.hxx>
 
 #include <vos/mutex.hxx>
 #include "PropertyForward.hxx"
@@ -341,8 +343,11 @@ void OReportController::disposing()
         m_pClipbordNotifier->AddRemoveListener( getView(), sal_False );
         m_pClipbordNotifier->release();
         m_pClipbordNotifier = NULL;
-    }
+    } // if ( getView() && m_pClipbordNotifier )
+    if ( m_pGroupsFloater )
     {
+        SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
+        aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) );
         ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater);
         m_pGroupsFloater = NULL;
     }
@@ -2558,6 +2563,9 @@ void OReportController::openSortingAndGroupingDialog()
     if ( !m_pGroupsFloater )
     {
         m_pGroupsFloater = new OGroupsSortingDialog(getView(),!isEditable(),this);
+        SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
+        if ( aDlgOpt.Exists() )
+            m_pGroupsFloater->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
         m_pGroupsFloater->AddEventListener(LINK(this,OReportController,EventLstHdl));
     }
     else if ( isUiVisible() )
@@ -3280,7 +3288,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
     sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False);
     if ( bTime )
     {
-        sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("NOW()"));
+        sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())"));
         aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0));
         createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
     }