summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/ui/dlg')
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx34
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx10
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx26
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.src4
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx14
-rw-r--r--reportdesign/source/ui/dlg/GroupExchange.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx91
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.src6
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx34
-rw-r--r--reportdesign/source/ui/dlg/Navigator.src5
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.src6
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx2
13 files changed, 123 insertions, 113 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 431e72e5bccc..1193e63d694a 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -189,7 +189,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
m_aActions.SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction));
setToolBox(&m_aActions);
m_aActions.CheckItem(SID_FM_SORTUP);
- m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, FALSE);
+ m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, sal_False);
m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) );
@@ -230,8 +230,8 @@ OAddFieldWindow::~OAddFieldWindow()
if ( m_pListBox.get() )
{
SvLBoxTreeList* pModel = m_pListBox->GetModel();
- ULONG nCount = pModel->GetEntryCount();
- for(ULONG i = 0; i< nCount;++i)
+ sal_uLong nCount = pModel->GetEntryCount();
+ for(sal_uLong i = 0; i< nCount;++i)
{
delete static_cast<ColumnInfo*>(pModel->GetEntry(i)->GetUserData());
}
@@ -291,7 +291,7 @@ namespace
const ::rtl::OUString* pEntries = _rEntries.getConstArray();
sal_Int32 nEntries = _rEntries.getLength();
for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries )
- _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries) );
+ _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries) );
}
void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
{
@@ -305,9 +305,9 @@ namespace
if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) )
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
if ( sLabel.getLength() )
- _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
else
- _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
}
}
}
@@ -324,10 +324,10 @@ void OAddFieldWindow::Update()
{
// ListBox loeschen
m_pListBox->Clear();
- const USHORT nItemCount = m_aActions.GetItemCount();
- for (USHORT j = 0; j< nItemCount; ++j)
+ const sal_uInt16 nItemCount = m_aActions.GetItemCount();
+ for (sal_uInt16 j = 0; j< nItemCount; ++j)
{
- m_aActions.EnableItem(m_aActions.GetItemId(j),FALSE);
+ m_aActions.EnableItem(m_aActions.GetItemId(j),sal_False);
}
String aTitle(ModuleRes(RID_STR_FIELDSELECTION));
@@ -372,7 +372,7 @@ void OAddFieldWindow::Update()
SetText( aTitle );
if ( m_aCommandName.getLength() )
{
- for (USHORT i = 0; i < nItemCount; ++i)
+ for (sal_uInt16 i = 0; i < nItemCount; ++i)
{
m_aActions.EnableItem(m_aActions.GetItemId(i));
}
@@ -472,9 +472,9 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent
if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) )
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
if ( sLabel.getLength() )
- m_pListBox->InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(sName,sLabel) );
+ m_pListBox->InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(sName,sLabel) );
else
- m_pListBox->InsertEntry( sName,NULL,FALSE,LIST_APPEND,new ColumnInfo(sName,sLabel) );
+ m_pListBox->InsertEntry( sName,NULL,sal_False,LIST_APPEND,new ColumnInfo(sName,sLabel) );
}
}
}
@@ -527,19 +527,19 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff)
//------------------------------------------------------------------
IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{
- const USHORT nCurItem = m_aActions.GetCurItemId();
+ const sal_uInt16 nCurItem = m_aActions.GetCurItemId();
if ( SID_ADD_CONTROL_PAIR == nCurItem )
OnDoubleClickHdl(NULL);
else
{
if ( SID_FM_REMOVE_FILTER_SORT == nCurItem || !m_aActions.IsItemChecked(nCurItem) )
{
- const USHORT nItemCount = m_aActions.GetItemCount();
- for (USHORT j = 0; j< nItemCount; ++j)
+ const sal_uInt16 nItemCount = m_aActions.GetItemCount();
+ for (sal_uInt16 j = 0; j< nItemCount; ++j)
{
- const USHORT nItemId = m_aActions.GetItemId(j);
+ const sal_uInt16 nItemId = m_aActions.GetItemId(j);
if ( nCurItem != nItemId )
- m_aActions.CheckItem(nItemId,FALSE);
+ m_aActions.CheckItem(nItemId,sal_False);
}
SvSortMode eSortMode = SortNone;
if ( SID_FM_REMOVE_FILTER_SORT != nCurItem )
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 898779094953..fe3943f7fd39 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -88,11 +88,11 @@ namespace rptui
UpdateLocker( Window& _rWindow )
:m_rWindow( _rWindow )
{
- _rWindow.SetUpdateMode( FALSE );
+ _rWindow.SetUpdateMode( sal_False );
}
~UpdateLocker()
{
- m_rWindow.SetUpdateMode( TRUE );
+ m_rWindow.SetUpdateMode( sal_True );
}
};
@@ -401,7 +401,7 @@ namespace rptui
}
// -----------------------------------------------------------------------------
- void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor )
+ void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor )
{
OSL_PRECOND( _nCommandId, "ConditionalFormattingDialog::applyCommand: illegal command id!" );
try
@@ -466,8 +466,8 @@ namespace rptui
short nRet = ModalDialog::Execute();
if ( nRet == RET_OK )
{
- String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
- UndoManagerListAction aListAction(*m_rController.getUndoMgr(),sUndoAction);
+ const String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
+ const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction );
try
{
sal_Int32 j(0), i(0);;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 2aba0c42a510..3b979d9649a0 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -72,7 +72,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed
{
m_pSubEdit = new Edit(this,0);
SetSubEdit(m_pSubEdit);
- m_pSubEdit->EnableRTL( FALSE );
+ m_pSubEdit->EnableRTL( sal_False );
m_pSubEdit->SetPosPixel( Point() );
m_aFormula.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("...")));
@@ -130,7 +130,7 @@ class OColorPopup : public FloatingWindow
{
DECL_LINK( SelectHdl, void * );
Condition* m_pCondition;
- USHORT m_nSlotId;
+ sal_uInt16 m_nSlotId;
public:
OColorPopup(Window* _pParent,Condition* _pCondition);
ValueSet m_aColorSet;
@@ -139,7 +139,7 @@ public:
virtual void Resize();
void StartSelection();
- void SetSlotId(USHORT _nSlotId);
+ void SetSlotId(sal_uInt16 _nSlotId);
};
// -----------------------------------------------------------------------------
OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
@@ -205,7 +205,7 @@ void OColorPopup::StartSelection()
m_aColorSet.StartSelection();
}
// -----------------------------------------------------------------------------
-void OColorPopup::SetSlotId(USHORT _nSlotId)
+void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
{
m_nSlotId = _nSlotId;
if ( SID_ATTR_CHAR_COLOR_BACKGROUND == _nSlotId || SID_BACKGROUND_COLOR == _nSlotId )
@@ -217,7 +217,7 @@ void OColorPopup::SetSlotId(USHORT _nSlotId)
// -----------------------------------------------------------------------------
IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG )
{
- USHORT nItemId = m_aColorSet.GetSelectItemId();
+ sal_uInt16 nItemId = m_aColorSet.GetSelectItemId();
Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet.GetItemColor( nItemId ) );
/* #i33380# Moved the following line above the Dispatch() calls.
@@ -328,11 +328,11 @@ Condition::~Condition()
// -----------------------------------------------------------------------------
IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
{
- USHORT nId( m_aActions.GetCurItemId() );
+ sal_uInt16 nId( m_aActions.GetCurItemId() );
if ( !m_pColorFloat )
m_pColorFloat = new OColorPopup(&m_aActions,this);
- USHORT nTextId = 0;
+ sal_uInt16 nTextId = 0;
switch(nId)
{
case SID_ATTR_CHAR_COLOR2:
@@ -376,7 +376,7 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
}
//------------------------------------------------------------------------------
-void Condition::ApplyCommand( USHORT _nCommandId, const ::Color& _rColor)
+void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
{
if ( _nCommandId == SID_ATTR_CHAR_COLOR2 )
m_pBtnUpdaterFontColor->Update( _rColor );
@@ -623,8 +623,8 @@ void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula )
}
// update UI
- m_aConditionType.SelectEntryPos( (USHORT)eType );
- m_aOperationList.SelectEntryPos( (USHORT)eOperation );
+ m_aConditionType.SelectEntryPos( (sal_uInt16)eType );
+ m_aOperationList.SelectEntryPos( (sal_uInt16)eOperation );
m_aCondLHS.SetText( sLHS );
m_aCondRHS.SetText( sRHS );
@@ -659,10 +659,10 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!");
if ( _xReportControlFormat.is() )
{
- USHORT nItemCount = m_aActions.GetItemCount();
- for (USHORT j = 0; j< nItemCount; ++j)
+ sal_uInt16 nItemCount = m_aActions.GetItemCount();
+ for (sal_uInt16 j = 0; j< nItemCount; ++j)
{
- USHORT nItemId = m_aActions.GetItemId(j);
+ sal_uInt16 nItemId = m_aActions.GetItemId(j);
m_aActions.CheckItem( nItemId, m_rController.isFormatCommandEnabled( nItemId, _xReportControlFormat ) );
}
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index e2c473177e7a..aa34d461fc46 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -147,7 +147,7 @@ namespace rptui
/** forward to the parent class
*/
- void ApplyCommand(USHORT _nCommandId, const ::Color& _aColor );
+ void ApplyCommand(sal_uInt16 _nCommandId, const ::Color& _aColor );
inline ::rptui::OReportController& getController() const { return m_rController; }
diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src
index 4324db909568..e9378da1725c 100644
--- a/reportdesign/source/ui/dlg/DateTime.src
+++ b/reportdesign/source/ui/dlg/DateTime.src
@@ -47,6 +47,7 @@ ModalDialog RID_DATETIME_DLG
CheckBox CB_DATE
{
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_DATETIME_DLG
ListBox LB_DATE_TYPE
{
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE";
Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ;
Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
Border = TRUE;
@@ -78,6 +80,7 @@ ModalDialog RID_DATETIME_DLG
CheckBox CB_TIME
{
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
@@ -93,6 +96,7 @@ ModalDialog RID_DATETIME_DLG
ListBox LB_TIME_TYPE
{
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE";
Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
Border = TRUE;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index a1199abf7849..f86c2cec1521 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -100,7 +100,7 @@ FormulaDialog::~FormulaDialog()
{
if ( m_pAddField )
{
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
::std::auto_ptr<Window> aTemp2(m_pAddField);
@@ -116,7 +116,7 @@ bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult )
rStrResult = rStrExp;
return false;
}
-void FormulaDialog::doClose(BOOL _bOk)
+void FormulaDialog::doClose(sal_Bool _bOk)
{
EndDialog(_bOk ? RET_OK : RET_CANCEL);
}
@@ -126,10 +126,10 @@ void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc
void FormulaDialog::showReference(const String& /*_sFormula*/)
{
}
-void FormulaDialog::dispatch(BOOL /*_bOK*/,BOOL /*_bMartixChecked*/)
+void FormulaDialog::dispatch(sal_Bool /*_bOK*/,sal_Bool /*_bMartixChecked*/)
{
}
-void FormulaDialog::setDispatcherLock( BOOL /*bLock*/ )
+void FormulaDialog::setDispatcherLock( sal_Bool /*bLock*/ )
{
}
void FormulaDialog::setReferenceInput(const FormEditData* /*_pData*/)
@@ -189,7 +189,7 @@ void FormulaDialog::ShowReference(const String& /*_sRef*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaDialog::HideReference( BOOL /*bDoneRefMode*/)
+void FormulaDialog::HideReference( sal_Bool /*bDoneRefMode*/)
{
}
// -----------------------------------------------------------------------------
@@ -210,7 +210,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
{
m_pAddField = new OAddFieldWindow(this,m_xRowSet);
m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) );
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
if ( aDlgOpt.Exists() )
{
m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
@@ -243,7 +243,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
}
m_pEdit = NULL;
_pAddFieldDlg->Hide();
- RefInputDoneAfter( TRUE );
+ RefInputDoneAfter( sal_True );
return 0L;
}
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index efa70b6b7e61..7f6720fd68ec 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -61,7 +61,7 @@ namespace rptui
// -----------------------------------------------------------------------------
sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
{
- ULONG nFormat = SotExchange::GetFormat(rFlavor);
+ sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
if(nFormat == OGroupExchange::getReportGroupId() )
{
return SetAny(uno::makeAny(m_aGroupRow),rFlavor);
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 09cf0e6eb14d..1859cc2cf829 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -103,13 +103,13 @@ class OFieldExpressionControl : public TContainerListenerBase
::svt::ComboBoxControl* m_pComboCell;
sal_Int32 m_nDataPos;
sal_Int32 m_nCurrentPos;
- ULONG m_nPasteEvent;
- ULONG m_nDeleteEvent;
+ sal_uLong m_nPasteEvent;
+ sal_uLong m_nDeleteEvent;
OGroupsSortingDialog* m_pParent;
bool m_bIgnoreEvent;
- void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,USHORT nColumnId);
- BOOL SaveModified(bool _bAppend);
+ void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,sal_uInt16 nColumnId);
+ sal_Bool SaveModified(bool _bAppend);
OFieldExpressionControl(const OFieldExpressionControl&); // NO COPY
void operator =(const OFieldExpressionControl&); // NO ASSIGN
@@ -144,17 +144,17 @@ public:
*/
void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect = sal_True);
- virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol);
+ virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol);
using OFieldExpressionControl_Base::GetRowCount;
protected:
- virtual BOOL IsTabAllowed(BOOL bForward) const;
-
- virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
- virtual ::svt::CellController* GetController( long nRow, USHORT nCol );
- virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
- virtual BOOL SeekRow( long nRow );
- virtual BOOL SaveModified();
- virtual String GetCellText( long nRow, USHORT nColId ) const;
+ virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
+
+ virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
+ virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol );
+ virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
+ virtual sal_Bool SeekRow( long nRow );
+ virtual sal_Bool SaveModified();
+ virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
virtual RowStatus GetRowStatus(long nRow) const;
virtual void KeyInput(const KeyEvent& rEvt);
@@ -274,7 +274,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt
sal_Int8 nAction = DND_ACTION_NONE;
if ( IsEditing() )
{
- USHORT nPos = m_pComboCell->GetSelectEntryPos();
+ sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos();
if ( COMBOBOX_ENTRY_NOTFOUND != nPos || m_pComboCell->GetText().Len() )
SaveModified();
DeactivateCell();
@@ -315,8 +315,8 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups
m_bIgnoreEvent = true;
{
sal_Int32 nRow = _nRow;
- String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP));
- UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction);
+ const String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP));
+ const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction );
uno::Reference< report::XGroups> xGroups = m_pParent->getGroups();
const uno::Any* pIter = _aGroups.getConstArray();
@@ -375,7 +375,7 @@ void OFieldExpressionControl::lateInit()
aFont.SetWeight( WEIGHT_LIGHT );
SetFont(aFont);
- InsertHandleColumn(static_cast<USHORT>(GetTextWidth('0') * 4)/*, TRUE */);
+ InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */);
InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100);
m_pComboCell = new ComboBoxControl( &GetDataWindow() );
@@ -402,7 +402,7 @@ void OFieldExpressionControl::lateInit()
// not the first call
RowRemoved(0, GetRowCount());
- RowInserted(0, m_aGroupPositions.size(), TRUE);
+ RowInserted(0, m_aGroupPositions.size(), sal_True);
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
@@ -428,19 +428,19 @@ IMPL_LINK(OFieldExpressionControl, AsynchDeactivate, void*, EMPTYARG)
}
//------------------------------------------------------------------------------
-BOOL OFieldExpressionControl::IsTabAllowed(BOOL /*bForward*/) const
+sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
- return FALSE;
+ return sal_False;
}
//------------------------------------------------------------------------------
-BOOL OFieldExpressionControl::SaveModified()
+sal_Bool OFieldExpressionControl::SaveModified()
{
return SaveModified(true);
}
//------------------------------------------------------------------------------
-BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
+sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Int32 nRow = GetCurRow();
@@ -454,7 +454,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
{
bAppend = sal_True;
String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
- m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() );
+ m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() );
xGroup = m_pParent->getGroups()->createGroup();
xGroup->setHeaderOn(sal_True);
@@ -485,7 +485,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]);
if ( xGroup.is() )
{
- USHORT nPos = m_pComboCell->GetSelectEntryPos();
+ sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos();
::rtl::OUString sExpression;
if ( COMBOBOX_ENTRY_NOTFOUND == nPos )
sExpression = m_pComboCell->GetText();
@@ -498,7 +498,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
::rptui::adjustSectionName(xGroup,nPos);
if ( bAppend )
- m_pParent->m_pController->getUndoMgr()->LeaveListAction();
+ m_pParent->m_pController->getUndoManager().LeaveListAction();
}
if ( Controller() )
@@ -518,10 +518,10 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
}
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------------
-String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) const
+String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
String sText;
@@ -552,7 +552,7 @@ String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) cons
}
//------------------------------------------------------------------------------
-void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId )
+void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
@@ -575,7 +575,7 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
return sal_True;
}
//------------------------------------------------------------------------------
-CellController* OFieldExpressionControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ )
+CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
ComboBoxCellController* pCellController = new ComboBoxCellController( m_pComboCell );
@@ -584,17 +584,17 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, USHORT /*
}
//------------------------------------------------------------------------------
-BOOL OFieldExpressionControl::SeekRow( long _nRow )
+sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
// die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird
EditBrowseBox::SeekRow(_nRow);
m_nCurrentPos = _nRow;
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------------
-void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
String aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId );
@@ -739,7 +739,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
return;
}
- USHORT nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
+ sal_uInt16 nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
if ( nColId == HANDLE_ID )
{
@@ -810,7 +810,7 @@ void OFieldExpressionControl::DeleteRows()
{
bFirstTime = false;
String sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION));
- m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() );
+ m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() );
}
sal_Int32 nGroupPos = m_aGroupPositions[nIndex];
@@ -830,7 +830,7 @@ void OFieldExpressionControl::DeleteRows()
}
if ( !bFirstTime )
- m_pParent->m_pController->getUndoMgr()->LeaveListAction();
+ m_pParent->m_pController->getUndoManager().LeaveListAction();
m_nDataPos = GetCurRow();
InvalidateStatusCell( nOldDataPos );
@@ -916,8 +916,8 @@ void OFieldExpressionControl::InsertRows( long nRow )
{
m_bIgnoreEvent = false;
{
- String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
- UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction);
+ const String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
+ const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction );
uno::Reference<report::XGroups> xGroups = m_pParent->getGroups();
sal_Int32 nGroupPos = 0;
@@ -999,7 +999,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
{
pControlsLst[i]->SetGetFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusGot));
pControlsLst[i]->SetLoseFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusLost));
- pControlsLst[i]->Show(TRUE);
+ pControlsLst[i]->Show(sal_True);
}
for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i)
@@ -1014,7 +1014,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
{
- pControls[i]->Show(TRUE);
+ pControls[i]->Show(sal_True);
String sText = pControls[i]->GetText();
if ( aMnemonicGenerator.CreateMnemonic(sText) )
pControls[i]->SetText(sText);
@@ -1184,7 +1184,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl )
NumericField* pNumericField = dynamic_cast< NumericField* >( pControl );
if ( pNumericField )
pNumericField->SaveValue();
- showHelpText(static_cast<USHORT>(i+STR_RPT_HELP_FIELD));
+ showHelpText(static_cast<sal_uInt16>(i+STR_RPT_HELP_FIELD));
break;
}
}
@@ -1206,7 +1206,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{
DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
- USHORT nCommand = m_aToolBox.GetCurItemId();
+ sal_uInt16 nCommand = m_aToolBox.GetCurItemId();
if ( m_pFieldExpression )
{
@@ -1281,7 +1281,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
return 1L;
}
// -----------------------------------------------------------------------------
-void OGroupsSortingDialog::showHelpText(USHORT _nResId)
+void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId)
{
m_aHelpWindow.SetText(String(ModuleRes(_nResId)));
}
@@ -1325,8 +1325,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
case sdbc::DataType::TIME:
case sdbc::DataType::TIMESTAMP:
{
- USHORT nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
- for (USHORT i = 0; i < SAL_N_ELEMENTS(nIds); ++i)
+ sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
+ for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(nIds); ++i)
{
m_aGroupOnLst.InsertEntry(String(ModuleRes(nIds[i])));
m_aGroupOnLst.SetEntryData(i+1,reinterpret_cast<void*>(i+2));
@@ -1338,8 +1338,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL));
break;
}
-
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
switch(_xGroup->getGroupOn())
{
case report::GroupOn::DEFAULT:
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index 159a457011ce..3cb470933e26 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -120,6 +120,7 @@ FloatingWindow RID_GROUPS_SORTING
ListBox LST_ORDER
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER";
Border = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT - 1 );
Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -146,6 +147,7 @@ FloatingWindow RID_GROUPS_SORTING
ListBox LST_HEADERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT -1);
@@ -171,6 +173,7 @@ FloatingWindow RID_GROUPS_SORTING
ListBox LST_FOOTERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT -1);
@@ -196,6 +199,7 @@ FloatingWindow RID_GROUPS_SORTING
ListBox LST_GROUPONLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT -1);
@@ -219,6 +223,7 @@ FloatingWindow RID_GROUPS_SORTING
NumericField ED_GROUPINTERVALLST
{
+ HelpID = "reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT -1);
@@ -235,6 +240,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_KEEPTOGETHERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT -1);
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index c264a3e41bec..072a9430d7b0 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -32,7 +32,7 @@
#include "uistrings.hrc"
#include "ReportController.hxx"
#include "UITools.hxx"
-#include "Undo.hxx"
+#include "RptUndo.hxx"
#include "reportformula.hxx"
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
@@ -74,9 +74,9 @@ using namespace ::com::sun::star;
using namespace utl;
using namespace ::comphelper;
-USHORT lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement)
+sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement)
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
uno::Reference< report::XFixedLine> xFixedLine(_xElement,uno::UNO_QUERY);
if ( uno::Reference< report::XFixedText>(_xElement,uno::UNO_QUERY).is() )
nId = SID_FM_FIXEDTEXT;
@@ -163,8 +163,8 @@ class NavigatorTree : public ::cppu::BaseMutex
::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener;
unsigned short m_nTimerCounter;
- SvLBoxEntry* insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition,UserData* _pData);
- void traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition = LIST_APPEND);
+ SvLBoxEntry* insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData);
+ void traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND);
void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvLBoxEntry* _pParent);
NavigatorTree(const NavigatorTree&);
@@ -310,12 +310,12 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is());
PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) );
- USHORT nCount = aContextMenu.GetItemCount();
- for (USHORT i = 0; i < nCount; ++i)
+ sal_uInt16 nCount = aContextMenu.GetItemCount();
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(i))
{
- USHORT nId = aContextMenu.GetItemId(i);
+ sal_uInt16 nId = aContextMenu.GetItemId(i);
aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId));
sal_Bool bEnabled = m_rController.isCommandEnabled(nId);
@@ -328,7 +328,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
aContextMenu.EnableItem(nId,bEnabled);
}
}
- USHORT nId = aContextMenu.Execute(this, aWhere);
+ sal_uInt16 nId = aContextMenu.Execute(this, aWhere);
if ( nId )
{
uno::Sequence< beans::PropertyValue> aArgs;
@@ -493,7 +493,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (
SetCurEntry(pEntry);
}
else if ( !pEntry )
- SelectAll(FALSE,FALSE);
+ SelectAll(sal_False,sal_False);
}
else
{
@@ -512,20 +512,20 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (
m_pSelectionListener->unlock();
}
// -----------------------------------------------------------------------------
-SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition,UserData* _pData)
+SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData)
{
SvLBoxEntry* pEntry = NULL;
if ( _nImageId )
{
const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) );
- pEntry = InsertEntry(_sName,aImage,aImage,_pParent,FALSE,_nPosition,_pData);
+ pEntry = InsertEntry(_sName,aImage,aImage,_pParent,sal_False,_nPosition,_pData);
}
else
- pEntry = InsertEntry(_sName,_pParent,FALSE,_nPosition,_pData);
+ pEntry = InsertEntry(_sName,_pParent,sal_False,_nPosition,_pData);
return pEntry;
}
// -----------------------------------------------------------------------------
-void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition)
+void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition)
{
SvLBoxEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection));
const sal_Int32 nCount = _xSection->getCount();
@@ -666,7 +666,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
SvLBoxEntry* pParent = find(xReport);
if ( _rEvent.PropertyName == PROPERTY_REPORTHEADERON )
{
- ULONG nPos = xReport->getReportHeaderOn() ? 2 : 1;
+ sal_uLong nPos = xReport->getReportHeaderOn() ? 2 : 1;
traverseSection(xReport->getReportHeader(),pParent,SID_REPORTHEADERFOOTER,nPos);
}
else if ( _rEvent.PropertyName == PROPERTY_PAGEHEADERON )
@@ -677,7 +677,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
traverseSection(xReport->getPageFooter(),pParent, SID_PAGEHEADERFOOTER);
else if ( _rEvent.PropertyName == PROPERTY_REPORTFOOTERON )
{
- ULONG nPos = xReport->getPageFooterOn() ? (GetLevelChildCount(pParent) - 1) : LIST_APPEND;
+ sal_uLong nPos = xReport->getPageFooterOn() ? (GetLevelChildCount(pParent) - 1) : LIST_APPEND;
traverseSection(xReport->getReportFooter(),pParent,SID_REPORTHEADERFOOTER,nPos);
}
}
@@ -708,7 +708,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
uno::Reference< report::XReportComponent> xElement(xProp,uno::UNO_QUERY);
if ( xProp.is() )
sName = lcl_getName(xProp);
- insertEntry(sName,pEntry,(!xElement.is() ? USHORT(SID_RPT_NEW_FUNCTION) : lcl_getImageId(xElement)),LIST_APPEND,new UserData(this,xProp));
+ insertEntry(sName,pEntry,(!xElement.is() ? sal_uInt16(SID_RPT_NEW_FUNCTION) : lcl_getImageId(xElement)),LIST_APPEND,new UserData(this,xProp));
}
if ( !IsExpanded(pEntry) )
Expand(pEntry);
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index af6ec90b2e7f..150c98d88343 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -103,7 +103,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_SORTINGANDGROUPING;
- HelpId = SID_SORTINGANDGROUPING ;
Command = ".uno:DbSortingAndGrouping";
Text [ en-US ] = "Sorting and Grouping...";
};
@@ -114,7 +113,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_PAGEHEADERFOOTER;
- HelpId = SID_PAGEHEADERFOOTER ;
Command = ".uno:PageHeaderFooter";
Checkable = TRUE;
Text [ en-US ] = "Page Header/Footer...";
@@ -122,7 +120,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_REPORTHEADERFOOTER;
- HelpId = SID_REPORTHEADERFOOTER ;
Command = ".uno:ReportHeaderFooter";
Checkable = TRUE;
Text [ en-US ] = "Report Header/Footer...";
@@ -134,7 +131,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_RPT_NEW_FUNCTION;
- HelpId = SID_RPT_NEW_FUNCTION;
Command = ".uno:NewFunction";
Text [ en-US ] = "New Function";
};
@@ -145,7 +141,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_SHOW_PROPERTYBROWSER;
- HelpId = SID_SHOW_PROPERTYBROWSER ;
Command = ".uno:FormProperties";
Text [ en-US ] = "Properties...";
};
diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src
index 31c5bdb4026c..c5c760e1755d 100644
--- a/reportdesign/source/ui/dlg/PageNumber.src
+++ b/reportdesign/source/ui/dlg/PageNumber.src
@@ -54,6 +54,7 @@ ModalDialog RID_PAGENUMBERS
RadioButton RB_PAGE_N
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Group = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_PAGENUMBERS
};
RadioButton RB_PAGE_N_OF_M
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Page N of M";
@@ -76,6 +78,7 @@ ModalDialog RID_PAGENUMBERS
RadioButton RB_PAGE_TOPPAGE
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Group = TRUE;
@@ -84,6 +87,7 @@ ModalDialog RID_PAGENUMBERS
};
RadioButton RB_PAGE_BOTTOMPAGE
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Bottom of Page (Footer)";
@@ -104,6 +108,7 @@ ModalDialog RID_PAGENUMBERS
};
ListBox LST_ALIGNMENT
{
+ HelpID = "reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT";
Border = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT -1);
Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -121,6 +126,7 @@ ModalDialog RID_PAGENUMBERS
};
CheckBox CB_SHOWNUMBERONFIRSTPAGE
{
+ HelpID = "reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index ba82ca8f104b..33b3d6d60981 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -48,7 +48,7 @@ namespace rptui
|*
\************************************************************************/
-ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId) :
+ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,sal_uInt16 _nPageId) :
SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
rOutAttrs ( *pAttr )
{
generated by cgit (git 2.34.1) at 2024-07-17 12:52:17 +0000