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

1 files changed, 30 insertions, 30 deletions

diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 1d154ee5be0d..3128d979b681 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -63,19 +63,19 @@ namespace dbaui
 
          ::boost::shared_ptr<OTableRow> pActRow;
 
-        ULONG                       nIndexEvent;
-        ULONG                       nCutEvent;
-        ULONG                       nPasteEvent;
-        ULONG                       nDeleteEvent;
-        ULONG                       nInsNewRowsEvent;
-        ULONG                       nInvalidateTypeEvent;
-        ULONG                       nEntryNotFoundEvent;
+        sal_uLong                       nIndexEvent;
+        sal_uLong                       nCutEvent;
+        sal_uLong                       nPasteEvent;
+        sal_uLong                       nDeleteEvent;
+        sal_uLong                       nInsNewRowsEvent;
+        sal_uLong                       nInvalidateTypeEvent;
+        sal_uLong                       nEntryNotFoundEvent;
         ChildFocusState             m_eChildFocus;
 
         long nOldDataPos;
 
-        BOOL bSaveOnMove;
-        BOOL bReadOnly;
+        sal_Bool bSaveOnMove;
+        sal_Bool bReadOnly;
         //------------------------------------------------------------------
         // Hilfsklasse
         class ClipboardInvalidator
@@ -85,7 +85,7 @@ namespace dbaui
             OTableEditorCtrl* m_pOwner;
 
         public:
-            ClipboardInvalidator(ULONG nTimeout,OTableEditorCtrl*);
+            ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
             ~ClipboardInvalidator();
 
         protected:
@@ -97,19 +97,19 @@ namespace dbaui
 
     protected:
         virtual void Command( const CommandEvent& rEvt );
-        virtual BOOL SeekRow(long nRow);
+        virtual sal_Bool SeekRow(long nRow);
         virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect,
-                               USHORT nColumnId ) const;
+                               sal_uInt16 nColumnId ) const;
 
         virtual void CursorMoved();
         virtual RowStatus GetRowStatus(long nRow) const;
 
-        virtual ::svt::CellController* GetController(long nRow, USHORT nCol);
-        virtual void InitController(::svt::CellControllerRef& rController, long nRow, USHORT nCol);
+        virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
+        virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
 
         virtual void CellModified();
-        virtual BOOL SaveModified();    // wird aufgerufen vor einem Zellenwechsel
-                                        // return FALSE, verhindert Zellenwechsel
+        virtual sal_Bool SaveModified();    // wird aufgerufen vor einem Zellenwechsel
+                                        // return sal_False, verhindert Zellenwechsel
         virtual void Undo();
         virtual void Redo();
         virtual String GetCellText(long nRow, sal_uInt16 nColId) const;
@@ -126,8 +126,8 @@ namespace dbaui
 
         void         ClearModified();
 
-        void         SetPrimaryKey( BOOL bSet );
-        BOOL         IsPrimaryKey();
+        void         SetPrimaryKey( sal_Bool bSet );
+        sal_Bool         IsPrimaryKey();
 
         DECL_LINK(ControlPreNotifyHdl, NotifyEvent*);
 
@@ -135,15 +135,15 @@ namespace dbaui
         //  TYPEINFO();
         OTableEditorCtrl(Window* pParentWin);
         virtual         ~OTableEditorCtrl();
-        virtual BOOL    CursorMoving(long nNewRow, USHORT nNewCol);
+        virtual sal_Bool    CursorMoving(long nNewRow, sal_uInt16 nNewCol);
         virtual void    UpdateAll();
-        SfxUndoManager* GetUndoManager() const;
+        SfxUndoManager& GetUndoManager() const;
 
         void            SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); }
-        BOOL            SaveCurRow();
+        sal_Bool            SaveCurRow();
         void            SwitchType( const TOTypeInfoSP& _pType );
 
-        void            DisplayData( long nRow, BOOL bGrabFocus = TRUE );
+        void            DisplayData( long nRow, sal_Bool bGrabFocus = sal_True );
             // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist)
 
         virtual void    SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo );
@@ -158,15 +158,15 @@ namespace dbaui
 
         ::boost::shared_ptr<OTableRow>         GetActRow(){ return pActRow; }
         void            CellModified( long nRow, sal_uInt16 nColId );
-        void            SetReadOnly( BOOL bRead=TRUE );
+        void            SetReadOnly( sal_Bool bRead=sal_True );
 
         virtual void Init();
         virtual void DeactivateCell(sal_Bool bUpdate = sal_True);
 
-        BOOL IsCutAllowed( long nRow = -1 );
-        BOOL IsCopyAllowed( long nRow = -1 );
-        BOOL IsPasteAllowed( long nRow = -1 );
-        BOOL IsReadOnly();
+        sal_Bool IsCutAllowed( long nRow = -1 );
+        sal_Bool IsCopyAllowed( long nRow = -1 );
+        sal_Bool IsPasteAllowed( long nRow = -1 );
+        sal_Bool IsReadOnly();
         OFieldDescription* GetFieldDescr( long nRow );
 
         // window overloads
@@ -191,11 +191,11 @@ namespace dbaui
         DECL_LINK( EntryNotFound, void* );
 
         void InitCellController();
-        INT32 HasFieldName( const String& rFieldName );
+        sal_Int32 HasFieldName( const String& rFieldName );
         String GenerateName( const String& rName );
-        BOOL SetDataPtr( long nRow );
+        sal_Bool SetDataPtr( long nRow );
 
-        BOOL SaveData(long nRow, USHORT nColumnId);
+        sal_Bool SaveData(long nRow, sal_uInt16 nColumnId);
         /** AdjustFieldDescription set the needed values for the description
             @param  _pFieldDesc     the field description where to set the values
             @param  _rMultiSel      contains the postions which changed for undo/redo