Merge

26 files changed, 62 insertions, 190 deletions

diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 00fe6d5a357f..5d2397fffa08 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -109,7 +109,6 @@ protected:
     virtual void SetSnapRectImpl(const Rectangle& _rRect) = 0;
     virtual SdrPage* GetImplPage() const = 0;
     virtual void SetObjectItemHelper(const SfxPoolItem& rItem);
-    sal_Bool IsInside(const Rectangle& _rRect,const Point& rPnt,USHORT nTol) const;
 
     /** called by instances of derived classes to implement their overloading of getUnoShape
     */
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 18d70930edc6..01e45f3b348a 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -64,9 +64,6 @@ namespace rptui
         ::rtl::OUString     m_sUndecoratedContent;
 
     public:
-        // constructs a ReportFormula instance which is initially invalid.
-        ReportFormula();
-
         /// constructs a ReportFormula object from a string
         ReportFormula( const ::rtl::OUString& _rFormula );
 
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index 6e0869d7e789..c0f5a90a446a 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -152,14 +152,6 @@ void OReportControlModel::checkIndex(sal_Int32 _nIndex)
         throw lang::IndexOutOfBoundsException();
 }
 // -----------------------------------------------------------------------------
-void OReportControlModel::dispose()
-{
-    m_aFormatConditions.clear();
-    lang::EventObject aDisposeEvent( m_pOwner );
-    aContainerListeners.disposeAndClear( aDisposeEvent );
-    m_aFormatConditions.clear();
-}
-// -----------------------------------------------------------------------------
 bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType)
 {
     return (_rType == ::getCppuType((const uno::Reference< beans::XPropertyState>* )0) || _rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet>* )0));
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index a79dea71193c..603f54bd3f6c 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -563,8 +563,7 @@ namespace
         }
         catch(uno::Exception& ex)
         {
-            (void)ex;
-            OSL_ASSERT(0);
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     void SAL_CALL FactoryLoader::onTerminated()
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index a11dd61e8ed6..29f3a9d7ef9c 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -115,8 +115,6 @@ namespace reportdesign
             ,bPrintWhenGroupChange(sal_False)
         {}
 
-        void dispose();
-
         // XContainer
         void addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
         void removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index 7bbd76f31796..23a0bb86e412 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -69,12 +69,6 @@ namespace rptui
     //= ReportFormula
     //====================================================================
     //--------------------------------------------------------------------
-    ReportFormula::ReportFormula()
-        :m_eType( Invalid )
-    {
-    }
-
-    //--------------------------------------------------------------------
     ReportFormula::ReportFormula( const ::rtl::OUString& _rFormula )
         :m_eType( Invalid )
     {
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 2d9d3d225673..73fa05e81620 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -363,22 +363,6 @@ uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent()
 {
     return uno::Reference< beans::XPropertySet>();
 }
-// -----------------------------------------------------------------------------
-sal_Bool OObjectBase::IsInside(const Rectangle& _rRect,const Point& rPnt,USHORT nTol) const
-{
-    sal_Bool bRet = sal_False;
-    Rectangle aRect( _rRect );
-    if ( !aRect.IsEmpty() )
-    {
-        aRect.Left() -= nTol;
-        aRect.Top() -= nTol;
-        aRect.Right() = ( aRect.Right() == RECT_EMPTY ? _rRect.Left() + nTol : aRect.Right() + nTol );
-        aRect.Bottom() = ( aRect.Bottom() == RECT_EMPTY ? _rRect.Top() + nTol : aRect.Bottom() + nTol );
-
-        bRet = aRect.IsInside( rPnt );
-    }
-    return bRet;
-}
 //----------------------------------------------------------------------------
 void OObjectBase::StartListening()
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 31ac92345a2f..a4032b35f073 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -172,40 +172,6 @@ namespace rptxml
     }
 
     //---------------------------------------------------------------------
-    ::rtl::OUString lcl_implGetPropertyXMLType(const Type& _rType)
-    {
-        // possible types we can write (either because we recognize them directly or because we convert _rValue
-        // into one of these types)
-        static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean"));
-        static const ::rtl::OUString s_sTypeShort   (RTL_CONSTASCII_USTRINGPARAM("short"));
-        static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int"));
-        static const ::rtl::OUString s_sTypeLong    (RTL_CONSTASCII_USTRINGPARAM("long"));
-        static const ::rtl::OUString s_sTypeDouble  (RTL_CONSTASCII_USTRINGPARAM("double"));
-        static const ::rtl::OUString s_sTypeString  (RTL_CONSTASCII_USTRINGPARAM("string"));
-
-        // handle the type description
-        switch (_rType.getTypeClass())
-        {
-            case TypeClass_STRING:
-                return s_sTypeString;
-            case TypeClass_DOUBLE:
-                return s_sTypeDouble;
-            case TypeClass_BOOLEAN:
-                return s_sTypeBoolean;
-            case TypeClass_BYTE:
-            case TypeClass_SHORT:
-                return s_sTypeShort;
-            case TypeClass_LONG:
-                return s_sTypeInteger;
-            case TypeClass_HYPER:
-                return s_sTypeLong;
-            case TypeClass_ENUM:
-                return s_sTypeInteger;
-
-            default:
-                return s_sTypeDouble;
-        }
-    }
 
     class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper
     {
@@ -293,6 +259,16 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1
     {
         _GetNamespaceMap().Add( GetXMLToken(XML_NP_STYLE), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
     }
+    // RDFa: needed for content and header/footer styles
+    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    {
+        _GetNamespaceMap().Add( GetXMLToken(XML_NP_XHTML),GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
+    }
+    // GRDDL: to convert RDFa and meta.xml to RDF
+    if( (getExportFlags() & (EXPORT_META|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    {
+        _GetNamespaceMap().Add( GetXMLToken(XML_NP_GRDDL),GetXMLToken(XML_N_GRDDL), XML_NAMESPACE_GRDDL );
+    }
 
     _GetNamespaceMap().Add( GetXMLToken(XML_NP_TABLE), GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE );
     _GetNamespaceMap().Add( GetXMLToken(XML_NP_NUMBER), GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
@@ -948,9 +924,9 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                                     AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation);
                                 }
                                 bExportData = sal_True;
-                                ::rtl::OUStringBuffer sValue;

-                                const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();

-                                if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )

+                                ::rtl::OUStringBuffer sValue;
+                                const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();
+                                if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )
                                     AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, sValue.makeStringAndClear() );
                             }
                             else if ( xReportDefinition.is() )
@@ -1476,45 +1452,6 @@ sal_uInt32 ORptExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass)
     return aBuffer.makeStringAndClear();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ORptExport::implConvertMeasure(sal_Int32 _nValue)
-{
-    ::rtl::OUStringBuffer aBuffer;
-    GetMM100UnitConverter().convertMeasure(aBuffer, _nValue);
-    return aBuffer.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-::rtl::OUString ORptExport::implConvertAny(const Any& _rValue)
-{
-    ::rtl::OUStringBuffer aBuffer;
-    switch (_rValue.getValueTypeClass())
-    {
-        case TypeClass_STRING:
-        {   // extract the string
-            ::rtl::OUString sCurrentValue;
-            _rValue >>= sCurrentValue;
-            aBuffer.append(sCurrentValue);
-        }
-        break;
-        case TypeClass_DOUBLE:
-            // let the unit converter format is as string
-            GetMM100UnitConverter().convertDouble(aBuffer, getDouble(_rValue));
-            break;
-        case TypeClass_BOOLEAN:
-            aBuffer = getBOOL(_rValue) ? ::xmloff::token::GetXMLToken(XML_TRUE) : ::xmloff::token::GetXMLToken(XML_FALSE);
-            break;
-        case TypeClass_BYTE:
-        case TypeClass_SHORT:
-        case TypeClass_LONG:
-            // let the unit converter format is as string
-            GetMM100UnitConverter().convertNumber(aBuffer, getINT32(_rValue));
-            break;
-        default:
-            OSL_ENSURE(0,"ORptExport::implConvertAny: Invalid type");
-    }
-
-    return aBuffer.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
 UniReference < XMLPropertySetMapper > ORptExport::GetCellStylePropertyMapper() const
 {
     return m_xCellStylesPropertySetMapper;
@@ -1650,6 +1587,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                 uno::Reference< XFunction> xFunction = xFunctions->createFunction();
                 ::rtl::OUString sFunction,sPrefix,sPostfix;
                 ::rtl::OUString sExpression = xGroup->getExpression();
+                ::rtl::OUString sFunctionName;
                 switch(nGroupOn)
                 {
                     case report::GroupOn::PREFIX_CHARACTERS:
@@ -1660,8 +1598,9 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                         sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YEAR"));
                         break;
                     case report::GroupOn::QUARTAL:
-                        sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH"));
-                        sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/4"));
+                        sFunction   = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT((MONTH"));
+                        sPostfix    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
+                        sFunctionName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("QUARTAL_")) + sExpression;
                         break;
                     case report::GroupOn::MONTH:
                         sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH"));
@@ -1689,15 +1628,21 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                             exportFunction(xCountFunction);
                             sExpression = sCountName;
                             sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
+                            sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression;
                         }
                         break;
                     default:
                         ;
                 }
+                if ( !sFunctionName.getLength() )
+                    sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression;
                 if ( sFunction.getLength() )
                 {
+                    sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'};
+                    for(sal_Int32 i= 0; i < sizeof(pReplaceChars)/sizeof(pReplaceChars[0]);++i)
+                        sFunctionName = sFunctionName.replace(pReplaceChars[i],'_');
 
-                    xFunction->setName(sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression);
+                    xFunction->setName(sFunctionName);
                     sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFunction;
                     sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(["));
                     sFunction += sExpression;
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 3b8e621b52ae..3bd478b60ba8 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -177,9 +177,7 @@ private:
     void                    exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups);
     ::rtl::OUString         convertFormula(const ::rtl::OUString& _sFormula);
 
-    ::rtl::OUString         implConvertAny(const Any& _rValue);
     ::rtl::OUString         implConvertNumber(sal_Int32 _nValue);
-    ::rtl::OUString         implConvertMeasure(sal_Int32 _nValue);
 
 private:
                                     ORptExport();
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 383cc88336ca..195b41aaa3c0 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -140,10 +140,12 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
                                     nGroupOn = report::GroupOn::YEAR;
                                 else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:MONTH")))
                                 {
-                                    if ( sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("\4",2) )
-                                        nGroupOn = report::GroupOn::QUARTAL;
-                                    else
-                                        nGroupOn = report::GroupOn::MONTH;
+                                    nGroupOn = report::GroupOn::MONTH;
+                                }
+                                else if ( sCompleteFormula.matchAsciiL("rpt:INT((MONTH",sizeof("rpt:INT((MONTH"),0)
+                                       && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",sizeof("-1)/3)+1")) )
+                                {
+                                    nGroupOn = report::GroupOn::QUARTAL;
                                 }
                                 else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:WEEK")))
                                     nGroupOn = report::GroupOn::WEEK;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index ea1095258261..930c7cb8ad12 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/chart2/data/DatabaseDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
+#include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <comphelper/sequence.hxx>
@@ -59,7 +60,6 @@ using namespace ::xmloff::token;
 
 ImportDocumentHandler::ImportDocumentHandler(uno::Reference< uno::XComponentContext > const & context) :
      m_xContext(context)
-    ,m_bOnlyOnce(true)
 {
 }
 // -----------------------------------------------------------------------------
@@ -122,6 +122,26 @@ void SAL_CALL ImportDocumentHandler::startDocument() throw (uno::RuntimeExceptio
 void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException)
 {
     m_xDelegatee->endDocument();
+    uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW);
+    if ( xReceiver.is() )
+    {
+        xReceiver->attachDataProvider(m_xDatabaseDataProvider.get());
+        // this fills the chart again
+        uno::Sequence< beans::PropertyValue > aArgs( 4 );
+        aArgs[0] = beans::PropertyValue(
+            ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+            uno::makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("all")) ), beans::PropertyState_DIRECT_VALUE );
+        aArgs[1] = beans::PropertyValue(
+            ::rtl::OUString::createFromAscii("HasCategories"), -1,
+            uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
+        aArgs[2] = beans::PropertyValue(
+            ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+            uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
+        aArgs[3] = beans::PropertyValue(
+            ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+            uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
+        xReceiver->setArguments( aArgs );
+    }
 }
 
 void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException)
@@ -254,16 +274,6 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
             }
         } // for(;pArgIter != pArgEnd;++pArgIter)
 
-        if ( m_bOnlyOnce )
-        {
-            try
-            {
-                m_xDatabaseDataProvider->createDataSource(m_aArguments);
-                m_bOnlyOnce = false;
-            }
-            catch(uno::Exception)
-            {}
-        } // if ( m_bOnlyOnce )
 
         SvXMLAttributeList* pList = new SvXMLAttributeList();
         xNewAttribs = pList;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 068fac8cb5f9..69772a71674d 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -100,7 +100,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider >   m_xDatabaseDataProvider;
 
     ::std::auto_ptr<SvXMLTokenMap>                                                      m_pReportElemTokenMap;
-    bool                                                                                m_bOnlyOnce;
 };
 // -----------------------------------------------------------------------------
 } // namespace rptxml
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 683e4cb78a3d..cd42b1e85007 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -160,9 +160,11 @@ namespace rptui
         */
         void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false);
 
