summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx4
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx57
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx12
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx14
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx14
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx10
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx10
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx6
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx4
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx8
-rw-r--r--dbaccess/source/ui/app/AppView.cxx2
-rw-r--r--dbaccess/source/ui/app/app.src19
14 files changed, 72 insertions, 94 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 639d74115353..f98da6c7026f 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -483,10 +483,6 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
return sal_False;
}
- OSL_ENSURE( getView(), "OApplicationController::Construct: have no view!" );
- if ( getView() )
- getView()->enableSeparator( );
-
// now that we have a view we can create the clipboard listener
m_aSystemClipboard = TransferableDataHelper::CreateFromSystemClipboard( getView() );
m_aSystemClipboard.StartClipboardListening( );
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index fd484c686616..8067846c2c1e 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -128,7 +128,7 @@ namespace dbaui
OTableCopyHelper m_aTableCopyHelper;
TransferableClipboardListener*
m_pClipbordNotifier; // notifier for changes in the clipboard
- ULONG m_nAsyncDrop;
+ sal_uLong m_nAsyncDrop;
OAsyncronousLink m_aControllerConnectedEvent;
OAsyncronousLink m_aSelectContainerEvent;
PreviewMode m_ePreviewMode; // the mode of the preview
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 1af86b65d2d7..ee76fd318f44 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -751,8 +751,8 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL;
if ( pMenu )
{
- USHORT nMenuItems = pMenu->GetItemCount();
- for ( USHORT i = 0; i < nMenuItems; ++i )
+ sal_uInt16 nMenuItems = pMenu->GetItemCount();
+ for ( sal_uInt16 i = 0; i < nMenuItems; ++i )
aMnemonicGenerator.RegisterMnemonic( pMenu->GetItemText( pMenu->GetItemId( i ) ) );
}
// - the icons should use automatic ones
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4cfce1d3ab95..1644305e27af 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -139,7 +139,7 @@ namespace
class OTablePreviewWindow : public Window
{
DECL_LINK(OnDisableInput, void*);
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
@@ -162,7 +162,7 @@ namespace
// -----------------------------------------------------------------------------
IMPL_LINK(OTablePreviewWindow, OnDisableInput, void*, EMPTYARG)
{
- EnableInput(FALSE);
+ EnableInput(sal_False);
return 0L;
}
// -----------------------------------------------------------------------------
@@ -225,7 +225,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r
m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB);
m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) );
m_aTBPreview.EnableMenuStrings();
- m_aTBPreview.Enable(TRUE);
+ m_aTBPreview.Enable(sal_True);
m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1);
@@ -289,7 +289,7 @@ void OAppDetailPageHelper::selectAll()
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
{
- m_pLists[nPos]->SelectAll(TRUE);
+ m_pLists[nPos]->SelectAll(sal_True);
}
}
// -----------------------------------------------------------------------------
@@ -453,7 +453,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa
if ( nPos < E_ELEMENT_TYPE_COUNT )
{
DBTreeListBox& rTree = *m_pLists[nPos];
- rTree.SelectAll(FALSE);
+ rTree.SelectAll(sal_False);
const ::rtl::OUString* pIter = _aNames.getConstArray();
const ::rtl::OUString* pEnd = pIter + _aNames.getLength();
for(;pIter != pEnd;++pIter)
@@ -602,7 +602,7 @@ SvLBoxEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const
SvLBoxEntry* pReturn = NULL;
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
- pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,TRUE );
+ pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True );
return pReturn;
}
// -----------------------------------------------------------------------------
@@ -634,14 +634,14 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
SvLBoxEntry* pEntry = m_pLists[E_TABLE]->First();
if ( pEntry )
m_pLists[E_TABLE]->Expand(pEntry);
- m_pLists[E_TABLE]->SelectAll(FALSE);
+ m_pLists[E_TABLE]->SelectAll(sal_False);
}
setDetailPage(m_pLists[E_TABLE]);
}
// -----------------------------------------------------------------------------
-void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageId )
+void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rImageId)
{
ImageProvider aImageProvider;
_rImageId = 0;
@@ -664,21 +664,22 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
{
OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
- USHORT nHelpId = 0, nImageId = 0;
+ sal_uInt16 nImageId = 0;
+ rtl::OString sHelpId;
ImageProvider aImageProvider;
Image aFolderImage;
switch( _eType )
{
case E_FORM:
- nHelpId = HID_APP_FORM_TREE;
+ sHelpId = HID_APP_FORM_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM );
break;
case E_REPORT:
- nHelpId = HID_APP_REPORT_TREE;
+ sHelpId = HID_APP_REPORT_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT );
break;
case E_QUERY:
- nHelpId = HID_APP_QUERY_TREE;
+ sHelpId = HID_APP_QUERY_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
break;
default:
@@ -688,7 +689,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
if ( !m_pLists[_eType] )
{
- m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage );
+ m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage );
}
if ( m_pLists[_eType] )
@@ -697,7 +698,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
{
fillNames( _xContainer, _eType, nImageId, NULL );
- m_pLists[_eType]->SelectAll(FALSE);
+ m_pLists[_eType]->SelectAll(sal_False);
}
setDetailPage(m_pLists[_eType]);
}
@@ -711,7 +712,7 @@ void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
pCurrent->Hide();
showPreview(NULL);
- BOOL bHasFocus = FALSE;
+ sal_Bool bHasFocus = sal_False;
m_aFL.Show();
{
bHasFocus = pCurrent->HasChildPathFocus();
@@ -719,7 +720,7 @@ void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
}
m_aTBPreview.Show();
m_aBorder.Show();
- switchPreview(m_ePreviewMode,TRUE);
+ switchPreview(m_ePreviewMode,sal_True);
if ( bHasFocus )
_pWindow->GrabFocus();
@@ -743,7 +744,7 @@ namespace
// -----------------------------------------------------------------------------
void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType,
- const USHORT _nImageId, SvLBoxEntry* _pParent )
+ const sal_uInt16 _nImageId, SvLBoxEntry* _pParent )
{
OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF");
OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" );
@@ -766,7 +767,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY);
if ( xSubElements.is() )
{
- pEntry = pList->InsertEntry( *pIter, _pParent, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+ pEntry = pList->InsertEntry( *pIter, _pParent, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
getBorderWin().getView()->getAppController().containerFound( Reference< XContainer >( xSubElements, UNO_QUERY ) );
fillNames( xSubElements, _eType, _nImageId, pEntry );
}
@@ -782,10 +783,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
}
}
// -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage)
{
DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
- pTreeView->SetHelpId(_nHelpId);
+ pTreeView->SetHelpId( _sHelpId );
return createTree( pTreeView, _rImage );
}
@@ -794,7 +795,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
{
WaitObject aWaitCursor(this);
- _pTreeView->SetWindowBits(WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
+ _pTreeView->SetStyle(_pTreeView->GetStyle() | WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
_pTreeView->GetModel()->SetSortMode(SortAscending);
_pTreeView->EnableCheckButton( NULL ); // do not show any buttons
_pTreeView->SetSelectionMode(MULTIPLE_SELECTION);
@@ -892,13 +893,13 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::
}
}
- USHORT nImageId = 0;
+ sal_uInt16 nImageId = 0;
getElementIcons( _eType, nImageId );
Reference<XNameAccess> xContainer(_rObject,UNO_QUERY);
if ( xContainer.is() )
{
const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType );
- pRet = pTreeView->InsertEntry( _rName, pEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+ pRet = pTreeView->InsertEntry( _rName, pEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
fillNames( xContainer, _eType, nImageId, pRet );
}
else
@@ -1029,7 +1030,7 @@ sal_Bool OAppDetailPageHelper::isPreviewEnabled()
return m_ePreviewMode != E_PREVIEWNONE;
}
// -----------------------------------------------------------------------------
-void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,BOOL _bForce)
+void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,sal_Bool _bForce)
{
if ( m_ePreviewMode != _eMode || _bForce )
{
@@ -1254,7 +1255,7 @@ void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt )
OSL_PRECOND( pCurrentView, "OAppDetailPageHelper::KeyInput: how this?" );
KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); (void)eFunc;
- USHORT nCode = rKEvt.GetKeyCode().GetCode();
+ sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
if ( ( KEY_RETURN == nCode ) && pCurrentView )
{
@@ -1317,11 +1318,11 @@ OPreviewWindow::OPreviewWindow(Window* _pParent)
ImplInitSettings( sal_True, sal_True, sal_True );
}
// -----------------------------------------------------------------------------
-BOOL OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+sal_Bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
{
const Size aWinSize( GetOutputSizePixel() );
Size aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( aNewSize.Width() && aNewSize.Height() )
{
@@ -1344,7 +1345,7 @@ BOOL OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
( aWinSize.Height() - aNewSize.Height() ) >> 1 );
rResultRect = Rectangle( aNewPos, aNewSize );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 465299e10a23..69a050c8e2ea 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -70,8 +70,8 @@ namespace dbaui
@return
<TRUE/> when successfull
*/
- BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
@@ -119,7 +119,7 @@ namespace dbaui
/** retrieves the resource ids of the images representing elements of the given type
*/
- void getElementIcons( ElementType _eType, USHORT& _rImageId );
+ void getElementIcons( ElementType _eType, sal_uInt16& _rImageId);
/** fills the names in the listbox
@param _xContainer
@@ -133,7 +133,7 @@ namespace dbaui
*/
void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
const ElementType _eType,
- const USHORT _nImageId,
+ const sal_uInt16 _nImageId,
SvLBoxEntry* _pParent );
/** sets the detail page
@@ -160,7 +160,7 @@ namespace dbaui
@return
The new tree.
*/
- DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage );
+ DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage);
DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
DECL_LINK( OnEntrySelChange, void* );
@@ -344,7 +344,7 @@ namespace dbaui
@param _bForce
Force the preview to be resetted
*/
- void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE);
+ void switchPreview(PreviewMode _eMode,sal_Bool _bForce = sal_False);
/** shows the Preview of the content when it is enabled.
@param _xContent
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4e629c52d1ed..e328587d8760 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -71,7 +71,7 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
#define SPACEBETWEENENTRIES 4
// -----------------------------------------------------------------------------
-TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled )
+TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled )
:sUNOCommand( ::rtl::OUString::createFromAscii( _pAsciiUNOCommand ) )
,nHelpID( _nHelpID )
,sTitle( ModuleRes( _nTitleResourceID ) )
@@ -86,7 +86,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
,m_pMouseDownEntry( NULL )
,m_pLastActiveEntry( NULL )
{
- USHORT nSize = SPACEBETWEENENTRIES;
+ sal_uInt16 nSize = SPACEBETWEENENTRIES;
SetSpaceBetweenEntries(nSize);
SetSelectionMode( NO_SELECTION );
SetExtendedWinBits( EWB_NO_AUTO_CURENTRY );
@@ -116,7 +116,7 @@ void OCreationList::PreparePaint( SvLBoxEntry* _pEntry )
{
// draw a selection background
bool bIsMouseDownEntry = ( _pEntry == m_pMouseDownEntry );
- DrawSelectionBackground( GetBoundingRect( _pEntry ), bIsMouseDownEntry ? 1 : 2, FALSE, TRUE, FALSE );
+ DrawSelectionBackground( GetBoundingRect( _pEntry ), bIsMouseDownEntry ? 1 : 2, sal_False, sal_True, sal_False );
if ( bIsMouseDownEntry )
{
@@ -148,7 +148,7 @@ void OCreationList::SelectSearchEntry( const void* _pEntry )
}
// -----------------------------------------------------------------------------
-void OCreationList::ExecuteSearchEntry( const void* _pEntry )
+void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
{
SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
OSL_ENSURE( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" );
@@ -307,7 +307,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvLBoxEntry* _pEntry )
// -----------------------------------------------------------------------------
void OCreationList::updateHelpText()
{
- USHORT nHelpTextId = 0;
+ sal_uInt16 nHelpTextId = 0;
if ( GetCurEntry() )
nHelpTextId = reinterpret_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
m_rTaskWindow.setHelpText( nHelpTextId );
@@ -424,7 +424,7 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
m_aDescription.SetControlFont(aFont);
}
// -----------------------------------------------------------------------------
-void OTasksWindow::setHelpText(USHORT _nId)
+void OTasksWindow::setHelpText(sal_uInt16 _nId)
{
DBG_CHKTHIS(OTasksWindow,NULL);
if ( _nId )
@@ -518,7 +518,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
}
m_aCreation.Show();
- m_aCreation.SelectAll(FALSE);
+ m_aCreation.SelectAll(sal_False);
m_aHelpText.Show();
m_aDescription.Show();
m_aFL.Show();
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 06aa8ecb4411..df890bbafb4b 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -86,7 +86,7 @@ namespace dbaui
// IMnemonicEntryList
virtual void SelectSearchEntry( const void* _pEntry );
- virtual void ExecuteSearchEntry( const void* _pEntry );
+ virtual void ExecuteSearchEntry( const void* _pEntry ) const;
private:
void onSelected( SvLBoxEntry* _pEntry ) const;
@@ -99,14 +99,14 @@ namespace dbaui
struct TaskEntry
{
::rtl::OUString sUNOCommand;
- USHORT nHelpID;
+ sal_uInt16 nHelpID;
String sTitle;
bool bHideWhenDisabled;
// TODO: we should be consistent in the task pane and the menus/toolbars:
// If an entry is disabled in the latter, it should also be disabled in the former.
// If an entry is *hidden* in the former, it should also be hidden in the latter.
- TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false );
+ TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false );
};
typedef ::std::vector< TaskEntry > TaskEntryList;
@@ -115,7 +115,7 @@ namespace dbaui
/// the tasks available in the pane
TaskEntryList aTasks;
/// the resource ID for the title of the pane
- USHORT nTitleId;
+ sal_uInt16 nTitleId;
};
class OTasksWindow : public Window
@@ -127,7 +127,7 @@ namespace dbaui
OApplicationDetailView* m_pDetailView;
DECL_LINK( OnEntrySelectHdl, SvTreeListBox* );
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
@@ -148,7 +148,7 @@ namespace dbaui
}
void Clear();
- void setHelpText(USHORT _nId);
+ void setHelpText(sal_uInt16 _nId);
};
//==================================================================
class OApplicationDetailView : public OSplitterView
@@ -162,7 +162,7 @@ namespace dbaui
::std::vector< TaskPaneData > m_aTaskPaneData;
MnemonicGenerator m_aExternalMnemonics;
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 2fb94bb6b77f..c6c3f2e480a2 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -53,9 +53,9 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
struct CategoryDescriptor
{
- USHORT nLabelResId;
+ sal_uInt16 nLabelResId;
ElementType eType;
- USHORT nImageResId;
+ sal_uInt16 nImageResId;
} aCategories[] = {
{ RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L },
{ RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L },
@@ -71,14 +71,14 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
- SetChoiceWithCursor( TRUE );
+ SetChoiceWithCursor( sal_True );
SetSelectionMode(SINGLE_SELECTION);
}
// -----------------------------------------------------------------------------
OApplicationIconControl::~OApplicationIconControl()
{
- ULONG nCount = GetEntryCount();
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uLong nCount = GetEntryCount();
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
if ( pEntry )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index fc8e885928e7..36475115d972 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -124,7 +124,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OApplicationSwapWindow::clearSelection()
{
m_aIconControl.SetNoSelection();
- ULONG nPos = 0;
+ sal_uLong nPos = 0;
SvxIconChoiceCtrlEntry* pEntry = m_aIconControl.GetSelectedEntry(nPos);
if ( pEntry )
m_aIconControl.InvalidateEntry(pEntry);
@@ -151,7 +151,7 @@ bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent )
// -----------------------------------------------------------------------------
ElementType OApplicationSwapWindow::getElementType() const
{
- ULONG nPos = 0;
+ sal_uLong nPos = 0;
SvxIconChoiceCtrlEntry* pEntry = m_aIconControl.GetSelectedEntry(nPos);
return ( pEntry ) ? *static_cast<ElementType*>(pEntry->GetUserData()) : E_NONE;
}
@@ -176,7 +176,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
// -----------------------------------------------------------------------------
IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl)
{
- ULONG nPos = 0;
+ sal_uLong nPos = 0;
SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos );
ElementType eType = E_NONE;
if ( pEntry )
@@ -196,9 +196,9 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG)
// -----------------------------------------------------------------------------
void OApplicationSwapWindow::selectContainer(ElementType _eType)
{
- ULONG nCount = m_aIconControl.GetEntryCount();
+ sal_uLong nCount = m_aIconControl.GetEntryCount();
SvxIconChoiceCtrlEntry* pEntry = NULL;
- for (ULONG i=0; i < nCount; ++i)
+ for (sal_uLong i=0; i < nCount; ++i)
{
pEntry = m_aIconControl.GetEntry(i);
if ( pEntry && *static_cast<ElementType*>(pEntry->GetUserData()) == _eType )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index bc5cd2abb1df..89d535806bd9 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -44,7 +44,7 @@ namespace dbaui
ElementType m_eLastType;
OAppBorderWindow& m_rBorderWin;
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
DECL_LINK( ChangeToLastSelected, void* );
@@ -65,8 +65,8 @@ namespace dbaui
inline void cut() { }
inline void paste() { }
- inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
- inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
+ inline sal_uLong GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
+ inline SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return m_aIconControl.GetEntry(nPos); }
inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
/** automatically creates mnemonics for the icon/texts in our left hand side panel
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index f487353a5163..e2473432e8cc 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -38,7 +38,7 @@ namespace dbaui
{
DBG_NAME(OTitleWindow)
-OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift)
+OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,sal_Bool _bShift)
: Window(_pParent,_nBits | WB_DIALOGCONTROL)
, m_aSpace1(this)
, m_aSpace2(this)
@@ -100,7 +100,7 @@ void OTitleWindow::Resize()
}
}
// -----------------------------------------------------------------------------
-void OTitleWindow::setTitle(USHORT _nTitleId)
+void OTitleWindow::setTitle(sal_uInt16 _nTitleId)
{
if ( _nTitleId != 0 )
{
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 8f230d9d9e1c..ab1719977f23 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -38,12 +38,12 @@ namespace dbaui
FixedText m_aSpace2;
FixedText m_aTitle;
Window* m_pChild;
- BOOL m_bShift;
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ sal_Bool m_bShift;
+ void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
- OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE);
+ OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,sal_Bool _bShift = sal_True);
virtual ~OTitleWindow();
// window overloads
@@ -67,7 +67,7 @@ namespace dbaui
@param _nTitleId
The resource id of the title text.
*/
- void setTitle(USHORT _nTitleId);
+ void setTitle(sal_uInt16 _nTitleId);
/** Gets the min Width in Pixel which is needed to display the whole
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 19584f86646d..4974a3ef6333 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -83,7 +83,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
SetBorderStyle(WINDOW_BORDER_MONO);
- m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL ,FALSE);
+ m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL ,sal_False);
m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO);
OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this );
pSwap->Show();
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index b723d282bb14..431f434fcea3 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW
MenuItem
{
Identifier = SID_APP_NEW_FORM;
- HelpId = SID_APP_NEW_FORM;
Command = ".uno:DBNewForm";
Text [ en-US ] = "Form..." ;
};
MenuItem
{
Identifier = SID_APP_NEW_REPORT;
- HelpId = SID_APP_NEW_REPORT;
Command = ".uno:DBNewReport";
Text [ en-US ] = "Report..." ;
};
@@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW
MenuItem
{
Identifier = SID_DB_NEW_VIEW_SQL;
- HelpId = SID_DB_NEW_VIEW_SQL;
Command = ".uno:DBNewViewSQL";
Text [ en-US ] = "View (Simple)..." ;
};
@@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_PASTE_SPECIAL;
- HelpID = SID_DB_APP_PASTE_SPECIAL ;
Text[ en-US ] = "Paste Special...";
Command = ".uno:PasteSpecial";
};
@@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_DELETE;
- HelpID = SID_DB_APP_DELETE ;
Text[ en-US ] = "Delete";
Command = ".uno:DBDelete";
};
MenuItem
{
Identifier = SID_DB_APP_RENAME;
- HelpID = SID_DB_APP_RENAME ;
Text[ en-US ] = "Rename";
Command = ".uno:DBRename";
};
MenuItem
{
Identifier = SID_DB_APP_EDIT;
- HelpID = SID_DB_APP_EDIT ;
Text[ en-US ] = "Edit";
Command = ".uno:DBEdit";
};
MenuItem
{
Identifier = SID_DB_APP_EDIT_SQL_VIEW;
- HelpID = SID_DB_APP_EDIT_SQL_VIEW ;
Text [ en-US ] = "Edit in SQL View...";
Command = ".uno:DBEditSqlView";
};
MenuItem
{
Identifier = SID_DB_APP_OPEN;
- HelpID = SID_DB_APP_OPEN ;
Text[ en-US ] = "Open";
Command = ".uno:DBOpen";
};
MenuItem
{
Identifier = SID_DB_APP_CONVERTTOVIEW;
- HelpID = SID_DB_APP_CONVERTTOVIEW ;
Text[ en-US ] = "Create as View";
Command = ".uno:DBConvertToView";
};
@@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_APP_NEW_REPORT_PRE_SEL;
- HelpId = SID_APP_NEW_REPORT_PRE_SEL;
Command = ".uno:DBNewReportWithPreSelection";
Text [ en-US ] = "Report..." ;
};
MenuItem
{
Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ;
- HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
Text[ en-US ] = "Report Wizard...";
Command = ".uno:DBNewReportAutoPilotWithPreSelection";
@@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_SELECTALL;
- HelpID = SID_SELECTALL ;
Text[ en-US ] = "Select All";
Command = ".uno:SelectAll";
};
@@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_DSPROPS;
- HelpID = SID_DB_APP_DSPROPS ;
Text[ en-US ] = "Properties";
Command = ".uno:DBDSProperties";
};
MenuItem
{
Identifier = SID_DB_APP_DSCONNECTION_TYPE;
- HelpID = SID_DB_APP_DSCONNECTION_TYPE ;
Text[ en-US ] = "Connection Type";
Command = ".uno:DBDSConnectionType";
};
MenuItem
{
Identifier = SID_DB_APP_DSADVANCED_SETTINGS;
- HelpID = SID_DB_APP_DSADVANCED_SETTINGS ;
Text[ en-US ] = "Advanced Settings";
Command = ".uno:DBDSAdvancedSettings";
};
@@ -410,7 +394,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_DISABLE_PREVIEW;
- HelpId = SID_DB_APP_DISABLE_PREVIEW;
Text[ en-US ] = "None";
Command = ".uno:DBDisablePreview";
Checkable = TRUE;
@@ -420,7 +403,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
- HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
Text[ en-US ] = "Document Information";
Command = ".uno:DBShowDocInfoPreview";
Checkable = TRUE;
@@ -430,7 +412,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_VIEW_DOC_PREVIEW;
- HelpId = SID_DB_APP_VIEW_DOC_PREVIEW;
Text[ en-US ] = "Document";
Command = ".uno:DBShowDocPreview";
Checkable = TRUE;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 09:38:31 +0000