diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-11-16 17:05:37 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-11-16 17:05:37 +0100 |
commit | 87883bec42caa81704e5b64fb8a5d553326f7cc6 (patch) | |
tree | 90d89ff60e4930c2fde8cc63aec1b75a0c1e8f84 /reportdesign | |
parent | 8c97f26be6290ee6d8ca201d9db66a2a6f7902aa (diff) |
dba33d: #i105554# apply patch from cmc
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 1 | ||||
-rw-r--r-- | reportdesign/inc/reportformula.hxx | 3 | ||||
-rw-r--r-- | reportdesign/source/core/api/ReportControlModel.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/core/inc/ReportControlModel.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/core/misc/reportformula.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 16 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 73 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ReportWindow.hxx | 1 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ScrollHelper.hxx | 1 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/StartMarker.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 5 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportWindow.cxx | 5 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ScrollHelper.cxx | 5 | ||||
-rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 27 |
18 files changed, 4 insertions, 165 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/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 b0012e731c81..588b8c4a0e61 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 { @@ -1486,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; 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/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/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 d87f7464a140..7c51439cd124 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(); |