+#if 0
         /** checks if alignment is possible in the current section
         */
         sal_Bool isAlignPossible() const;
+#endif
 
         /** All objects will be marked.
         */
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index e406bcf7ccb9..fcf274d314e4 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -93,7 +93,6 @@ namespace rptui
         rtl::OUString   GetInsertObjString() const;
         void            setGridSnap(BOOL bOn);
         void            setDragStripes(BOOL bOn);
-        BOOL            isDragStripes() const;
 
         /** copies the current selection in this section
         */
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 4eaf9720abda..6098c7bbb2e1 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -106,7 +106,6 @@ namespace rptui
         rtl::OUString           GetInsertObjString() const;
         void                    setGridSnap(BOOL bOn);
         void                    setDragStripes(BOOL bOn);
-        BOOL                    isDragStripes() const;
         /** copies the current selection in this section
         */
         void Copy();
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index d14abd076fc5..a9d532bb95dc 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -76,10 +76,6 @@ namespace rptui
         void            setTitle(const String& _sTitle);
         sal_Int32       getMinHeight() const;
 
-        /** returns the offset where the horizontal ruler must start
-        */
-        sal_Int32       getRulerOffset() const;
-
         /** shows or hides the ruler.
         */
         void            showRuler(sal_Bool _bShow);
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index d4e0a720807a..88c557213631 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -203,8 +203,6 @@ namespace rptui
         */
         ::boost::shared_ptr<OSectionWindow> getSectionWindow(const USHORT _nPos) const;
 
