Tag: cws_src680_titles02 User: as Date: 2008-02-12 13:27:06+0000 Modified: dba/reportdesign/source/ui/inc/ReportController.hxx dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/util/makefile.mk
Log: RESYNC: (1.3-1.4); FILE MERGED File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ReportController.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportController.hxx?r1=1.3.58.2&r2=1.3.58.3 Delta lines: +3 -10 -------------------- --- ReportController.hxx 2007-12-17 15:25:04+0000 1.3.58.2 +++ ReportController.hxx 2008-02-12 13:26:50+0000 1.3.58.3 @@ -202,11 +202,6 @@ */ void listen(const bool _bAdd); - /** saves the report definition - @param _bSaveAs if <TRUE/> then the report will be saved as a new one. - */ - sal_Bool doSaveDoc(sal_Bool _bSaveAs); - /** opens the common page dialog */ void openPageDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); @@ -307,8 +302,6 @@ DECL_LINK( OnInvalidateClipboard, void* ); DECL_LINK( OnClipboardChanged, void* ); DECL_LINK( OnExecuteReport, void* ); - DECL_LINK( OnSave, void* ); - DECL_LINK( OnSaveAs, void* ); DECL_LINK( OnOpenHelpAgent, void* ); short saveModified(); // all the features which should be handled by this class Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.6.6.2&r2=1.6.6.3 Delta lines: +21 -136 ---------------------- --- ReportController.cxx 2007-12-17 15:25:05+0000 1.6.6.2 +++ ReportController.cxx 2008-02-12 13:26:53+0000 1.6.6.3 @@ -341,30 +341,6 @@ _xWindow = VCLUnoHelper::GetInterface(_pView); return xReportControlFormat; } -// ----------------------------------------------------------------------------- -// check overlapping -void lcl_correctOverlapping(SdrObject* pControl,::boost::shared_ptr<OReportSection> _pReportSection,bool _bAppend = true) -{ - OSectionView* pSectionView = _pReportSection->getView(); - uno::Reference< report::XReportComponent> xComponent(pControl->getUnoShape(),uno::UNO_QUERY); - Rectangle aRet(VCLPoint(xComponent->getPosition()),VCLSize(xComponent->getSize())); - aRet.setHeight(aRet.getHeight() + 1); - aRet.setWidth(aRet.getWidth() + 1); - bool bOverlapping = true; - while ( bOverlapping ) - { - const SdrObject* pOverlappedObj = isOver(aRet,*_pReportSection->getPage(),*pSectionView,true,pControl); - bOverlapping = pOverlappedObj != NULL; - if ( bOverlapping ) - { - const Rectangle& aLogicRect = pOverlappedObj->GetLogicRect(); - aRet.Move(0,aLogicRect.Top() + aLogicRect.getHeight() - aRet.Top()); - xComponent->setPositionY(aRet.Top()); - } - } - if ( !bOverlapping && _bAppend ) // now insert objects - pSectionView->InsertObjectAtView(pControl,*pSectionView->GetSdrPageView(),SDRINSERT_ADDMARK); -} //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) { @@ -635,6 +611,16 @@ case SID_EXECUTE_REPORT: aReturn.bEnabled = isConnected() && isEditable() && m_xReportDefinition.is() && m_xReportDefinition->getCommand().getLength(); + if ( aReturn.bEnabled ) + { + aReturn.bEnabled = sal_False; + const sal_uInt16 nCount = m_aReportModel->GetPageCount(); + for (sal_uInt16 i = 0; i < nCount && !aReturn.bEnabled ; ++i) + { + const SdrPage* pPage = m_aReportModel->GetPage(i); + aReturn.bEnabled = pPage->GetObjCount() != 0; + } + } break; case SID_DELETE: aReturn.bEnabled = isEditable() && m_pMyOwnView->HasSelection() && !m_pMyOwnView->isHandleEvent(_nId); @@ -1689,12 +1675,6 @@ { } break; - case SID_SAVEASDOC: - //getView()->PostUserEvent(LINK(this, OReportController,OnSaveAs)); - break; - case SID_SAVEDOC: - getView()->PostUserEvent(LINK(this, OReportController,OnSave)); - break; case SID_EDITDOC: if(isEditable()) { // the state should be changed to not editable @@ -1878,7 +1858,7 @@ return sal_True; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OReportController::suspend(sal_Bool _bSuspend) throw( RuntimeException ) +sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException ) { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; @@ -1889,11 +1869,8 @@ if ( getView() && getView()->IsInModalMode() ) return sal_False; - sal_Bool bCheck = sal_True; - (void)_bSuspend; - - // this suspend will handle in the DBAccess interceptor implementation - return bCheck; + // this suspend will be handled in the DBAccess interceptor implementation + return sal_True; } // ----------------------------------------------------------------------------- void OReportController::describeSupportedFeatures() @@ -2407,86 +2384,7 @@ InvalidateFeature(SID_PASTE); return 0L; } -// ----------------------------------------------------------------------------- -sal_Bool OReportController::doSaveDoc(sal_Bool _bSaveAs) -{ - WaitObject aWO(getView()); - - sal_Bool bRet = sal_False; - if ( m_xReportDefinition.is() ) - try - { - if ( !_bSaveAs ) - { - uno::Reference< embed::XStorage > xStorage = m_xReportDefinition->getDocumentStorage(); - OSL_ENSURE(xStorage.is(),"No Storage available!"); - if ( xStorage.is() ) - { - m_xReportDefinition->storeToStorage(xStorage,m_xReportDefinition->getArgs()); - } - } - - - uno::Reference< sdb::XDocumentDataSource> xDocumentDataSource(getDataSource(),UNO_QUERY); - if ( xDocumentDataSource.is() ) - { - uno::Reference< sdb::XReportDocumentsSupplier> xSup(xDocumentDataSource->getDatabaseDocument(),UNO_QUERY); - if ( xSup.is() ) - { - uno::Reference< container::XNameContainer> xNames(xSup->getReportDocuments(),uno::UNO_QUERY); - OSL_ENSURE(xNames.is(),"Who blows my XNameAccess up! -> GPF"); - sal_Bool bNew = (0 == m_sName.getLength()); - bNew = bNew || _bSaveAs || (xNames.is() && !xNames->hasByName(m_sName)); - // first we need a name for our query so ask the user - if ( bNew ) - { - ::rtl::OUString sDefault; - if (_bSaveAs && !bNew) - sDefault = m_sName; - else - sDefault = getTitle(); - - String aGcc3WorkaroundTemporary( ModuleRes(STR_RPT_LABEL)); - const ::rtl::OUString sLabel(aGcc3WorkaroundTemporary); - Sequence< Any > aArgs(4); - Reference< awt::XWindow> xWindow = getTopMostContainerWindow(); - if ( !xWindow.is() ) - { - xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent()); - } - // the parent window - aArgs[0] <<= beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")),makeAny(xWindow)); - aArgs[1] <<= beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultValue")),makeAny(sDefault)); - aArgs[2] <<= beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),makeAny(sLabel)); - aArgs[3] <<= beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalNameAccess")),makeAny(uno::Reference< container::XHierarchicalNameAccess>(xNames,uno::UNO_QUERY))); - - Reference< XExecutableDialog > xDialog(getORB()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.SaveAsDialog")),aArgs), UNO_QUERY); - - // execute it - if (xDialog.is() && xDialog->execute() == RET_OK ) - { - uno::Reference<beans::XPropertySet> xProp(xDialog,uno::UNO_QUERY_THROW); - xProp->getPropertyValue(PROPERTY_NAME) >>= m_sName; - m_xReportDefinition->setName(m_sName); - xNames->insertByName(m_sName,uno::makeAny(m_xReportDefinition)); - } - else - return sal_False; - } // if(bNew) - //else - // xNames->replaceByName(m_sName,uno::makeAny(m_xReportDefinition)); - } // if ( xSup.is() ) - } - setModified(sal_False); - } - catch(Exception&) - { - DBG_UNHANDLED_EXCEPTION(); - bRet = sal_False; - } - return bRet; -} namespace { // ----------------------------------------------------------------------------- @@ -3210,20 +3108,6 @@ return 0L; } // ----------------------------------------------------------------------------- -IMPL_LINK( OReportController, OnSave, void* ,/*_pMemfun*/) -{ - //m_nExecuteReportEvent = 0; - doSaveDoc(sal_False); - return 0L; -} -// ----------------------------------------------------------------------------- -IMPL_LINK( OReportController, OnSaveAs, void* ,/*_pMemfun*/) -{ - //m_nExecuteReportEvent = 0; - doSaveDoc(sal_True); - return 0L; -} -// ----------------------------------------------------------------------------- void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const ::rtl::OUString& _sFunction,sal_uInt16 _nObjectId) { SequenceAsHashMap aMap(_aArgs); @@ -3315,7 +3199,7 @@ aPos.X = nPaperWidth - nShapeWidth; xShapeProp->setPosition(aPos); - lcl_correctOverlapping(pNewControl,pReportSection); + correctOverlapping(pNewControl,pReportSection); } // ----------------------------------------------------------------------------- void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) @@ -3622,7 +3506,8 @@ xShapeProp->setName(xShapeProp->getName() + sDefaultName ); for(i = 0; i < sizeof(pControl)/sizeof(pControl[0]);++i) - lcl_correctOverlapping(pControl[i],pReportSection[1-i]); + correctOverlapping(pControl[i],pReportSection[1-i]); + if (!bLabelAboveTextField ) { uno::Reference< report::XReportComponent> xComponent(pControl[1]->getUnoShape(),uno::UNO_QUERY_THROW); @@ -3638,7 +3523,7 @@ } else xShapeProp->setPositionY(nY2); - lcl_correctOverlapping(pControl[nWhich],pReportSection[1 - nWhich],false); + correctOverlapping(pControl[nWhich],pReportSection[1 - nWhich],false); nY1 = xShapeProp->getPositionY(); nY2 = xComponent->getPositionY(); Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.9.8.1&r2=1.9.8.2 Delta lines: +20 -15 --------------------- --- makefile.mk 2007-12-10 11:36:16+0000 1.9.8.1 +++ makefile.mk 2008-02-12 13:26:56+0000 1.9.8.2 @@ -234,26 +234,25 @@ LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />) .ENDIF # "$(GUI)"!="WNT" - -REPRORTJARFILES := \ +REPORTJARFILES := \ + $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ + $(ZIP1DIR)$/jcommon-serializer-0.2.0.jar \ + $(ZIP1DIR)$/libfonts-0.3.3.jar \ + $(ZIP1DIR)$/libformula-0.1.14.jar \ + $(ZIP1DIR)$/liblayout-0.2.8.jar \ + $(ZIP1DIR)$/libloader-0.3.6.jar \ + $(ZIP1DIR)$/librepository-0.1.4.jar \ + $(ZIP1DIR)$/libxml-0.9.9.jar \ + $(ZIP1DIR)$/pentaho-reporting-flow-engine-0.9.2.jar \ $(ZIP1DIR)$/sac.jar \ - $(ZIP1DIR)$/libxml-0.9.5.jar \ - $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar \ - $(ZIP1DIR)$/jfreereport-0.9.0-05.jar \ - $(ZIP1DIR)$/liblayout-0.2.6.jar \ - $(ZIP1DIR)$/libloader-0.3.4.jar \ - $(ZIP1DIR)$/libformula-0.1.8.jar \ - $(ZIP1DIR)$/librepository-0.1.1.jar \ - $(ZIP1DIR)$/libfonts-0.2.6.jar \ - $(ZIP1DIR)$/jcommon-serializer-0.1.0.jar \ $(ZIP1DIR)$/sun-report-builder.jar # --- Targets ---------------------------------- .INCLUDE : target.mk .IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) +$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" $(MISC)$/update_report.flag : $(XCU_FILES) @@ -287,9 +286,15 @@ echo $(XCU_TMP) $(COPY) $< $@ +.IF "$(SYSTEM_JFREEREPORT)" == "YES" +$(ZIP1DIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ +.ELSE $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +.ENDIF $(ZIP1DIR)$/%.jar : $(CLASSDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
