diff options
Diffstat (limited to 'reportdesign/source/ui/misc')
| -rw-r--r-- | reportdesign/source/ui/misc/FunctionHelper.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/RptUndo.cxx (renamed from reportdesign/source/ui/misc/Undo.cxx) | 13 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 26 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/makefile.mk | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/rptuiservices.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/statusbarcontroller.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/toolboxcontroller.cxx | 10 |
7 files changed, 34 insertions, 39 deletions
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index e6d9403786b2..0f8787a07dd1 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -199,10 +199,10 @@ xub_StrLen FunctionDescription::getSuppressedArgumentCount() const return sFormula; } // ----------------------------------------------------------------------------- -void FunctionDescription::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const +void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const { const sal_Int32 nCount = m_aParameter.getLength(); - for(USHORT i = 0;i < nCount; ++i) + for(sal_uInt16 i = 0;i < nCount; ++i) { _rArguments.push_back(i); } @@ -217,9 +217,9 @@ void FunctionDescription::initArgumentInfo() const return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -long FunctionDescription::getHelpId() const +rtl::OString FunctionDescription::getHelpId() const { - return 0; + return rtl::OString(); } // ----------------------------------------------------------------------------- sal_uInt32 FunctionDescription::getParameterCount() const diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 249bac85b1b0..dbf35bcb409f 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -27,15 +27,16 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" -#include "Undo.hxx" +#include "RptUndo.hxx" #include "uistrings.hrc" #include "rptui_slotid.hrc" #include "UITools.hxx" +#include "UndoEnv.hxx" + #include <dbaccess/IController.hxx> #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "UndoEnv.hxx" #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <svx/unoshape.hxx> @@ -124,7 +125,7 @@ DBG_NAME(rpt_OSectionUndo) OSectionUndo::OSectionUndo(OReportModel& _rMod ,sal_uInt16 _nSlot ,Action _eAction - ,USHORT nCommentID) + ,sal_uInt16 nCommentID) : OCommentUndoAction(_rMod,nCommentID) ,m_eAction(_eAction) ,m_nSlot(_nSlot) @@ -234,7 +235,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,Action _eAction - ,USHORT nCommentID) + ,sal_uInt16 nCommentID) : OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) @@ -273,7 +274,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,Action _eAction - ,USHORT nCommentID) + ,sal_uInt16 nCommentID) : OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) @@ -339,7 +340,7 @@ void OGroupSectionUndo::implReRemove( ) TYPEINIT1( OGroupUndo, OCommentUndoAction ); //---------------------------------------------------------------------------- OGroupUndo::OGroupUndo(OReportModel& _rMod - ,USHORT nCommentID + ,sal_uInt16 nCommentID ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 1676aa21ae59..d3ef4c175980 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -207,7 +207,7 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 namespace { // ------------------------------------------------------------------------- - Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,USHORT _nWichFont) + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,sal_uInt16 _nWichFont) { if ( !_rxReportControlFormat.is() ) throw uno::RuntimeException(); @@ -231,14 +231,14 @@ namespace } // ------------------------------------------------------------------------- - Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,USHORT _nWhich ) + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,sal_uInt16 _nWhich ) { awt::FontDescriptor aAwtFont; return lcl_getReportControlFont( _rxReportControlFormat, aAwtFont, _nWhich ); } // ------------------------------------------------------------------------- const Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, - SfxItemSet& _rItemSet,USHORT _nWhich,USHORT _nFont, USHORT _nFontHeight,USHORT _nLanguage,USHORT _nPosture, USHORT _nWeight) + SfxItemSet& _rItemSet,sal_uInt16 _nWhich,sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nLanguage,sal_uInt16 _nPosture, sal_uInt16 _nWeight) { // fill it awt::FontDescriptor aControlFont; @@ -383,7 +383,7 @@ namespace // ------------------------------------------------------------------------- void lcl_initAwtFont( const Font& _rOriginalFont, const SfxItemSet& _rItemSet, awt::FontDescriptor& _out_rAwtFont, - USHORT _nFont, USHORT _nFontHeight,USHORT _nPosture, USHORT _nWeight) + sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nPosture, sal_uInt16 _nWeight) { Font aNewFont( _rOriginalFont ); const SfxPoolItem* pItem( NULL ); @@ -543,7 +543,7 @@ namespace lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetValue() ) ); } struct Items { - USHORT nWhich; + sal_uInt16 nWhich; ::rtl::OUString sPropertyName; }; const Items pItems[] = { {ITEMID_LANGUAGE,PROPERTY_CHARLOCALE} @@ -666,9 +666,9 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new SvxPostureItem(ITALIC_NONE,ITEMID_POSTURE), new SvxWeightItem(WEIGHT_NORMAL,ITEMID_WEIGHT), - new SvxShadowedItem(FALSE,ITEMID_SHADOWED), - new SvxWordLineModeItem(FALSE,ITEMID_WORDLINEMODE), - new SvxContourItem(FALSE,ITEMID_CONTOUR), + new SvxShadowedItem(sal_False,ITEMID_SHADOWED), + new SvxWordLineModeItem(sal_False,ITEMID_WORDLINEMODE), + new SvxContourItem(sal_False,ITEMID_CONTOUR), new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT), new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE), @@ -677,15 +677,15 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED,ITEMID_CASEMAP), new SvxEscapementItem(ITEMID_ESCAPEMENT), new SvxFontListItem(pFontList.get(),ITEMID_FONTLIST), - new SvxAutoKernItem(FALSE,ITEMID_AUTOKERN), + new SvxAutoKernItem(sal_False,ITEMID_AUTOKERN), new SvxColorTableItem(pColorTable.get(),ITEMID_COLOR_TABLE), - new SvxBlinkItem(FALSE,ITEMID_BLINK), + new SvxBlinkItem(sal_False,ITEMID_BLINK), new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK), - new SvxTwoLinesItem(TRUE,0,0,ITEMID_TWOLINES), + new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES), new SvxCharRotateItem(0,sal_False,ITEMID_CHARROTATE), new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W), new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF), - new SvxCharHiddenItem(FALSE,ITEMID_CHARHIDDEN), + new SvxCharHiddenItem(sal_False,ITEMID_CHARHIDDEN), new SvxBrushItem(ITEMID_BRUSH), new SvxHorJustifyItem(ITEMID_HORJUSTIFY), new SvxVerJustifyItem(ITEMID_VERJUSTIFY), @@ -706,7 +706,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep OSL_ASSERT((SAL_N_ELEMENTS(pDefaults)) == (SAL_N_ELEMENTS(aItemInfos))); - static USHORT pRanges[] = + static sal_uInt16 pRanges[] = { ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, 0 diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk index b12bafdc7760..494b68023d62 100644 --- a/reportdesign/source/ui/misc/makefile.mk +++ b/reportdesign/source/ui/misc/makefile.mk @@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE # ... object files ............................ EXCEPTIONSFILES= \ - $(SLO)$/Undo.obj \ + $(SLO)$/RptUndo.obj \ $(SLO)$/ColorListener.obj \ $(SLO)$/UITools.obj \ $(SLO)$/rptuiservices.obj \ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index ee0fc6512c32..61d1b20ab432 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -82,11 +82,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return cppu::component_writeInfoHelper( - serviceManager, registryKey, entries); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index ed8891c95d7d..2de27a2217c4 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -100,10 +100,10 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen StatusBar* pStatusBar = static_cast<StatusBar*>(VCLUnoHelper::GetWindow(m_xParentWindow)); if ( pStatusBar ) { - const USHORT nCount = pStatusBar->GetItemCount(); - for (USHORT nPos = 0; nPos < nCount; ++nPos) + const sal_uInt16 nCount = pStatusBar->GetItemCount(); + for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) { - const USHORT nItemId = pStatusBar->GetItemId(nPos); + const sal_uInt16 nItemId = pStatusBar->GetItemId(nPos); if ( pStatusBar->GetItemCommand(nItemId) == String(m_aCommandURL) ) { m_nId = nItemId; diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index c510c40b8a02..016573d21c01 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -149,10 +149,10 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); if ( pToolBox ) { - const USHORT nCount = pToolBox->GetItemCount(); - for (USHORT nPos = 0; nPos < nCount; ++nPos) + const sal_uInt16 nCount = pToolBox->GetItemCount(); + for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) { - const USHORT nItemId = pToolBox->GetItemId(nPos); + const sal_uInt16 nItemId = pToolBox->GetItemId(nPos); if ( pToolBox->GetItemCommand(nItemId) == String(m_aCommandURL) ) { m_nToolBoxId = nItemId; @@ -231,9 +231,9 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event sal_Bool bCheckmark = sal_False; //m_pToolbarController->GetToolBox().Enable(Event.IsEnabled); ToolBox& rTb = m_pToolbarController->GetToolBox(); - for ( USHORT i = 0; i < rTb.GetItemCount(); i++ ) + for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); i++ ) { - USHORT nId = rTb.GetItemId( i ); + sal_uInt16 nId = rTb.GetItemId( i ); if ( nId == 0 ) continue; |