-        void            showView(USHORT _nPos,BOOL _bShow);
-
         /** turns the grid on or off
         *
         * \param _bVisible
@@ -212,7 +210,6 @@ namespace rptui
         void            toggleGrid(sal_Bool _bVisible);
         void            setGridSnap(BOOL bOn);
         void            setDragStripes(BOOL bOn);
-        BOOL            isDragStripes() const;
 
         /** returns the total accumulated height of all sections until _pSection is reached
         */
@@ -249,8 +246,6 @@ namespace rptui
         */
         BOOL HasSelection();
 
-        void            SectionHasFocus(OReportSection* _pSection,BOOL _bHasFocus);
-
         /** unmark all objects on the views without the given one.
         *
         * @param _pSectionView The view where the objects should not be unmarked.
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 40264c642d52..f6ad0b90a14d 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -680,12 +680,14 @@ void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlig
 {
     m_aScrollWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects);
 }
+#if 0
 // -----------------------------------------------------------------------------
 sal_Bool ODesignView::isAlignPossible() const
 {
     ::boost::shared_ptr<OSectionWindow> pMarkedSection = getMarkedSection();
     return pMarkedSection.get() && pMarkedSection->getReportSection().getSectionView().IsAlignPossible();
 }
+#endif
 //------------------------------------------------------------------------------
 sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
 {
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 1df7981e21b4..d3030fe274bd 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1731,7 +1731,9 @@ void OReportController::impl_initialize( )
                     m_xReportDefinition->setCommand(aNames[0]);
                     m_xReportDefinition->setCommandType(sdb::CommandType::TABLE);
                 }
-            }
+            } // if ( !sHierarchicalDocumentName.getLength() && getConnection().is() )
+
+            m_aVisualAreaSize = m_xReportDefinition->getVisualAreaSize(0);
 
         } // if ( m_xReportDefinition.is() )
 
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 98dd0d2390a7..39f1c9505672 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -378,11 +378,6 @@ void OReportWindow::setDragStripes(BOOL bOn)
     m_aViewsWindow.setDragStripes(bOn);
 }
 // -----------------------------------------------------------------------------
-BOOL OReportWindow::isDragStripes() const
-{
-    return m_aViewsWindow.isDragStripes();
-}
-// -----------------------------------------------------------------------------
 sal_uInt32 OReportWindow::getMarkedObjectCount() const
 {
     return m_aViewsWindow.getMarkedObjectCount();
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 5d13f78f3755..b39824d5e8ea 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -393,11 +393,6 @@ void OScrollWindowHelper::setDragStripes(BOOL bOn)
     m_aReportWindow.setDragStripes(bOn);
 }
 // -----------------------------------------------------------------------------
-BOOL OScrollWindowHelper::isDragStripes() const
-{
-    return m_aReportWindow.isDragStripes();
-}
-// -----------------------------------------------------------------------------
 sal_uInt32 OScrollWindowHelper::getMarkedObjectCount() const
 {
     return m_aReportWindow.getMarkedObjectCount();
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 5a22e9cff5ed..64effaf27632 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -286,12 +286,6 @@ void OStartMarker::showRuler(sal_Bool _bShow)
     m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
 }
 //------------------------------------------------------------------------------
-sal_Int32 OStartMarker::getRulerOffset() const
-{
-    return m_aVRuler.GetSizePixel().Width();
-}
-
-//------------------------------------------------------------------------------
 void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
 {
     if( m_aText.GetText().Len())
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index aebf42bfaa00..999dcf79f915 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -337,12 +337,6 @@ void OViewsWindow::removeSection(USHORT _nPosition)
         Resize();
     } // if ( _nPosition < m_aSections.size() )
 }
-//----------------------------------------------------------------------------
-void OViewsWindow::showView(USHORT _nPos,BOOL _bShow)
-{
-    if ( _nPos < m_aSections.size() )
-        m_aSections[_nPos]->setCollapsed(_bShow);
-}
 //------------------------------------------------------------------------------
 void OViewsWindow::toggleGrid(BOOL _bVisible)
 {
@@ -534,21 +528,6 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType)
         ::std::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper()));
     m_bInUnmark = sal_False;
 }
-//----------------------------------------------------------------------------
-void OViewsWindow::SectionHasFocus(OReportSection* /*_pSection*/,BOOL /*_bHasFocus*/)
-{
-/* LLA!: this function does nothing!
-TSectionsMap::iterator aIter = m_aSections.begin();
-    TSectionsMap::iterator aEnd = m_aSections.end();
-    for (USHORT i = 0 ; aIter != aEnd ; ++aIter,++i)
-    {
-        if ( (*aIter).first.get() == _pSection )
-        {
-
-        }
-    }
-*/
-}
 //-----------------------------------------------------------------------------
 void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
 {
@@ -987,12 +966,6 @@ void OViewsWindow::setDragStripes(BOOL bOn)
         (*aIter)->getReportSection().getSectionView().SetDragStripes(bOn);
 }
 // -----------------------------------------------------------------------------
-BOOL OViewsWindow::isDragStripes() const
-{
-    return !m_aSections.empty() && (*m_aSections.begin())->getReportSection().getSectionView().IsDragStripes();
-}
-// -----------------------------------------------------------------------------
-
 USHORT OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
diff --git a/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml b/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml
index 6aaa305ae7a1..76c197f06174 100644
--- a/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml
+++ b/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml
@@ -4,6 +4,7 @@
   <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/>
+  <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/>
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/>
   <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/>
diff --git a/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml b/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml
index 6aaa305ae7a1..76c197f06174 100644
--- a/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml
+++ b/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml
@@ -4,6 +4,7 @@
   <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/>
+  <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/>
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/>
   <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/>
diff --git a/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml b/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml
index 6aaa305ae7a1..76c197f06174 100644
--- a/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml
+++ b/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml
@@ -4,6 +4,7 @@
   <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/>
   <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/>
+  <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/>
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/>
   <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/>