diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 23:17:51 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 23:17:51 -0600 |
commit | 256f6ca67d03b875e8e6a355a6cf5130ea7404a3 (patch) | |
tree | c1916add744093d07466b54d6af832cd87891d8e /reportdesign/source/ui/inc/DesignView.hxx | |
parent | Remove 'added by' comments (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | core-256f6ca67d03b875e8e6a355a6cf5130ea7404a3.tar.gz core-256f6ca67d03b875e8e6a355a6cf5130ea7404a3.zip |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (76 commits)
masterfix DEV300: #i10000# usage of L10N build_type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
hr75: #i116747#: remove obsolete copyright notices
gnumake3: remove comphelper version; fix including extract.hxx
removetooltypes01: #i112600# Replace missing tools types replacement
removetooltypes01: #i112600# remove tooltypes from reportdesign
removetooltypes01: #i112600# remove tooltypes from dbaccess
undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase)
undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only
undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT
gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory
dba34b: #109956# notify column value in correct order
dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow
undoapi: assert unknown slots in ImplInvalidateFeature
dba34b: #i110907# check if design handle event
dba34b: #i109956# notify column values when row is refreshed
dba34b: #i115753# add test again
undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller
undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come.
...
Conflicts:
dbaccess/inc/IEnvironment.hxx
dbaccess/inc/dataview.hxx
dbaccess/qa/complex/dbaccess/RowSet.java
dbaccess/source/core/api/CacheSet.cxx
dbaccess/source/core/api/KeySet.hxx
dbaccess/source/core/api/OptimisticSet.hxx
dbaccess/source/core/api/RowSet.cxx
dbaccess/source/core/api/RowSetCache.cxx
dbaccess/source/ext/adabas/Acomponentmodule.cxx
dbaccess/source/ext/adabas/Aservices.cxx
dbaccess/source/filter/migration/cfgimport.cxx
dbaccess/source/filter/migration/cfgimport.hxx
dbaccess/source/filter/migration/cfgservices.cxx
dbaccess/source/filter/migration/makefile.mk
dbaccess/source/inc/cfg_reghelper.hxx
dbaccess/source/sdbtools/misc/sdbt_services.cxx
dbaccess/source/shared/cfg_reghelper.cxx
dbaccess/source/shared/cfgstrings.cxx
dbaccess/source/shared/registrationhelper.cxx
dbaccess/source/ui/app/AppController.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailPageHelper.hxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/browser/brwctrlr.cxx
dbaccess/source/ui/browser/dataview.cxx
dbaccess/source/ui/browser/unodatbr.cxx
dbaccess/source/ui/control/dbtreelistbox.cxx
dbaccess/source/ui/control/opendoccontrols.cxx
dbaccess/source/ui/control/tabletree.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPage.src
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
dbaccess/source/ui/dlg/ExtensionNotPresent.src
dbaccess/source/ui/dlg/TablesSingleDlg.cxx
dbaccess/source/ui/dlg/adodatalinks.hxx
dbaccess/source/ui/dlg/dbadmin2.src
dbaccess/source/ui/dlg/dbadminsetup.src
dbaccess/source/ui/dlg/dlgattr.cxx
dbaccess/source/ui/dlg/dlgsize.src
dbaccess/source/ui/dlg/makefile.mk
dbaccess/source/ui/dlg/sqlmessage.cxx
dbaccess/source/ui/inc/ExtensionNotPresent.hxx
dbaccess/source/ui/inc/TokenWriter.hxx
dbaccess/source/ui/inc/imageprovider.hxx
dbaccess/source/ui/misc/DExport.cxx
dbaccess/source/ui/misc/HtmlReader.cxx
dbaccess/source/ui/misc/RowSetDrop.cxx
dbaccess/source/ui/misc/RtfReader.cxx
dbaccess/source/ui/misc/TokenWriter.cxx
dbaccess/source/ui/misc/imageprovider.cxx
dbaccess/source/ui/misc/linkeddocuments.cxx
dbaccess/source/ui/misc/singledoccontroller.cxx
dbaccess/source/ui/querydesign/ConnectionData.hxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/relationdesign/RelationController.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/table.src
reportdesign/inc/RptPage.hxx
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
reportdesign/source/core/api/ReportDefinition.cxx
reportdesign/source/core/sdr/ReportUndoFactory.cxx
reportdesign/source/core/sdr/UndoEnv.cxx
reportdesign/source/filter/xml/xmlservices.cxx
reportdesign/source/ui/dlg/GroupsSorting.cxx
reportdesign/source/ui/dlg/Navigator.cxx
reportdesign/source/ui/inspection/metadata.cxx
reportdesign/source/ui/misc/RptUndo.cxx
reportdesign/source/ui/misc/UITools.cxx
reportdesign/source/ui/misc/rptuiservices.cxx
reportdesign/source/ui/report/DesignView.cxx
reportdesign/source/ui/report/FixedTextColor.cxx
reportdesign/source/ui/report/ReportController.cxx
reportdesign/source/ui/report/ReportSection.cxx
reportdesign/source/ui/report/SectionView.cxx
reportdesign/source/ui/report/SectionWindow.cxx
reportdesign/source/ui/report/StartMarker.cxx
reportdesign/source/ui/report/ViewsWindow.cxx
reportdesign/source/ui/report/dlgedfunc.cxx
reportdesign/source/ui/report/report.src
Diffstat (limited to 'reportdesign/source/ui/inc/DesignView.hxx')
-rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index ffe4b5f37cb1..a85f500de4df 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -84,14 +84,14 @@ namespace rptui Timer m_aMarkTimer; Point m_aScrollOffset; DlgEdMode m_eMode; - USHORT m_nCurrentPosition; - USHORT m_eActObj; - BOOL m_bFirstDraw; + sal_uInt16 m_nCurrentPosition; + sal_uInt16 m_eActObj; + sal_Bool m_bFirstDraw; Size m_aGridSizeCoarse; Size m_aGridSizeFine; - BOOL m_bGridVisible; - BOOL m_bGridSnap; - BOOL m_bDeleted; + sal_Bool m_bGridVisible; + sal_Bool m_bGridSnap; + sal_Bool m_bDeleted; DECL_LINK( MarkTimeout, Timer * ); @@ -126,8 +126,8 @@ namespace rptui inline OReportController& getController() const { return m_rReportController; } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - USHORT GetInsertObj() const; + void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + sal_uInt16 GetInsertObj() const; rtl::OUString GetInsertObjString() const; DlgEdMode GetMode() const { return m_eMode; } @@ -143,7 +143,7 @@ namespace rptui * * \return <TRUE/> if paste is allowed */ - BOOL IsPasteAllowed() const; + sal_Bool IsPasteAllowed() const; /** paste a new control in this section */ @@ -163,17 +163,17 @@ namespace rptui void SelectAll(const sal_uInt16 _nObjectType); /// checks if a selection exists - BOOL HasSelection() const; + sal_Bool HasSelection() const; void UpdatePropertyBrowserDelayed(OSectionView& _rView); - USHORT getSectionCount() const; + sal_uInt16 getSectionCount() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(sal_uInt16 _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. @@ -181,13 +181,13 @@ namespace rptui */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,USHORT _nPosition = USHRT_MAX); + ,sal_uInt16 _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } inline Size getGridSizeFine() const { return m_aGridSizeFine; } - inline BOOL isGridSnap() const { return m_bGridSnap; } - void setGridSnap(BOOL bOn); - void setDragStripes(BOOL bOn); + inline sal_Bool isGridSnap() const { return m_bGridSnap; } + void setGridSnap(sal_Bool bOn); + void setDragStripes(sal_Bool bOn); /** turns the grid on or off * * \param _bGridVisible @@ -196,10 +196,10 @@ namespace rptui void togglePropertyBrowser(sal_Bool _bToogleOn); - BOOL isAddFieldVisible() const; + sal_Bool isAddFieldVisible() const; void toggleAddField(); - BOOL isReportExplorerVisible() const; + sal_Bool isReportExplorerVisible() const; void toggleReportExplorer(); /** shows or hides the ruler. |